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

Commit 6edd25f3 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Jeff Sharkey
Browse files

Pass in the user defined by Context. 

The majority of Manager-style classes already use Context.getUserId()
when making calls into the OS, so clean up the remaining callers to
unify behind this strategy.

This gives @SystemApi developers a nice clean interface to interact
across user boundaries, instead of manually adding "AsUser" or
"ForUser" method variants, which would quickly become unsustainable.

Test: builds, boots
Bug: 72863821
Exempt-From-Owner-Approval: trivial changes
Change-Id: Ib772ec4438e57a2ad4950821b9432f9842998451
parent ff4fbb5d

framework/java/android/bluetooth/BluetoothA2dp.java

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
        ComponentName comp = intent.resolveSystemService(mContext.getPackageManager(), 0);

        intent.setComponent(comp);

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

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

                mContext.getUser())) {

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

            return false;

        }

framework/java/android/bluetooth/BluetoothA2dpSink.java

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile { 
        ComponentName comp = intent.resolveSystemService(mContext.getPackageManager(), 0);

        intent.setComponent(comp);

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

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

                mContext.getUser())) {

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

            return false;

        }

framework/java/android/bluetooth/BluetoothAvrcpController.java

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ public final class BluetoothAvrcpController implements BluetoothProfile { 
        ComponentName comp = intent.resolveSystemService(mContext.getPackageManager(), 0);

        intent.setComponent(comp);

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

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

                mContext.getUser())) {

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

            return false;

        }

framework/java/android/bluetooth/BluetoothHeadsetClient.java

+1 −1
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile { 
        ComponentName comp = intent.resolveSystemService(mContext.getPackageManager(), 0);

        intent.setComponent(comp);

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

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

                mContext.getUser())) {

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

            return false;

        }

framework/java/android/bluetooth/BluetoothHealth.java

+1 −1
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ public final class BluetoothHealth implements BluetoothProfile { 
        ComponentName comp = intent.resolveSystemService(mContext.getPackageManager(), 0);

        intent.setComponent(comp);

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

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

                mContext.getUser())) {

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

            return false;

        }