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

Commit 5ae519a2 authored Jan 28, 2022 by Zach Johnson Committed by Android (Google) Code Review Jan 28, 2022

Merge "Re-use the getxxxForUser from systemProcess"

parents 16e721e3 32553180

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

+11 −7

Original line number	Diff line number	Diff line
		@@ -682,15 +682,18 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
		Log.d(TAG, "Loading stored name and address");
		}
		if (getBluetoothBooleanConfig("config_bluetooth_address_validation", false)
		&& Settings.Secure.getInt(mContentResolver, BLUETOOTH_NAME, 0) == 0) {
		&& Settings.Secure.getIntForUser(mContentResolver, BLUETOOTH_NAME, 0,
		UserHandle.SYSTEM.getIdentifier()) == 0) {
		// if the valid flag is not set, don't load the address and name
		if (DBG) {
		Log.d(TAG, "invalid bluetooth name and address stored");
		}
		return;
		}
		mName = Settings.Secure.getString(mContentResolver, BLUETOOTH_NAME);
		mAddress = Settings.Secure.getString(mContentResolver, BLUETOOTH_ADDRESS);
		mName = Settings.Secure.getStringForUser(mContentResolver, BLUETOOTH_NAME,
		UserHandle.SYSTEM.getIdentifier());
		mAddress = Settings.Secure.getStringForUser(mContentResolver, BLUETOOTH_ADDRESS,
		UserHandle.SYSTEM.getIdentifier());
		if (DBG) {
		Log.d(TAG, "Stored bluetooth Name=" + mName + ",Address=" + mAddress);
		}
		@@ -707,8 +710,8 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
		Settings.Secure.putString(mContentResolver, BLUETOOTH_NAME, name);
		mName = name;
		if (DBG) {
		Log.d(TAG, "Stored Bluetooth name: " + Settings.Secure.getString(
		mContentResolver, BLUETOOTH_NAME));
		Log.d(TAG, "Stored Bluetooth name: " + Settings.Secure.getStringForUser(
		mContentResolver, BLUETOOTH_NAME, UserHandle.SYSTEM.getIdentifier()));
		}
		}

		@@ -717,8 +720,9 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
		mAddress = address;
		if (DBG) {
		Log.d(TAG,
		"Stored Bluetoothaddress: " + Settings.Secure.getString(
		mContentResolver, BLUETOOTH_ADDRESS));
		"Stored Bluetoothaddress: " + Settings.Secure.getStringForUser(
		mContentResolver, BLUETOOTH_ADDRESS,
		UserHandle.SYSTEM.getIdentifier()));
		}
		}