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

* commit '2dc11d40c205432774d4e4bc7ce56407b99eaa3a': Fixed a Settings dialog crash.
2014-08-20 20:12:08 +00:00
parent 1bc2ff2b30 2dc11d40c2
commit 0233d732eb
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() {