Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e01fe741 authored by Mikael Magnusson's avatar Mikael Magnusson Committed by android-build-merger
Browse files

Merge "Prevent ArrayIndexOutOfBoundsException for some invalid sysui_nav_bar values" 

am: af5b90ff

Change-Id: Ie80bb69b0208dab1e00da76cb60275151a6a5bc7
parents 02fecd46 af5b90ff

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

+5 −0
Original line number Diff line number Diff line
@@ -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);