Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE in PolicyControl."

Browse Source
This commit is contained in:
John Spurlock
2014-02-10 20:43:14 +00:00
committed by Android (Google) Code Review
parent 3393f390a5 b8c37e2507
commit 976ed21215
1 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
policy/src/com/android/internal/policy/impl/PolicyControl.java
View File

@@ -140,30 +140,32 @@ public class PolicyControl {
sImmersiveStatusFilter = null;
sImmersiveNavigationFilter = null;
sImmersivePreconfirmationsFilter = null;
String[] nvps = value.split(":");
for (String nvp : nvps) {
int i = nvp.indexOf('=');
if (i == -1) continue;
String n = nvp.substring(0, i);
String v = nvp.substring(i + 1);
if (n.equals(NAME_IMMERSIVE_FULL)) {
Filter f = Filter.parse(v);
sImmersiveStatusFilter = sImmersiveNavigationFilter = f;
if (sImmersivePreconfirmationsFilter == null) {
if (value != null) {
String[] nvps = value.split(":");
for (String nvp : nvps) {
int i = nvp.indexOf('=');
if (i == -1) continue;
String n = nvp.substring(0, i);
String v = nvp.substring(i + 1);
if (n.equals(NAME_IMMERSIVE_FULL)) {
Filter f = Filter.parse(v);
sImmersiveStatusFilter = sImmersiveNavigationFilter = f;
if (sImmersivePreconfirmationsFilter == null) {
sImmersivePreconfirmationsFilter = f;
}
} else if (n.equals(NAME_IMMERSIVE_STATUS)) {
Filter f = Filter.parse(v);
sImmersiveStatusFilter = f;
} else if (n.equals(NAME_IMMERSIVE_NAVIGATION)) {
Filter f = Filter.parse(v);
sImmersiveNavigationFilter = f;
if (sImmersivePreconfirmationsFilter == null) {
sImmersivePreconfirmationsFilter = f;
}
} else if (n.equals(NAME_IMMERSIVE_PRECONFIRMATIONS)) {
Filter f = Filter.parse(v);
sImmersivePreconfirmationsFilter = f;
}
} else if (n.equals(NAME_IMMERSIVE_STATUS)) {
Filter f = Filter.parse(v);
sImmersiveStatusFilter = f;
} else if (n.equals(NAME_IMMERSIVE_NAVIGATION)) {
Filter f = Filter.parse(v);
sImmersiveNavigationFilter = f;
if (sImmersivePreconfirmationsFilter == null) {
sImmersivePreconfirmationsFilter = f;
}
} else if (n.equals(NAME_IMMERSIVE_PRECONFIRMATIONS)) {
Filter f = Filter.parse(v);
sImmersivePreconfirmationsFilter = f;
}
}
if (DEBUG) {