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

Commit 578848e1 authored by Mårten Kongstad's avatar Mårten Kongstad Committed by Android (Google) Code Review
Browse files

Merge "Fix flag name 'android.companion.device_presence' typo" into main

parents d39bfe0f 74682202

core/api/current.txt

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

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

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

    field @FlaggedApi("android.companion.flags.device_presence") public static final String REQUEST_OBSERVE_DEVICE_UUID_PRESENCE = "android.permission.REQUEST_OBSERVE_DEVICE_UUID_PRESENCE";

    field @FlaggedApi("android.companion.device_presence") public static final String REQUEST_OBSERVE_DEVICE_UUID_PRESENCE = "android.permission.REQUEST_OBSERVE_DEVICE_UUID_PRESENCE";

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

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

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

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -5890,7 +5890,7 @@ 
    <!-- Allows an application to subscribe to notifications about the nearby devices' presence

         status change base on the UUIDs.

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

         @FlaggedApi("android.companion.flags.device_presence")

         @FlaggedApi("android.companion.device_presence")

    -->

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

                android:protectionLevel="signature|privileged" />