summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2015-08-11 13:16:52 -0700
committerDianne Hackborn <hackbod@google.com>2015-08-11 13:16:52 -0700
commita9ec5bcd3c2cbbaceece4a6380efc0f04199de48 (patch)
tree1d0e740714aa8b0612f438c2dcdb2dbb2baa96f1 /src
parent57c56fb35307e17ae2e784f4eff1efe4f47b8572 (diff)
downloadandroid_packages_apps_PackageInstaller-a9ec5bcd3c2cbbaceece4a6380efc0f04199de48.tar.gz
android_packages_apps_PackageInstaller-a9ec5bcd3c2cbbaceece4a6380efc0f04199de48.tar.bz2
android_packages_apps_PackageInstaller-a9ec5bcd3c2cbbaceece4a6380efc0f04199de48.zip
Fix issue #23115154: APR: NPE in PackageInstaller
Change-Id: If89e603508e02cad781ee455b2149af1024bd443
Diffstat (limited to 'src')
-rw-r--r--src/com/android/packageinstaller/permission/ui/PermissionsFrameFragment.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/PermissionsFrameFragment.java b/src/com/android/packageinstaller/permission/ui/PermissionsFrameFragment.java
index a494732d..40058f6d 100644
--- a/src/com/android/packageinstaller/permission/ui/PermissionsFrameFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/PermissionsFrameFragment.java
@@ -72,6 +72,10 @@ public abstract class PermissionsFrameFragment extends PreferenceFragment {
private void setLoading(boolean loading, boolean animate, boolean force) {
if (mIsLoading != loading || force) {
mIsLoading = loading;
+ if (getView() == null) {
+ // If there is no created view, there is no reason to animate.
+ animate = false;
+ }
if (mPrefsView != null) {
setViewShown(mPrefsView, !loading, animate);
}