Bug 738676 - Pairing multiple devices. r=rnewman a=blocking-fennec
authorChenxia Liu <liuche@mozilla.com>
Wed, 18 Apr 2012 14:02:21 -0700
changeset 91929 6a6c9764a3a2050bd4c715d9983b27c453f57bb7
parent 91928 9cc11bafbb2944ebbe0179caef4cc6044e4176a8
child 91930 e4a3b7619f4dae3044d0878a6e2ab3e106310e98
push id22490
push usereakhgari@mozilla.com
push dateThu, 19 Apr 2012 13:58:35 +0000
treeherdermozilla-central@ee38392142ed [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrnewman, blocking-fennec
bugs738676
milestone14.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 738676 - Pairing multiple devices. r=rnewman a=blocking-fennec
mobile/android/base/sync/setup/activities/SetupSyncActivity.java
--- a/mobile/android/base/sync/setup/activities/SetupSyncActivity.java
+++ b/mobile/android/base/sync/setup/activities/SetupSyncActivity.java
@@ -152,17 +152,19 @@ public class SetupSyncActivity extends A
 
     if (jClient != null) {
       jClient.abort(Constants.JPAKE_ERROR_USERABORT);
     }
   }
 
   @Override
   public void onNewIntent(Intent intent) {
+    Logger.debug(LOG_TAG, "Started SetupSyncActivity with new intent.");
     setIntent(intent);
+    onResume();
   }
 
   /* Click Handlers */
   public void manualClickHandler(View target) {
     Intent accountIntent = new Intent(this, AccountActivity.class);
     accountIntent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
     startActivity(accountIntent);
     overridePendingTransition(0, 0);