diff --git a/core/api/current.txt b/core/api/current.txt index 2f0969bf9730b..e78eb56b5f638 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -128,6 +128,7 @@ package android { field public static final String READ_EXTERNAL_STORAGE = "android.permission.READ_EXTERNAL_STORAGE"; field @Deprecated public static final String READ_INPUT_STATE = "android.permission.READ_INPUT_STATE"; field public static final String READ_LOGS = "android.permission.READ_LOGS"; + field public static final String READ_NEARBY_STREAMING_POLICY = "android.permission.READ_NEARBY_STREAMING_POLICY"; field public static final String READ_PHONE_NUMBERS = "android.permission.READ_PHONE_NUMBERS"; field public static final String READ_PHONE_STATE = "android.permission.READ_PHONE_STATE"; field public static final String READ_PRECISE_PHONE_STATE = "android.permission.READ_PRECISE_PHONE_STATE"; @@ -7180,8 +7181,8 @@ package android.app.admin { method public int getMaximumFailedPasswordsForWipe(@Nullable android.content.ComponentName); method public long getMaximumTimeToLock(@Nullable android.content.ComponentName); method @NonNull public java.util.List getMeteredDataDisabledPackages(@NonNull android.content.ComponentName); - method public int getNearbyAppStreamingPolicy(); - method public int getNearbyNotificationStreamingPolicy(); + method @RequiresPermission(value=android.Manifest.permission.READ_NEARBY_STREAMING_POLICY, conditional=true) public int getNearbyAppStreamingPolicy(); + method @RequiresPermission(value=android.Manifest.permission.READ_NEARBY_STREAMING_POLICY, conditional=true) public int getNearbyNotificationStreamingPolicy(); method @Deprecated @ColorInt public int getOrganizationColor(@NonNull android.content.ComponentName); method @Nullable public CharSequence getOrganizationName(@NonNull android.content.ComponentName); method public java.util.List getOverrideApns(@NonNull android.content.ComponentName); diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 84bb9c62a4615..5241f5bdcb4b4 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -7242,6 +7242,9 @@ public class DevicePolicyManager { * Returns the current runtime nearby notification streaming policy set by the device or profile * owner. */ + @RequiresPermission( + value = android.Manifest.permission.READ_NEARBY_STREAMING_POLICY, + conditional = true) public @NearbyStreamingPolicy int getNearbyNotificationStreamingPolicy() { return getNearbyNotificationStreamingPolicy(myUserId()); } @@ -7282,6 +7285,9 @@ public class DevicePolicyManager { /** * Returns the current runtime nearby app streaming policy set by the device or profile owner. */ + @RequiresPermission( + value = android.Manifest.permission.READ_NEARBY_STREAMING_POLICY, + conditional = true) public @NearbyStreamingPolicy int getNearbyAppStreamingPolicy() { return getNearbyAppStreamingPolicy(myUserId()); } diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index bf2c08fef30fe..1fc72d7dd184f 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -5832,11 +5832,10 @@ - + + android:protectionLevel="normal" />