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

Commit 537f9b6d authored by Warren Ochibobo's avatar Warren Ochibobo Committed by Android (Google) Code Review
Browse files

Merge "Add GET_DEVICE_LOCK_ENROLLMENT_TYPE permission for... 

Merge "Add GET_DEVICE_LOCK_ENROLLMENT_TYPE permission for DeviceLockManager.getEnrollmentType" into main
parents 0f4c5588 74ef6053

AconfigFlags.bp

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ aconfig_declarations_group { 
        "configinfra_framework_flags_java_exported_lib",

        "conscrypt_exported_aconfig_flags_lib",

        "device_policy_aconfig_flags_lib",

        "devicelock-exported-aconfig-flags-lib",

        "display_flags_lib",

        "dropbox_flags_lib",

        "framework-jobscheduler-job.flags-aconfig-java",

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ package android { 
    field public static final String GET_APP_OPS_STATS = "android.permission.GET_APP_OPS_STATS";

    field @FlaggedApi("android.app.bic_client") public static final String GET_BACKGROUND_INSTALLED_PACKAGES = "android.permission.GET_BACKGROUND_INSTALLED_PACKAGES";

    field @FlaggedApi("android.app.get_binding_uid_importance") public static final String GET_BINDING_UID_IMPORTANCE = "android.permission.GET_BINDING_UID_IMPORTANCE";

    field @FlaggedApi("com.android.devicelock.flags.get_enrollment_type") public static final String GET_DEVICE_LOCK_ENROLLMENT_TYPE = "android.permission.GET_DEVICE_LOCK_ENROLLMENT_TYPE";

    field public static final String GET_HISTORICAL_APP_OPS_STATS = "android.permission.GET_HISTORICAL_APP_OPS_STATS";

    field public static final String GET_PROCESS_STATE_AND_OOM_SCORE = "android.permission.GET_PROCESS_STATE_AND_OOM_SCORE";

    field public static final String GET_RUNTIME_PERMISSIONS = "android.permission.GET_RUNTIME_PERMISSIONS";

core/res/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ android_app { 
        "android.media.tv.flags-aconfig",

        "android.security.flags-aconfig",

        "device_policy_aconfig_flags",

        "devicelock-aconfig-flags",

        "android.xr.flags-aconfig",

        "com.android.hardware.input.input-aconfig",

        "aconfig_trade_in_mode_flags",

core/res/AndroidManifest.xml

+11 −0
Original line number Diff line number Diff line
@@ -8672,6 +8672,17 @@ 
    <permission android:name="android.permission.MANAGE_DEVICE_LOCK_STATE"

                android:protectionLevel="internal|role" />



    <!-- Allows an app to get the device lock enrollment type.

        <p>This permission is only granted to system applications.

        <p>Protection level: signature|privileged

        @SystemApi

        @FlaggedApi(com.android.devicelock.flags.Flags.FLAG_GET_ENROLLMENT_TYPE)

        @hide

    -->

    <permission android:name="android.permission.GET_DEVICE_LOCK_ENROLLMENT_TYPE"

        android:protectionLevel="signature|privileged"

        android:featureFlag="com.android.devicelock.flags.get_enrollment_type" />



    <!-- @SystemApi Required by a WearableSensingService to

          ensure that only the caller with this permission can bind to it.

          <p> Protection level: signature

data/etc/privapp-permissions-platform.xml

+1 −0
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ applications that come with the platform 
        <permission name="android.permission.ACCESS_LOWPAN_STATE"/>

        <permission name="android.permission.BACKUP"/>

        <permission name="android.permission.ENTER_TRADE_IN_MODE"/>

        <permission name="android.permission.GET_DEVICE_LOCK_ENROLLMENT_TYPE"/>

        <!-- Needed for GMSCore Location API test only -->

        <permission name="android.permission.LOCATION_BYPASS"/>

        <!-- Needed for test only -->