Merge "Guard against crash in RTL." into nyc-dev

2016-04-11 15:08:08 +00:00
parent ffdaae004b 339df0742c
commit 4e9348c7bb
1 changed files with 4 additions and 0 deletions
--- a/packages/SystemUI/src/com/android/systemui/qs/PageIndicator.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/PageIndicator.java
@@ -118,6 +118,10 @@ public class PageIndicator extends ViewGroup {
        }
        ImageView first = (ImageView) getChildAt(firstIndex);
        ImageView second = (ImageView) getChildAt(secondIndex);
+        if (second == null) {
+            // Weird state where number of pages must not have propagated yet.
+            return;
+        }
        // Lay the two views on top of each other.
        second.setTranslationX(first.getX() - second.getX());