summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPauloftheWest <paulofthewest@google.com>2014-08-20 20:03:17 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-19 02:43:23 +0000
commit2dc11d40c205432774d4e4bc7ce56407b99eaa3a (patch)
tree54d3438085f3ecb91fdfb3cf9761801a9fa6b92e
parentdc79528bf660b9e431141e93a8c1c378af337b7a (diff)
parentb58e2005abc5482a744963e6a8a1c986d0839fc8 (diff)
downloadpackages_apps_Settings-2dc11d40c205432774d4e4bc7ce56407b99eaa3a.zip
packages_apps_Settings-2dc11d40c205432774d4e4bc7ce56407b99eaa3a.tar.gz
packages_apps_Settings-2dc11d40c205432774d4e4bc7ce56407b99eaa3a.tar.bz2
Merge "Fixed a Settings dialog crash." into lmp-dev
-rwxr-xr-xsrc/com/android/settings/bluetooth/DeviceProfilesSettings.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
index ea43bad..8b0c357 100755
--- 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() {