Merge "Removed @Deprecated SystemService callback methods that take a userId."

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;

    }

    @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());

    }

}