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

Merge "Prevent ArrayIndexOutOfBoundsException for some invalid sysui_nav_bar values" am: af5b90ff45

Browse Source 
am: e01fe74110

Change-Id: I24ac819e4d9edd59c7e4dac5ee5dea8ed4fc0148
This commit is contained in:
Mikael Magnusson
2018-01-30 20:06:19 +00:00
committed by android-build-merger
parent a325e4dac1 e01fe74110
commit 1b1ecc13c5
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java
View File

@@ -219,6 +219,11 @@ public class NavigationBarInflaterView extends FrameLayout
newLayout = getDefaultLayout();
}
String[] sets = newLayout.split(GRAVITY_SEPARATOR, 3);
if (sets.length != 3) {
Log.d(TAG, "Invalid layout.");
newLayout = getDefaultLayout();
sets = newLayout.split(GRAVITY_SEPARATOR, 3);
}
String[] start = sets[0].split(BUTTON_SEPARATOR);
String[] center = sets[1].split(BUTTON_SEPARATOR);
String[] end = sets[2].split(BUTTON_SEPARATOR);