am 3f6a50ba: am 0233d732: am 2dc11d40: Merge "Fixed a Settings dialog crash." into lmp-dev

* commit '3f6a50ba82c661a2b745297722446a517b94cba0': Fixed a Settings dialog crash.
2014-08-21 00:56:59 +00:00
parent efffa590df 3f6a50ba82
commit 945242f8c9
1 changed files with 4 additions and 2 deletions
--- a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
+++ b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
@@ -135,8 +135,10 @@ public final class DeviceProfilesSettings extends SettingsPreferenceFragment
        mCachedDevice = cachedDevice;

        mCachedDevice.registerCallback(this);
-        addPreferencesForProfiles();
-        refresh();
+        if (isResumed()) {
+            addPreferencesForProfiles();
+            refresh();
+        }
    }

    private void addPreferencesForProfiles() {