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

Commit f4ee2f6b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "replace CURRENT_OR_SELF with non hidden API" am: 896b6e91 am: 6f4f0d40 am: b81dcb70 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1901950

Change-Id: I950e56ed6f2d8c2b6252a1df5136ccaa7d63ef21
parents 037d5127 b81dcb70

framework/java/android/bluetooth/BluetoothPbap.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -23,7 +23,6 @@ import android.annotation.SdkConstant; 
import android.annotation.SuppressLint;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.annotation.SystemApi;

import android.bluetooth.annotations.RequiresBluetoothConnectPermission;

import android.bluetooth.annotations.RequiresBluetoothConnectPermission;

import android.bluetooth.annotations.RequiresLegacyBluetoothPermission;

import android.compat.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Attributable;

import android.content.Attributable;

import android.content.AttributionSource;

import android.content.AttributionSource;
@@ -170,7 +169,7 @@ public class BluetoothPbap implements BluetoothProfile { 
                            mContext.getPackageManager(), 0);

                            mContext.getPackageManager(), 0);

                    intent.setComponent(comp);

                    intent.setComponent(comp);

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

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

                            UserHandle.CURRENT_OR_SELF)) {

                            UserHandle.CURRENT)) {

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

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

                        return false;

                        return false;

                    }

                    }

framework/java/android/bluetooth/BluetoothProfileConnector.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -103,7 +103,7 @@ public abstract class BluetoothProfileConnector<T> { 
                            mContext.getPackageManager(), 0);

                            mContext.getPackageManager(), 0);

                    intent.setComponent(comp);

                    intent.setComponent(comp);

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

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

                            UserHandle.CURRENT_OR_SELF)) {

                            UserHandle.CURRENT)) {

                        logError("Could not bind to Bluetooth Service with " + intent);

                        logError("Could not bind to Bluetooth Service with " + intent);

                        return false;

                        return false;

                    }

                    }