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

Commit 326867a0 authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge "Permission: unify reference to permission" into main

parents 809fb58f 4b414a87

android/app/src/com/android/bluetooth/a2dp/A2dpService.java

+3 −3
Original line number Diff line number Diff line
@@ -885,7 +885,7 @@ public class A2dpService extends ProfileService { 
     *     BluetoothA2dp#DYNAMIC_BUFFER_SUPPORT_A2DP_OFFLOAD}, {@link

     *     BluetoothA2dp#DYNAMIC_BUFFER_SUPPORT_A2DP_SOFTWARE_ENCODING}.

     */

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)

    @RequiresPermission(BLUETOOTH_PRIVILEGED)

    public int getDynamicBufferSupport() {

        enforceCallingOrSelfPermission(

                BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");
@@ -897,7 +897,7 @@ public class A2dpService extends ProfileService { 
     *

     * @return BufferConstraints

     */

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)

    @RequiresPermission(BLUETOOTH_PRIVILEGED)

    public BufferConstraints getBufferConstraints() {

        enforceCallingOrSelfPermission(

                BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");
@@ -911,7 +911,7 @@ public class A2dpService extends ProfileService { 
     * @param value buffer millis

     * @return true if the settings is successful, false otherwise

     */

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)

    @RequiresPermission(BLUETOOTH_PRIVILEGED)

    public boolean setBufferLengthMillis(int codec, int value) {

        enforceCallingOrSelfPermission(

                BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");

android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkService.java

+3 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

package com.android.bluetooth.a2dpsink;



import static android.Manifest.permission.BLUETOOTH_CONNECT;

import static android.Manifest.permission.BLUETOOTH_PRIVILEGED;



import static java.util.Objects.requireNonNull;
@@ -176,7 +177,7 @@ public class A2dpSinkService extends ProfileService { 
        }

    }



    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)

    @RequiresPermission(BLUETOOTH_PRIVILEGED)

    boolean isA2dpPlaying(BluetoothDevice device) {

        enforceCallingOrSelfPermission(

                BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");
@@ -206,7 +207,7 @@ public class A2dpSinkService extends ProfileService { 
            mService = null;

        }



        @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

        @RequiresPermission(BLUETOOTH_CONNECT)

        private A2dpSinkService getService(AttributionSource source) {

            // Cache mService because it can change while getService is called

            A2dpSinkService service = mService;

android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkStateMachine.java

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
package com.android.bluetooth.a2dpsink;



import static android.Manifest.permission.BLUETOOTH_CONNECT;

import static android.Manifest.permission.BLUETOOTH_PRIVILEGED;



import android.annotation.RequiresPermission;

import android.bluetooth.BluetoothA2dpSink;
@@ -176,7 +177,7 @@ class A2dpSinkStateMachine extends StateMachine { 
            return false;

        }



        @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)

        @RequiresPermission(BLUETOOTH_PRIVILEGED)

        void processStackEvent(StackEvent event) {

            switch (event.mType) {

                case StackEvent.EVENT_TYPE_CONNECTION_STATE_CHANGED:

android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerService.java

+3 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.bluetooth.avrcpcontroller;



import static android.Manifest.permission.BLUETOOTH_CONNECT;



import static java.util.Objects.requireNonNull;



import android.annotation.RequiresPermission;
@@ -380,7 +382,7 @@ public class AvrcpControllerService extends ProfileService { 
            mService = null;

        }



        @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

        @RequiresPermission(BLUETOOTH_CONNECT)

        private AvrcpControllerService getService(AttributionSource source) {

            // Cache mService because it can change while getService is called

            AvrcpControllerService service = mService;

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ package com.android.bluetooth.btservice; 
import static android.Manifest.permission.BLUETOOTH_CONNECT;

import static android.Manifest.permission.BLUETOOTH_PRIVILEGED;

import static android.Manifest.permission.BLUETOOTH_SCAN;

import static android.Manifest.permission.DUMP;

import static android.Manifest.permission.LOCAL_MAC_ADDRESS;

import static android.Manifest.permission.MODIFY_PHONE_STATE;

import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE;
@@ -3869,7 +3870,7 @@ public class AdapterService extends Service { 
                return;

            }



            service.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, null);

            service.enforceCallingOrSelfPermission(DUMP, null);



            service.dump(fd, writer, args);

            writer.close();