Bug 800840 - Setup profile locker after unlocking on Android. r=bsmedberg, a=lsblakk
authorWes Johnston <wjohnston@mozilla.com>
Thu, 18 Oct 2012 10:54:42 -0700
changeset 116235 6f7d1e8c941bbbd1bb4e826d95ab52f8a9bad5d8
parent 116234 dbcf231295069fe5cc95e6411a3912127f6c85a6
child 116236 f4d50878e6b6b1fe2bc0837b33c5a95cb045bb22
push id1708
push userakeybl@mozilla.com
push dateMon, 19 Nov 2012 21:10:21 +0000
treeherdermozilla-beta@27b14fe50103 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg, lsblakk
bugs800840
milestone18.0a2
Bug 800840 - Setup profile locker after unlocking on Android. r=bsmedberg, a=lsblakk
toolkit/xre/nsAppRunner.cpp
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -1761,18 +1761,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;
   }