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

Commit 7d867342 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Get rid of not specifying a user errors in bluetooth."

parents 1d22bd19 466ce96d

core/java/android/bluetooth/BluetoothA2dp.java

+2 −1
Original line number Diff line number Diff line
@@ -162,7 +162,8 @@ public final class BluetoothA2dp implements BluetoothProfile { 
        Intent intent = new Intent(IBluetoothA2dp.class.getName());

        ComponentName comp = intent.resolveSystemService(mContext.getPackageManager(), 0);

        intent.setComponent(comp);

        if (comp == null || !mContext.bindService(intent, mConnection, 0)) {

        if (comp == null || !mContext.bindServiceAsUser(intent, mConnection, 0,

                android.os.Process.myUserHandle())) {

            Log.e(TAG, "Could not bind to Bluetooth A2DP Service with " + intent);

            return false;

        }

core/java/android/bluetooth/BluetoothHeadset.java

+2 −1
Original line number Diff line number Diff line
@@ -280,7 +280,8 @@ public final class BluetoothHeadset implements BluetoothProfile { 
        Intent intent = new Intent(IBluetoothHeadset.class.getName());

        ComponentName comp = intent.resolveSystemService(mContext.getPackageManager(), 0);

        intent.setComponent(comp);

        if (comp == null || !mContext.bindService(intent, mConnection, 0)) {

        if (comp == null || !mContext.bindServiceAsUser(intent, mConnection, 0,

                android.os.Process.myUserHandle())) {

            Log.e(TAG, "Could not bind to Bluetooth Headset Service with " + intent);

            return false;

        }

core/java/android/bluetooth/BluetoothHealth.java

+2 −1
Original line number Diff line number Diff line
@@ -487,7 +487,8 @@ public final class BluetoothHealth implements BluetoothProfile { 
        Intent intent = new Intent(IBluetoothHealth.class.getName());

        ComponentName comp = intent.resolveSystemService(mContext.getPackageManager(), 0);

        intent.setComponent(comp);

        if (comp == null || !mContext.bindService(intent, mConnection, 0)) {

        if (comp == null || !mContext.bindServiceAsUser(intent, mConnection, 0,

                android.os.Process.myUserHandle())) {

            Log.e(TAG, "Could not bind to Bluetooth Health Service with " + intent);

            return false;

        }

core/java/android/bluetooth/BluetoothInputDevice.java

+2 −1
Original line number Diff line number Diff line
@@ -259,7 +259,8 @@ public final class BluetoothInputDevice implements BluetoothProfile { 
        Intent intent = new Intent(IBluetoothInputDevice.class.getName());

        ComponentName comp = intent.resolveSystemService(mContext.getPackageManager(), 0);

        intent.setComponent(comp);

        if (comp == null || !mContext.bindService(intent, mConnection, 0)) {

        if (comp == null || !mContext.bindServiceAsUser(intent, mConnection, 0,

                android.os.Process.myUserHandle())) {

            Log.e(TAG, "Could not bind to Bluetooth HID Service with " + intent);

            return false;

        }

core/java/android/bluetooth/BluetoothMap.java

+3 −3
Original line number Diff line number Diff line
@@ -22,8 +22,7 @@ import android.content.ComponentName; 
import android.content.Context;

import android.content.Intent;

import android.content.ServiceConnection;

import android.os.RemoteException;

import android.os.IBinder;

import android.os.*;

import android.util.Log;



/**
@@ -105,7 +104,8 @@ public final class BluetoothMap implements BluetoothProfile { 
        Intent intent = new Intent(IBluetoothMap.class.getName());

        ComponentName comp = intent.resolveSystemService(mContext.getPackageManager(), 0);

        intent.setComponent(comp);

        if (comp == null || !mContext.bindService(intent, mConnection, 0)) {

        if (comp == null || !mContext.bindServiceAsUser(intent, mConnection, 0,

                android.os.Process.myUserHandle())) {

            Log.e(TAG, "Could not bind to Bluetooth MAP Service with " + intent);

            return false;

        }