commit af5b90ff458fcbf923542bc0e79b290b83d265ab
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jan 30 19:11:36 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 30 19:11:36 2018 +0000
tree 5222f051217b94e45274ae3f4939aff01f00e3df
parent 8cabb012fa2d0a50adea52c577ea348030a8f58c
parent c71ab6049f7d6f8d509bdc11f21776ae3eb167f8

Merge "Prevent ArrayIndexOutOfBoundsException for some invalid sysui_nav_bar values"

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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java
index 4e79314b..9f89fe6 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java
@@ -219,6 +219,11 @@
             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);