Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e890610 authored by Rob Carr's avatar Rob Carr Committed by android-build-merger
Browse files

Merge "Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into... 

Merge "Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev am: 8bc0aa25 am: 604c2900" into oc-dr1-dev-plus-aosp
am: 6f6f9383

Change-Id: Ic021a5ed26b009b9feaab83ef8770d2740fd6099
parents 4dc9f9e0 6f6f9383

services/core/java/com/android/server/policy/PhoneWindowManager.java

+2 −1
Original line number Diff line number Diff line
@@ -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;
@@ -2823,7 +2824,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