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

Commit f407d236 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 7aeb54cf: Merge "Finish toast app op." into lmp-dev 

* commit '7aeb54cf6c78fb068ba1dd63513ad4a5b9b95ac5':
  Finish toast app op.
parents 9575ebf2 e39e5bff

services/core/java/com/android/server/wm/WindowManagerService.java

+5 −5
Original line number Diff line number Diff line
@@ -803,14 +803,14 @@ public class WindowManagerService extends IWindowManager.Stub 
        mActivityManager = ActivityManagerNative.getDefault();

        mBatteryStats = BatteryStatsService.getService();

        mAppOps = (AppOpsManager)context.getSystemService(Context.APP_OPS_SERVICE);

        mAppOps.startWatchingMode(AppOpsManager.OP_SYSTEM_ALERT_WINDOW, null,

        AppOpsManager.OnOpChangedInternalListener opListener =

                new AppOpsManager.OnOpChangedInternalListener() {

                    @Override

                    public void onOpChanged(int op, String packageName) {

                    @Override public void onOpChanged(int op, String packageName) {

                        updateAppOpsState();

                    }

                }

        );

                };

        mAppOps.startWatchingMode(AppOpsManager.OP_SYSTEM_ALERT_WINDOW, null, opListener);

        mAppOps.startWatchingMode(AppOpsManager.OP_TOAST_WINDOW, null, opListener);



        // Get persisted window scale setting

        mWindowAnimationScaleSetting = Settings.Global.getFloat(context.getContentResolver(),