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

Commit e61d4f40 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Use @ConnectionPolicy annotation more consistently in classes with... 

Merge "Use @ConnectionPolicy annotation more consistently in classes with methods setConnectionPolicy and getConnectionPolicy" am: 90b26ecc am: a54f1cff am: 91438574

Change-Id: I7777fcd80d3be4d7a523f5d296e602391949fe16
parents f4370cb3 91438574

framework/java/android/bluetooth/BluetoothA2dpSink.java

+3 −2
Original line number Diff line number Diff line
@@ -297,7 +297,8 @@ public final class BluetoothA2dpSink implements BluetoothProfile { 
     */

    @SystemApi

    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)

    public boolean setConnectionPolicy(@Nullable BluetoothDevice device, int connectionPolicy) {

    public boolean setConnectionPolicy(@Nullable BluetoothDevice device,

            @ConnectionPolicy int connectionPolicy) {

        if (DBG) log("setConnectionPolicy(" + device + ", " + connectionPolicy + ")");

        final IBluetoothA2dpSink service = getService();

        if (service != null && isEnabled() && isValidDevice(device)) {
@@ -345,7 +346,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile { 
     */

    @SystemApi

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    public int getConnectionPolicy(@Nullable BluetoothDevice device) {

    public @ConnectionPolicy int getConnectionPolicy(@Nullable BluetoothDevice device) {

        if (VDBG) log("getConnectionPolicy(" + device + ")");

        final IBluetoothA2dpSink service = getService();

        if (service != null && isEnabled() && isValidDevice(device)) {

framework/java/android/bluetooth/BluetoothHeadsetClient.java

+3 −2
Original line number Diff line number Diff line
@@ -584,7 +584,8 @@ public final class BluetoothHeadsetClient implements BluetoothProfile { 
     */

    @SystemApi

    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)

    public boolean setConnectionPolicy(BluetoothDevice device, int connectionPolicy) {

    public boolean setConnectionPolicy(BluetoothDevice device,

            @ConnectionPolicy int connectionPolicy) {

        if (DBG) log("setConnectionPolicy(" + device + ", " + connectionPolicy + ")");

        final IBluetoothHeadsetClient service =

                getService();
@@ -633,7 +634,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile { 
     */

    @SystemApi

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    public int getConnectionPolicy(BluetoothDevice device) {

    public @ConnectionPolicy int getConnectionPolicy(BluetoothDevice device) {

        if (VDBG) log("getConnectionPolicy(" + device + ")");

        final IBluetoothHeadsetClient service =

                getService();

framework/java/android/bluetooth/BluetoothHidHost.java

+3 −2
Original line number Diff line number Diff line
@@ -416,7 +416,8 @@ public final class BluetoothHidHost implements BluetoothProfile { 
     */

    @SystemApi

    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)

    public boolean setConnectionPolicy(@Nullable BluetoothDevice device, int connectionPolicy) {

    public boolean setConnectionPolicy(@Nullable BluetoothDevice device,

            @ConnectionPolicy int connectionPolicy) {

        if (DBG) log("setConnectionPolicy(" + device + ", " + connectionPolicy + ")");

        final IBluetoothHidHost service = getService();

        if (service != null && isEnabled() && isValidDevice(device)) {
@@ -464,7 +465,7 @@ public final class BluetoothHidHost implements BluetoothProfile { 
     */

    @SystemApi

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    public int getConnectionPolicy(@Nullable BluetoothDevice device) {

    public @ConnectionPolicy int getConnectionPolicy(@Nullable BluetoothDevice device) {

        if (VDBG) log("getConnectionPolicy(" + device + ")");

        final IBluetoothHidHost service = getService();

        if (service != null && isEnabled() && isValidDevice(device)) {

framework/java/android/bluetooth/BluetoothMap.java

+3 −2
Original line number Diff line number Diff line
@@ -340,7 +340,8 @@ public final class BluetoothMap implements BluetoothProfile { 
     */

    @SystemApi

    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)

    public boolean setConnectionPolicy(@Nullable BluetoothDevice device, int connectionPolicy) {

    public boolean setConnectionPolicy(@Nullable BluetoothDevice device,

            @ConnectionPolicy int connectionPolicy) {

        if (DBG) log("setConnectionPolicy(" + device + ", " + connectionPolicy + ")");

        final IBluetoothMap service = getService();

        if (service != null && isEnabled() && isValidDevice(device)) {
@@ -388,7 +389,7 @@ public final class BluetoothMap implements BluetoothProfile { 
     */

    @SystemApi

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    public int getConnectionPolicy(@Nullable BluetoothDevice device) {

    public @ConnectionPolicy int getConnectionPolicy(@Nullable BluetoothDevice device) {

        if (VDBG) log("getConnectionPolicy(" + device + ")");

        final IBluetoothMap service = getService();

        if (service != null && isEnabled() && isValidDevice(device)) {

framework/java/android/bluetooth/BluetoothMapClient.java

+3 −2
Original line number Diff line number Diff line
@@ -271,7 +271,8 @@ public final class BluetoothMapClient implements BluetoothProfile { 
     */

    @SystemApi

    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)

    public boolean setConnectionPolicy(BluetoothDevice device, int connectionPolicy) {

    public boolean setConnectionPolicy(BluetoothDevice device,

            @ConnectionPolicy int connectionPolicy) {

        if (DBG) Log.d(TAG, "setConnectionPolicy(" + device + ", " + connectionPolicy + ")");

        final IBluetoothMapClient service = getService();

        if (service != null && isEnabled() && isValidDevice(device)) {
@@ -319,7 +320,7 @@ public final class BluetoothMapClient implements BluetoothProfile { 
     */

    @SystemApi

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    public int getConnectionPolicy(BluetoothDevice device) {

    public @ConnectionPolicy int getConnectionPolicy(BluetoothDevice device) {

        if (VDBG) Log.d(TAG, "getConnectionPolicy(" + device + ")");

        final IBluetoothMapClient service = getService();

        if (service != null && isEnabled() && isValidDevice(device)) {