Bug 800840 - Setup profile locker after unlocking on Android. r=bsmedberg
authorWes Johnston <wjohnston@mozilla.com>
Thu, 18 Oct 2012 10:54:42 -0700
changeset 110819 e8596ac4d0cfb6465ec8bc09d679cea1501d27a8
parent 110818 67728fe694e2e494386e6ebd16f05d4179bbfe17
child 110820 f1bdc236456d6e1c0b53628641cb4a88c7ab4c34
push id93
push usernmatsakis@mozilla.com
push dateWed, 31 Oct 2012 21:26:57 +0000
reviewersbsmedberg
bugs800840
milestone19.0a1
Bug 800840 - Setup profile locker after unlocking on Android. r=bsmedberg
toolkit/xre/nsAppRunner.cpp
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -1766,18 +1766,20 @@ ProfileLockedDialog(nsIFile* aProfileDir
         if (NS_FAILED(rv)) 
           return rv;
 
         return NS_LockProfilePath(aProfileDir, aProfileLocalDir, 
                                   nullptr, aResult);
       }
     } else {
 #ifdef MOZ_WIDGET_ANDROID
-      if (mozilla::AndroidBridge::Bridge()->UnlockProfile())
-        return NS_OK;
+      if (mozilla::AndroidBridge::Bridge()->UnlockProfile()) {
+        return NS_LockProfilePath(aProfileDir, aProfileLocalDir, 
+                                  nullptr, aResult);
+      }
 #else
       rv = ps->Alert(nullptr, killTitle, killMessage);
       NS_ENSURE_SUCCESS_LOG(rv, rv);
 #endif
     }
 
     return NS_ERROR_ABORT;
   }