summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2016-05-18 22:29:28 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-05-18 22:29:28 +0000
commitbdeaa0b079781a4c18ddc6f1e298d03a2374882d (patch)
tree9302a3e75097198859ec42fb9f3e753a3420a3cc
parent1b6f2372220665bd69cfe29e6ee0d518220570d1 (diff)
parent770217c697a92b441b66fac6d3441db1c0a84a3a (diff)
downloadandroid_packages_apps_Trebuchet-bdeaa0b079781a4c18ddc6f1e298d03a2374882d.tar.gz
android_packages_apps_Trebuchet-bdeaa0b079781a4c18ddc6f1e298d03a2374882d.tar.bz2
android_packages_apps_Trebuchet-bdeaa0b079781a4c18ddc6f1e298d03a2374882d.zip
Add null check to page indicator to prevent crashes in landscape.
am: 770217c697 * commit '770217c697a92b441b66fac6d3441db1c0a84a3a': Add null check to page indicator to prevent crashes in landscape. Change-Id: Ic9ba50892ef777d76f9bd64e3ab81f220eff8532
-rw-r--r--src/com/android/launcher3/Launcher.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index a5ebb52f2..88e1532d3 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -505,7 +505,9 @@ public class Launcher extends Activity
if (mExtractedColors != null && Utilities.isNycOrAbove()) {
mExtractedColors.load(this);
mHotseat.updateColor(mExtractedColors, !mPaused);
- mPageIndicator.updateColor(mExtractedColors);
+ if (mPageIndicator != null) {
+ mPageIndicator.updateColor(mExtractedColors);
+ }
}
}