Snap for 6732461 from 5b8ad7d173498a7b5522321dfc7740f3fa6a40b6 to sc-release (8d5bbd3b) · Commits · e / os / android_packages_modules_Bluetooth

service/java/com/android/server/bluetooth/BluetoothService.java

+8 −4

Original line number	Diff line number	Diff line
		@@ -16,10 +16,14 @@

		package com.android.server;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.bluetooth.BluetoothAdapter;
		import android.content.Context;
		import android.os.UserManager;

		import com.android.server.SystemService.TargetUser;

		class BluetoothService extends SystemService {
		private BluetoothManagerService mBluetoothManagerService;
		private boolean mInitialized = false;
		@@ -52,16 +56,16 @@ class BluetoothService extends SystemService {
		}

		@Override
		public void onSwitchUser(int userHandle) {
		public void onUserSwitching(@Nullable TargetUser from, @NonNull TargetUser to) {
		if (!mInitialized) {
		initialize();
		} else {
		mBluetoothManagerService.handleOnSwitchUser(userHandle);
		mBluetoothManagerService.handleOnSwitchUser(to.getUserIdentifier());
		}
		}

		@Override
		public void onUnlockUser(int userHandle) {
		mBluetoothManagerService.handleOnUnlockUser(userHandle);
		public void onUserUnlocking(@NonNull TargetUser user) {
		mBluetoothManagerService.handleOnUnlockUser(user.getUserIdentifier());
		}
		}