summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Rob Carr <racarr@google.com> 2017-06-21 21:08:31 +0000
committer android-build-merger <android-build-merger@google.com> 2017-06-21 21:08:31 +0000
commit604c29006bb13944ee3ba3b64e5ed149608a4d9a (patch)
tree0fa787dc89bb523fd246af4f31f7fe88ab25816c
parent1a588ec465909526e0d4a70262c82de1a7f2c3b2 (diff)
parent8bc0aa25598950fc853287b7513b3df450a840f8 (diff)
Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev
am: 8bc0aa2559 Change-Id: I9ed40cbf0724627bcc89a2dd305ba61f206570e0
-rw-r--r--services/core/java/com/android/server/policy/PhoneWindowManager.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 8b28df1a3058..8112f9998c58 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -23,6 +23,7 @@ import static android.app.ActivityManager.StackId.FREEFORM_WORKSPACE_STACK_ID;
import static android.app.ActivityManager.StackId.HOME_STACK_ID;
import static android.app.AppOpsManager.OP_SYSTEM_ALERT_WINDOW;
import static android.app.AppOpsManager.OP_TOAST_WINDOW;
+import static android.content.Context.CONTEXT_RESTRICTED;
import static android.content.Context.DISPLAY_SERVICE;
import static android.content.Context.WINDOW_SERVICE;
import static android.content.pm.PackageManager.FEATURE_PICTURE_IN_PICTURE;
@@ -2843,7 +2844,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (theme != context.getThemeResId() || labelRes != 0) {
try {
- context = context.createPackageContext(packageName, 0);
+ context = context.createPackageContext(packageName, CONTEXT_RESTRICTED);
context.setTheme(theme);
} catch (PackageManager.NameNotFoundException e) {
// Ignore