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

* commit 'cf24cfb1a1daf045601b1e13b0012a59b66f6572':
  Finish toast app op.
This commit is contained in:
Dianne Hackborn
2014-07-23 01:35:38 +00:00
committed by Android Git Automerger

View File

@@ -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(),