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

Commit a9f241bb authored by Rubin Xu's avatar Rubin Xu Committed by Automerger Merge Worker
Browse files

Merge "add MANAGE_CREDENTIALS appop" am: c9a8b2fa 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587046

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41e5c8a1d3a6ba5902515ffc89da200d7e9cd8a0
parents 06a5b4de c9a8b2fa

core/java/android/app/AppOpsManager.java

+23 −1
Original line number Diff line number Diff line
@@ -1136,9 +1136,16 @@ public class AppOpsManager { 
    // TODO: Add as AppProtoEnums

    public static final int OP_RECORD_AUDIO_HOTWORD = 102;



    /**

     * Manage credentials in the system KeyChain.

     *

     * @hide

     */

    public static final int OP_MANAGE_CREDENTIALS = AppProtoEnums.APP_OP_MANAGE_CREDENTIALS;



    /** @hide */

    @UnsupportedAppUsage

    public static final int _NUM_OP = 104;

    public static final int _NUM_OP = 105;



    /** Access to coarse location information. */

    public static final String OPSTR_COARSE_LOCATION = "android:coarse_location";
@@ -1485,6 +1492,13 @@ public class AppOpsManager { 
     */

    public static final String OPSTR_RECORD_AUDIO_HOTWORD = "android:record_audio_hotword";



    /**

     * Manage credentials in the system KeyChain.

     *

     * @hide

     */

    public static final String OPSTR_MANAGE_CREDENTIALS = "android:manage_credentials";



    /** {@link #sAppOpsToNote} not initialized yet for this op */

    private static final byte SHOULD_COLLECT_NOTE_OP_NOT_INITIALIZED = 0;

    /** Should not collect noting of this app-op in {@link #sAppOpsToNote} */
@@ -1679,6 +1693,7 @@ public class AppOpsManager { 
            OP_PHONE_CALL_CAMERA,               // OP_PHONE_CALL_CAMERA

            OP_RECORD_AUDIO_HOTWORD,            // RECORD_AUDIO_HOTWORD

            OP_MANAGE_ONGOING_CALLS,            // MANAGE_ONGOING_CALLS

            OP_MANAGE_CREDENTIALS,              // MANAGE_CREDENTIALS

    };



    /**
@@ -1789,6 +1804,7 @@ public class AppOpsManager { 
            OPSTR_PHONE_CALL_CAMERA,

            OPSTR_RECORD_AUDIO_HOTWORD,

            OPSTR_MANAGE_ONGOING_CALLS,

            OPSTR_MANAGE_CREDENTIALS,

    };



    /**
@@ -1900,6 +1916,7 @@ public class AppOpsManager { 
            "PHONE_CALL_CAMERA",

            "RECORD_AUDIO_HOTWORD",

            "MANAGE_ONGOING_CALLS",

            "MANAGE_CREDENTIALS",

    };



    /**
@@ -2012,6 +2029,7 @@ public class AppOpsManager { 
            null, // no permission for OP_PHONE_CALL_CAMERA

            null, // no permission for OP_RECORD_AUDIO_HOTWORD

            Manifest.permission.MANAGE_ONGOING_CALLS,

            null, // no permission for OP_MANAGE_CREDENTIALS

    };



    /**
@@ -2124,6 +2142,7 @@ public class AppOpsManager { 
            null, // PHONE_CALL_MICROPHONE

            null, // RECORD_AUDIO_HOTWORD

            null, // MANAGE_ONGOING_CALLS

            null, // MANAGE_CREDENTIALS

    };



    /**
@@ -2235,6 +2254,7 @@ public class AppOpsManager { 
            null, // PHONE_CALL_CAMERA

            null, // RECORD_AUDIO_HOTWORD

            null, // MANAGE_ONGOING_CALLS

            null, // MANAGE_CREDENTIALS

    };



    /**
@@ -2345,6 +2365,7 @@ public class AppOpsManager { 
            AppOpsManager.MODE_ALLOWED, // PHONE_CALL_CAMERA

            AppOpsManager.MODE_ALLOWED, // OP_RECORD_AUDIO_HOTWORD

            AppOpsManager.MODE_DEFAULT, // MANAGE_ONGOING_CALLS

            AppOpsManager.MODE_DEFAULT, // MANAGE_CREDENTIALS

    };



    /**
@@ -2459,6 +2480,7 @@ public class AppOpsManager { 
            false, // PHONE_CALL_CAMERA

            false, // RECORD_AUDIO_HOTWORD

            true, // MANAGE_ONGOING_CALLS

            false, // MANAGE_CREDENTIALS

    };



    /**