diff options
| author | Roopa Sattiraju <sattiraju@google.com> | 2022-01-24 21:53:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-01-24 21:53:10 +0000 |
| commit | bdc32b68e3a52cb3232dfbf19f6b9670a6beeb01 (patch) | |
| tree | 4aa77eaffd04f4a410ef092d8c9963bd2b71b9e0 | |
| parent | 649aaaf7e03a74e03faf742ba34fe7f7a03f0781 (diff) | |
| parent | 06a6a7151ed6d2c27da37975785e66c4ef615c33 (diff) | |
Merge "Use the new setComponentEnabledSettingForUser"
| -rw-r--r-- | service/java/com/android/server/bluetooth/BluetoothManagerService.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/service/java/com/android/server/bluetooth/BluetoothManagerService.java b/service/java/com/android/server/bluetooth/BluetoothManagerService.java index a0ddb56bb7..e90b2b367c 100644 --- a/service/java/com/android/server/bluetooth/BluetoothManagerService.java +++ b/service/java/com/android/server/bluetooth/BluetoothManagerService.java @@ -29,7 +29,6 @@ import android.annotation.NonNull; import android.annotation.RequiresPermission; import android.annotation.SuppressLint; import android.app.ActivityManager; -import android.app.AppGlobals; import android.app.AppOpsManager; import android.app.BroadcastOptions; import android.bluetooth.BluetoothA2dp; @@ -58,7 +57,6 @@ import android.content.IntentFilter; import android.content.PermissionChecker; import android.content.ServiceConnection; import android.content.pm.ApplicationInfo; -import android.content.pm.IPackageManager; import android.content.pm.PackageManager; import android.content.pm.PackageManagerInternal; import android.content.pm.UserInfo; @@ -2764,9 +2762,10 @@ class BluetoothManagerService extends IBluetoothManager.Stub { bluetoothSharingDisallowed ? PackageManager.COMPONENT_ENABLED_STATE_DISABLED : PackageManager.COMPONENT_ENABLED_STATE_DEFAULT; try { - final IPackageManager imp = AppGlobals.getPackageManager(); - imp.setComponentEnabledSetting(oppLauncherComponent, newState, - PackageManager.DONT_KILL_APP, userHandle.getIdentifier()); + mContext.createContextAsUser(userHandle, 0) + .getPackageManager() + .setComponentEnabledSetting(oppLauncherComponent, newState, + PackageManager.DONT_KILL_APP); } catch (Exception e) { // The component was not found, do nothing. } |