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

* commit '0233d732eb124a0e09e35e65b630e82a10b5d426': Fixed a Settings dialog crash.
2014-08-21 00:44:36 +00:00
parent 1189e70be4 0233d732eb
commit 3f6a50ba82
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() {