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

Commit 7277d358 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make associate companion apps permission @SystemApi" into sc-dev

parents bb1040a5 2398a1dd

core/api/system-current.txt

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

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

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

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

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

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

    field public static final String BATTERY_PREDICTION = "android.permission.BATTERY_PREDICTION";
@@ -2220,7 +2221,7 @@ package android.bluetooth.le { 
package android.companion {















  public final class CompanionDeviceManager {













    method @RequiresPermission("android.permission.ASSOCIATE_COMPANION_DEVICES") public boolean associate(@NonNull String, @NonNull android.net.MacAddress);













    method @RequiresPermission(android.Manifest.permission.ASSOCIATE_COMPANION_DEVICES) public boolean associate(@NonNull String, @NonNull android.net.MacAddress);















    method @RequiresPermission("android.permission.MANAGE_COMPANION_DEVICES") public boolean canPairWithoutPrompt(@NonNull String, @NonNull String, int);















    method @RequiresPermission("android.permission.MANAGE_COMPANION_DEVICES") public boolean isDeviceAssociatedForWifiConnection(@NonNull String, @NonNull android.net.MacAddress, @NonNull android.os.UserHandle);















  }

































core/res/AndroidManifest.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -4258,6 +4258,7 @@













                android:protectionLevel="normal" />































    <!-- Allows an application to create new companion device associations.













         @SystemApi















         @hide -->















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















        android:protectionLevel="internal|role" />