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

Commit f651d871 authored by Igor Zaslavsky's avatar Igor Zaslavsky Committed by Automerger Merge Worker
Browse files

Merge "Permissions for RemoteAuth" into udc-dev-plus-aosp am: 5b10149c am: cd826eab 

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



Change-Id: I2ec2536837596d49f5b23982d1410b603aa3c2d0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 94baa8c0 cd826eab

core/api/module-lib-current.txt

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

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

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

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

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

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

  }



}

core/api/test-current.txt

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

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

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

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

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

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

    field public static final String MODIFY_HDR_CONVERSION_MODE = "android.permission.MODIFY_HDR_CONVERSION_MODE";
@@ -54,6 +55,7 @@ package android { 
    field public static final String TEST_INPUT_METHOD = "android.permission.TEST_INPUT_METHOD";

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

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

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

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

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

    field @Deprecated public static final String WRITE_MEDIA_STORAGE = "android.permission.WRITE_MEDIA_STORAGE";

core/res/AndroidManifest.xml

+10 −0
Original line number Diff line number Diff line
@@ -2094,6 +2094,16 @@ 
    <permission android:name="android.permission.MANAGE_TEST_NETWORKS"

        android:protectionLevel="signature" />



    <!-- Allows direct access to the <RemoteAuth>Service interfaces.

         @hide @TestApi @SystemApi(client=android.annotation.SystemApi.Client.MODULE_LIBRARIES) -->

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

                android:protectionLevel="signature" />



    <!-- Allows direct access to the <RemoteAuth>Service authentication methods.

         @hide @TestApi @SystemApi(client=android.annotation.SystemApi.Client.MODULE_LIBRARIES) -->

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

                android:protectionLevel="signature" />



    <!-- @SystemApi @hide Allows applications to read Wi-Fi credential.

         <p>Not for use by third-party applications. -->

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