summaryrefslogtreecommitdiffstats
path: root/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
diff options
context:
space:
mode:
authorcretin45 <cretin45@gmail.com>2016-05-05 12:52:55 -0700
committercretin45 <cretin45@gmail.com>2016-05-05 12:53:37 -0700
commit71e092266117e0d7d57f9a78fb9b52552acc9cda (patch)
treeaef6d94aa0113f5ef0fc54955ab58b8c3341dca5 /WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
parentdd6f2a2891a8445591be3e9fa53db293d7fd880b (diff)
downloadandroid_packages_apps_Trebuchet-71e092266117e0d7d57f9a78fb9b52552acc9cda.tar.gz
android_packages_apps_Trebuchet-71e092266117e0d7d57f9a78fb9b52552acc9cda.tar.bz2
android_packages_apps_Trebuchet-71e092266117e0d7d57f9a78fb9b52552acc9cda.zip
Trebuchet: Add runtime storage perm check for wallpaper picker
Issue-id: FEIJ-441 Change-Id: Iac9a2c249de595568f68313335d337410928d19e
Diffstat (limited to 'WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java')
-rw-r--r--WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
index 59858501a..abf202604 100644
--- a/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
+++ b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
@@ -721,7 +721,7 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
public void onStop() {
super.onStop();
mWallpaperStrip = findViewById(R.id.wallpaper_strip);
- if (mWallpaperStrip.getAlpha() < 1f) {
+ if (mWallpaperStrip != null && mWallpaperStrip.getAlpha() < 1f) {
mWallpaperStrip.setAlpha(1f);
mWallpaperStrip.setVisibility(View.VISIBLE);
}