commit a504c4dcdf18be1be9f67cf83b506638f19077b8
author Matthew Xie <mattx@google.com> Fri Feb 14 16:32:32 2014 -0800
committer Matthew Xie <mattx@google.com> Fri Feb 14 17:08:38 2014 -0800
tree 46bd4cd1265f50a9e38a40574775796b8d8d0c90
parent b05f1d0081f6798ff7ffbf87c312ce0a40e4adf5

Update context on resume calls for BluetoothAdvertisingEnabler and BluetoothEnabler

The saved context could be invalid if not updated
bug 12991455

Change-Id: I93abb8420d0fa53add1f0e843a5069d59743891c

src/com/android/settings/SettingsActivity.java

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index bbe0e74..511fd7d 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -732,7 +732,7 @@
         mDevelopmentPreferences.registerOnSharedPreferenceChangeListener(
                 mDevelopmentPreferencesListener);
 
-        mHeaderAdapter.resume();
+        mHeaderAdapter.resume(this);
         invalidateHeaders();
 
         registerReceiver(mBatteryInfoReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
@@ -1624,9 +1624,9 @@
             holder.mIcon.setImageDrawable(icon);
         }
 
-        public void resume() {
+        public void resume(Context context) {
             mWifiEnabler.resume();
-            mBluetoothEnabler.resume();
+            mBluetoothEnabler.resume(context);
         }
 
         public void pause() {