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

Commit 0e5ada49 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [2947251, 2947338, 2947252, 2947253, 2946095, 2946096,... 

Merge cherrypicks of [2947251, 2947338, 2947252, 2947253, 2946095, 2946096, 2946097, 2946098, 2947211, 2947212, 2947254, 2947255, 2947256, 2947257, 2947258, 2947349, 2947350, 2947351, 2947352, 2947353, 2946976, 2946977, 2946978, 2946979, 2946980, 2947354, 2947355, 2947435, 2947356, 2947357, 2947358, 2947359, 2947360, 2947418, 2947421, 2947422, 2947306] into oc-r3-release

Change-Id: Ia3f12e54646efc8255fe96023abbc122264aa26d
parents 773bffe3 ba4bda41

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
    <uses-permission android:name="android.permission.KILL_UID" />

    <uses-permission android:name="android.permission.MANAGE_APP_OPS_RESTRICTIONS" />

    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

    <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS" />



    <uses-permission android:name="com.google.android.permission.INSTALL_WEARABLE_PACKAGES" />

src/com/android/packageinstaller/permission/ui/OverlayTouchActivity.java

+6 −25
Original line number Diff line number Diff line
@@ -15,33 +15,14 @@ 
 */

package com.android.packageinstaller.permission.ui;



import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;



import android.app.Activity;

import android.app.AppOpsManager;

import android.os.Binder;

import android.os.IBinder;

import android.os.Bundle;



public class OverlayTouchActivity extends Activity {

    private final IBinder mToken = new Binder();



    @Override

    protected void onResume() {

        super.onResume();

        setOverlayAllowed(false);

    }



    @Override

    protected void onPause() {

        super.onPause();

        setOverlayAllowed(true);

    }



    private void setOverlayAllowed(boolean allowed) {

        AppOpsManager appOpsManager = getSystemService(AppOpsManager.class);

        if (appOpsManager != null) {

            appOpsManager.setUserRestriction(AppOpsManager.OP_SYSTEM_ALERT_WINDOW,

                    !allowed, mToken);

            appOpsManager.setUserRestriction(AppOpsManager.OP_TOAST_WINDOW,

                    !allowed, mToken);

        }

    protected void onCreate(Bundle savedInstanceState) {

        getWindow().addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

        super.onCreate(savedInstanceState);

    }

}