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

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

Merge "Make READ_NEARBY_STREAMING_POLICY normal permission"

parents 6b4e5541 a2f910a7

core/api/current.txt

+3 −2
Original line number Diff line number Diff line
@@ -129,6 +129,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";
@@ -7248,8 +7249,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<java.lang.String> 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<android.telephony.data.ApnSetting> getOverrideApns(@NonNull android.content.ComponentName);

core/java/android/app/admin/DevicePolicyManager.java

+6 −0
Original line number Diff line number Diff line
@@ -7272,6 +7272,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());

    }
@@ -7312,6 +7315,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());

    }

core/res/AndroidManifest.xml

+3 −4
Original line number Diff line number Diff line
@@ -5940,11 +5940,10 @@ 
    <permission android:name="android.permission.RENOUNCE_PERMISSIONS"

                android:protectionLevel="signature|privileged" />



    <!-- Allows an application to read nearby streaming policy. The policy allows the device

         to stream its notifications and apps to nearby devices.

         @hide -->

    <!-- Allows an application to read nearby streaming policy. The policy controls

         whether to allow the device to stream its notifications and apps to nearby devices. -->

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

        android:protectionLevel="signature|privileged" />

        android:protectionLevel="normal" />



    <!-- @SystemApi Allows the holder to set the source of the data when setting a clip on the

         clipboard.