Merge "Update permission enforcement for BluetoothDevice SystemApis" into rvc-dev (9d617577) · Commits · e / os / android_packages_apps_Bluetooth

src/com/android/bluetooth/btservice/AdapterService.java

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1426,7 +1426,7 @@ public class AdapterService extends Service {
	return false;		return false;
	}		}

	enforceBluetoothAdminPermission(service);		enforceBluetoothPrivilegedPermission(service);

	DeviceProperties deviceProp = service.mRemoteDevices.getDeviceProperties(device);		DeviceProperties deviceProp = service.mRemoteDevices.getDeviceProperties(device);
	if (deviceProp != null) {		if (deviceProp != null) {
	@@ -1443,7 +1443,7 @@ public class AdapterService extends Service {
	return false;		return false;
	}		}

	enforceBluetoothAdminPermission(service);		enforceBluetoothPrivilegedPermission(service);

	DeviceProperties deviceProp = service.mRemoteDevices.getDeviceProperties(device);		DeviceProperties deviceProp = service.mRemoteDevices.getDeviceProperties(device);
	if (deviceProp == null \|\| deviceProp.getBondState() != BluetoothDevice.BOND_BONDED) {		if (deviceProp == null \|\| deviceProp.getBondState() != BluetoothDevice.BOND_BONDED) {
	@@ -1478,7 +1478,7 @@ public class AdapterService extends Service {
	return false;		return false;
	}		}

	enforceBluetoothPermission(service);		enforceBluetoothPrivilegedPermission(service);

	DeviceProperties deviceProp = service.mRemoteDevices.getDeviceProperties(device);		DeviceProperties deviceProp = service.mRemoteDevices.getDeviceProperties(device);
	return deviceProp != null && deviceProp.isBondingInitiatedLocally();		return deviceProp != null && deviceProp.isBondingInitiatedLocally();
	@@ -1754,7 +1754,7 @@ public class AdapterService extends Service {
	return BluetoothDevice.ACCESS_UNKNOWN;		return BluetoothDevice.ACCESS_UNKNOWN;
	}		}

	enforceBluetoothPermission(service);		enforceBluetoothPrivilegedPermission(service);

	return service.getDeviceAccessFromPrefs(device, PHONEBOOK_ACCESS_PERMISSION_PREFERENCE_FILE);		return service.getDeviceAccessFromPrefs(device, PHONEBOOK_ACCESS_PERMISSION_PREFERENCE_FILE);
	}		}
	@@ -1779,7 +1779,7 @@ public class AdapterService extends Service {
	return BluetoothDevice.ACCESS_UNKNOWN;		return BluetoothDevice.ACCESS_UNKNOWN;
	}		}

	enforceBluetoothPermission(service);		enforceBluetoothPrivilegedPermission(service);

	return service.getDeviceAccessFromPrefs(device, MESSAGE_ACCESS_PERMISSION_PREFERENCE_FILE);		return service.getDeviceAccessFromPrefs(device, MESSAGE_ACCESS_PERMISSION_PREFERENCE_FILE);
	}		}
	@@ -1855,7 +1855,7 @@ public class AdapterService extends Service {
	return BluetoothDevice.BATTERY_LEVEL_UNKNOWN;		return BluetoothDevice.BATTERY_LEVEL_UNKNOWN;
	}		}

	enforceBluetoothPermission(service);		enforceBluetoothPrivilegedPermission(service);

	DeviceProperties deviceProp = service.mRemoteDevices.getDeviceProperties(device);		DeviceProperties deviceProp = service.mRemoteDevices.getDeviceProperties(device);
	if (deviceProp == null) {		if (deviceProp == null) {