diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-08-11 23:39:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-11 23:39:25 +0000 |
| commit | 2b9cdf4e64d49c24658a5ca7e10633364ef2c1f2 (patch) | |
| tree | ce45ca033b0df7041a441eea71268202773c0ea8 | |
| parent | 6f16c0cd157ac29bcf1fbb606cf9932f88d73f26 (diff) | |
| parent | 63d27c9a1a79c590124740fa4ee84de43526c19d (diff) | |
| download | android_packages_apps_PackageInstaller-2b9cdf4e64d49c24658a5ca7e10633364ef2c1f2.tar.gz android_packages_apps_PackageInstaller-2b9cdf4e64d49c24658a5ca7e10633364ef2c1f2.tar.bz2 android_packages_apps_PackageInstaller-2b9cdf4e64d49c24658a5ca7e10633364ef2c1f2.zip | |
am 63d27c9a: am a9ec5bcd: Fix issue #23115154: APR: NPE in PackageInstaller
* commit '63d27c9a1a79c590124740fa4ee84de43526c19d':
Fix issue #23115154: APR: NPE in PackageInstaller
| -rw-r--r-- | src/com/android/packageinstaller/permission/ui/PermissionsFrameFragment.java | 4 |
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); } |