Merge "Introduce a new user restriction for disallowing Bluetooth." (5fb37a76) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -29277,6 +29277,7 @@ package android.os {
		field public static final java.lang.String DISALLOW_ADD_USER = "no_add_user";
		field public static final java.lang.String DISALLOW_ADJUST_VOLUME = "no_adjust_volume";
		field public static final java.lang.String DISALLOW_APPS_CONTROL = "no_control_apps";
		field public static final java.lang.String DISALLOW_BLUETOOTH = "no_bluetooth";
		field public static final java.lang.String DISALLOW_CONFIG_BLUETOOTH = "no_config_bluetooth";
		field public static final java.lang.String DISALLOW_CONFIG_CELL_BROADCASTS = "no_config_cell_broadcasts";
		field public static final java.lang.String DISALLOW_CONFIG_CREDENTIALS = "no_config_credentials";

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -31804,6 +31804,7 @@ package android.os {
		field public static final java.lang.String DISALLOW_ADD_USER = "no_add_user";
		field public static final java.lang.String DISALLOW_ADJUST_VOLUME = "no_adjust_volume";
		field public static final java.lang.String DISALLOW_APPS_CONTROL = "no_control_apps";
		field public static final java.lang.String DISALLOW_BLUETOOTH = "no_bluetooth";
		field public static final java.lang.String DISALLOW_CONFIG_BLUETOOTH = "no_config_bluetooth";
		field public static final java.lang.String DISALLOW_CONFIG_CELL_BROADCASTS = "no_config_cell_broadcasts";
		field public static final java.lang.String DISALLOW_CONFIG_CREDENTIALS = "no_config_credentials";

api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -29347,6 +29347,7 @@ package android.os {
		field public static final java.lang.String DISALLOW_ADD_USER = "no_add_user";
		field public static final java.lang.String DISALLOW_ADJUST_VOLUME = "no_adjust_volume";
		field public static final java.lang.String DISALLOW_APPS_CONTROL = "no_control_apps";
		field public static final java.lang.String DISALLOW_BLUETOOTH = "no_bluetooth";
		field public static final java.lang.String DISALLOW_CONFIG_BLUETOOTH = "no_config_bluetooth";
		field public static final java.lang.String DISALLOW_CONFIG_CELL_BROADCASTS = "no_config_cell_broadcasts";
		field public static final java.lang.String DISALLOW_CONFIG_CREDENTIALS = "no_config_credentials";

core/java/android/os/UserManager.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -186,6 +186,8 @@ public class UserManager {
		* Specifies if a user is disallowed from configuring bluetooth.
		* This does <em>not</em> restrict the user from turning bluetooth on or off.
		* The default value is <code>false</code>.
		* <p>This restriction doesn't prevent the user from using bluetooth. For disallowing usage of
		* bluetooth completely on the device, use {@link #DISALLOW_BLUETOOTH}.
		* <p>This restriction has no effect in a managed profile.
		*
		* <p>Key for user restrictions.
		@@ -196,6 +198,20 @@ public class UserManager {
		*/
		public static final String DISALLOW_CONFIG_BLUETOOTH = "no_config_bluetooth";

		/**
		* Specifies if bluetooth is disallowed on the device.
		*
		* <p> This restriction can only be set by the device owner and the profile owner on the
		* primary user and it applies globally - i.e. it disables bluetooth on the entire device.
		* <p>The default value is <code>false</code>.
		* <p>Key for user restrictions.
		* <p>Type: Boolean
		* @see DevicePolicyManager#addUserRestriction(ComponentName, String)
		* @see DevicePolicyManager#clearUserRestriction(ComponentName, String)
		* @see #getUserRestrictions()
		*/
		public static final String DISALLOW_BLUETOOTH = "no_bluetooth";

		/**
		* Specifies if a user is disallowed from transferring files over
		* USB. This can only be set by device owners and profile owners on the primary user.

services/core/java/com/android/server/BluetoothManagerService.java

+51 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ import android.content.pm.UserInfo;
		import android.database.ContentObserver;
		import android.os.Binder;
		import android.os.Build;
		import android.os.Bundle;
		import android.os.Handler;
		import android.os.IBinder;
		import android.os.Looper;
		@@ -51,6 +52,8 @@ import android.os.RemoteException;
		import android.os.SystemClock;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.os.UserManagerInternal;
		import android.os.UserManagerInternal.UserRestrictionsListener;
		import android.provider.Settings;
		import android.provider.Settings.SettingNotFoundException;
		import android.util.Slog;
		@@ -176,6 +179,24 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
		}
		};

		private final UserRestrictionsListener mUserRestrictionsListener =
		new UserRestrictionsListener() {
		@Override
		public void onUserRestrictionsChanged(int userId, Bundle newRestrictions,
		Bundle prevRestrictions) {
		final boolean bluetoothDisallowed =
		newRestrictions.getBoolean(UserManager.DISALLOW_BLUETOOTH);
		if ((mEnable \|\| mEnableExternal) && bluetoothDisallowed) {
		try {
		disable(null, true);
		} catch (RemoteException e) {
		Slog.w(TAG, "Exception when disabling Bluetooth from UserRestrictionsListener",
		e);
		}
		}
		}
		};

		private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		@@ -612,6 +633,13 @@ class BluetoothManagerService extends IBluetoothManager.Stub {

		public boolean enableNoAutoConnect()
		{
		if (isBluetoothDisallowed()) {
		if (DBG) {
		Slog.d(TAG, "enableNoAutoConnect(): not enabling - bluetooth disallowed");
		}
		return false;
		}

		mContext.enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM,
		"Need BLUETOOTH ADMIN permission");

		@@ -637,6 +665,13 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
		final int callingUid = Binder.getCallingUid();
		final boolean callerSystem = UserHandle.getAppId(callingUid) == Process.SYSTEM_UID;

		if (isBluetoothDisallowed()) {
		if (DBG) {
		Slog.d(TAG,"enable(): not enabling - bluetooth disallowed");
		}
		return false;
		}

		if (!callerSystem) {
		if (!checkIfCallerIsForegroundUser()) {
		Slog.w(TAG, "enable(): not allowed for non-active and non system user");
		@@ -841,6 +876,12 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
		*/
		public void handleOnBootPhase() {
		if (DBG) Slog.d(TAG, "Bluetooth boot completed");
		UserManagerInternal userManagerInternal =
		LocalServices.getService(UserManagerInternal.class);
		userManagerInternal.addUserRestrictionsListener(mUserRestrictionsListener);
		if (isBluetoothDisallowed()) {
		return;
		}
		if (mEnableExternal && isBluetoothPersistedStateOnBluetooth()) {
		if (DBG) Slog.d(TAG, "Auto-enabling Bluetooth.");
		sendEnableMsg(mQuietEnableExternal);
		@@ -1883,6 +1924,16 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
		}
		}

		private boolean isBluetoothDisallowed() {
		long callingIdentity = Binder.clearCallingIdentity();
		try {
		return mContext.getSystemService(UserManager.class)
		.hasUserRestriction(UserManager.DISALLOW_BLUETOOTH, UserHandle.SYSTEM);
		} finally {
		Binder.restoreCallingIdentity(callingIdentity);
		}
		}

		@Override
		public void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
		mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, TAG);