summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-05-16 20:54:13 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-05-16 20:54:14 +0000
commita9a854e689489489229cba256a5d6611023b853f (patch)
tree526d7de948073ba236bec57bbdc6afd72f4e3738
parent5782f4c6f7fb3e4c88648fb94134b9102f6a09d6 (diff)
parent1672bb5d5dd0a27770856d1d3ab1ad81f103d80e (diff)
downloadandroid_packages_apps_PackageInstaller-a9a854e689489489229cba256a5d6611023b853f.tar.gz
android_packages_apps_PackageInstaller-a9a854e689489489229cba256a5d6611023b853f.tar.bz2
android_packages_apps_PackageInstaller-a9a854e689489489229cba256a5d6611023b853f.zip
Merge "Allow permission grant UI to show on top of keyguard" into oc-dev
-rw-r--r--src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java
index a02f8ea5..e7a88783 100644
--- a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java
+++ b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java
@@ -76,6 +76,9 @@ public class GrantPermissionsActivity extends OverlayTouchActivity
super.onCreate(icicle);
setFinishOnTouchOutside(false);
+ getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+ getWindow().addFlags(WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
+
setTitle(R.string.permission_request_title);
if (DeviceUtils.isTelevision(this)) {