diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2016-08-24 23:03:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-08-24 23:03:23 +0000 |
| commit | 798885ad101d811af2e549d5f4c04c5024b88f85 (patch) | |
| tree | a1e7653e445d54084d64462be80cdf19a1ed4f86 /src | |
| parent | 46442e52ca89e7a510a59c30b22ffe2e888520f9 (diff) | |
| parent | 4b1e2d8d07db3a40ec494cb6191cdbd80a0dd740 (diff) | |
| download | android_packages_apps_PackageInstaller-798885ad101d811af2e549d5f4c04c5024b88f85.tar.gz android_packages_apps_PackageInstaller-798885ad101d811af2e549d5f4c04c5024b88f85.tar.bz2 android_packages_apps_PackageInstaller-798885ad101d811af2e549d5f4c04c5024b88f85.zip | |
Fix an exception in PackageInstaller
am: 4b1e2d8d07
Change-Id: Ied08d511e64a39b6e4851306294f1a3361502b78
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java index c4471be6..b1347295 100644 --- a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java +++ b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java @@ -196,10 +196,12 @@ public class GrantPermissionsActivity extends OverlayTouchActivity // window height needed to show all content. We have to // re-add the window to force it to be resized if needed. View decor = getWindow().getDecorView(); - getWindowManager().removeViewImmediate(decor); - getWindowManager().addView(decor, decor.getLayoutParams()); - if (mViewHandler instanceof GrantPermissionsViewHandlerImpl) { - ((GrantPermissionsViewHandlerImpl) mViewHandler).onConfigurationChanged(); + if (decor.getParent() != null) { + getWindowManager().removeViewImmediate(decor); + getWindowManager().addView(decor, decor.getLayoutParams()); + if (mViewHandler instanceof GrantPermissionsViewHandlerImpl) { + ((GrantPermissionsViewHandlerImpl) mViewHandler).onConfigurationChanged(); + } } } |