OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7a23b48
)
Protect against null carrier config
author
Jason Monk
<jmonk@google.com>
Fri, 1 Jul 2016 13:55:44 +0000
(09:55 -0400)
committer
Jason Monk
<jmonk@google.com>
Fri, 1 Jul 2016 13:55:44 +0000
(09:55 -0400)
Change-Id: Ida60ead4a85017c29cc8ad3c3e7a462a9e3c720b
Fixes:
28085042
src/com/android/settings/DeviceInfoSettings.java
patch
|
blob
|
history
diff --git
a/src/com/android/settings/DeviceInfoSettings.java
b/src/com/android/settings/DeviceInfoSettings.java
index
19c4a3f
..
dd8064f
100644
(file)
--- a/
src/com/android/settings/DeviceInfoSettings.java
+++ b/
src/com/android/settings/DeviceInfoSettings.java
@@
-283,7
+283,7
@@
public class DeviceInfoSettings extends SettingsPreferenceFragment implements In
CarrierConfigManager configManager =
(CarrierConfigManager) getSystemService(Context.CARRIER_CONFIG_SERVICE);
PersistableBundle b = configManager.getConfig();
- if (b.getBoolean(CarrierConfigManager.KEY_CI_ACTION_ON_SYS_UPDATE_BOOL)) {
+ if (b
!= null && b
.getBoolean(CarrierConfigManager.KEY_CI_ACTION_ON_SYS_UPDATE_BOOL)) {
ciActionOnSysUpdate(b);
}
}