Merge "Add Bluetooth Contacts Sharing policy in DevicePolicyManager" (0c606812) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -5654,6 +5654,7 @@ package android.app.admin {
		method public java.util.List<android.content.ComponentName> getActiveAdmins();
		method public android.os.Bundle getApplicationRestrictions(android.content.ComponentName, java.lang.String);
		method public boolean getAutoTimeRequired();
		method public boolean getBluetoothContactSharingDisabled(android.content.ComponentName);
		method public boolean getCameraDisabled(android.content.ComponentName);
		method public java.lang.String getCertInstallerPackage(android.content.ComponentName) throws java.lang.SecurityException;
		method public boolean getCrossProfileCallerIdDisabled(android.content.ComponentName);
		@@ -5704,6 +5705,7 @@ package android.app.admin {
		method public boolean setApplicationHidden(android.content.ComponentName, java.lang.String, boolean);
		method public void setApplicationRestrictions(android.content.ComponentName, java.lang.String, android.os.Bundle);
		method public void setAutoTimeRequired(android.content.ComponentName, boolean);
		method public void setBluetoothContactSharingDisabled(android.content.ComponentName, boolean);
		method public void setCameraDisabled(android.content.ComponentName, boolean);
		method public void setCertInstallerPackage(android.content.ComponentName, java.lang.String) throws java.lang.SecurityException;
		method public void setCrossProfileCallerIdDisabled(android.content.ComponentName, boolean);

api/system-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -5750,6 +5750,7 @@ package android.app.admin {
		method public java.util.List<android.content.ComponentName> getActiveAdmins();
		method public android.os.Bundle getApplicationRestrictions(android.content.ComponentName, java.lang.String);
		method public boolean getAutoTimeRequired();
		method public boolean getBluetoothContactSharingDisabled(android.content.ComponentName);
		method public boolean getCameraDisabled(android.content.ComponentName);
		method public java.lang.String getCertInstallerPackage(android.content.ComponentName) throws java.lang.SecurityException;
		method public boolean getCrossProfileCallerIdDisabled(android.content.ComponentName);
		@@ -5808,6 +5809,7 @@ package android.app.admin {
		method public boolean setApplicationHidden(android.content.ComponentName, java.lang.String, boolean);
		method public void setApplicationRestrictions(android.content.ComponentName, java.lang.String, android.os.Bundle);
		method public void setAutoTimeRequired(android.content.ComponentName, boolean);
		method public void setBluetoothContactSharingDisabled(android.content.ComponentName, boolean);
		method public void setCameraDisabled(android.content.ComponentName, boolean);
		method public void setCertInstallerPackage(android.content.ComponentName, java.lang.String) throws java.lang.SecurityException;
		method public void setCrossProfileCallerIdDisabled(android.content.ComponentName, boolean);

core/java/android/app/admin/DevicePolicyManager.java

+67 −0

Original line number	Diff line number	Diff line
		@@ -3253,6 +3253,73 @@ public class DevicePolicyManager {
		}
		}

		/**
		* Called by a profile owner of a managed profile to set whether bluetooth
		* devices can access enterprise contacts.
		* <p>
		* The calling device admin must be a profile owner. If it is not, a
		* security exception will be thrown.
		* <p>
		* This API works on managed profile only.
		*
		* @param who Which {@link DeviceAdminReceiver} this request is associated
		* with.
		* @param disabled If true, bluetooth devices cannot access enterprise
		* contacts.
		*/
		public void setBluetoothContactSharingDisabled(ComponentName who, boolean disabled) {
		if (mService != null) {
		try {
		mService.setBluetoothContactSharingDisabled(who, disabled);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		}
		}

		/**
		* Called by a profile owner of a managed profile to determine whether or
		* not Bluetooth devices cannot access enterprise contacts.
		* <p>
		* The calling device admin must be a profile owner. If it is not, a
		* security exception will be thrown.
		* <p>
		* This API works on managed profile only.
		*
		* @param who Which {@link DeviceAdminReceiver} this request is associated
		* with.
		*/
		public boolean getBluetoothContactSharingDisabled(ComponentName who) {
		if (mService != null) {
		try {
		return mService.getBluetoothContactSharingDisabled(who);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		}
		return true;
		}

		/**
		* Determine whether or not Bluetooth devices cannot access contacts.
		* <p>
		* This API works on managed profile UserHandle only.
		*
		* @param userHandle The user for whom to check the caller-id permission
		* @hide
		*/
		public boolean getBluetoothContactSharingDisabled(UserHandle userHandle) {
		if (mService != null) {
		try {
		return mService.getBluetoothContactSharingDisabledForUser(userHandle
		.getIdentifier());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		}
		return true;
		}

		/**
		* Called by the profile owner of a managed profile so that some intents sent in the managed
		* profile can also be resolved in the parent, or vice versa.

core/java/android/app/admin/IDevicePolicyManager.aidl

+4 −0

Original line number	Diff line number	Diff line
		@@ -191,6 +191,10 @@ interface IDevicePolicyManager {
		boolean getCrossProfileCallerIdDisabledForUser(int userId);
		void startManagedQuickContact(String lookupKey, long contactId, in Intent originalIntent);

		void setBluetoothContactSharingDisabled(in ComponentName who, boolean disabled);
		boolean getBluetoothContactSharingDisabled(in ComponentName who);
		boolean getBluetoothContactSharingDisabledForUser(int userId);

		void setTrustAgentConfiguration(in ComponentName admin, in ComponentName agent,
		in PersistableBundle args);
		List<PersistableBundle> getTrustAgentConfiguration(in ComponentName admin,

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+54 −0

Original line number	Diff line number	Diff line
		@@ -347,6 +347,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		private static final String TAG_DISABLE_KEYGUARD_FEATURES = "disable-keyguard-features";
		private static final String TAG_DISABLE_CAMERA = "disable-camera";
		private static final String TAG_DISABLE_CALLER_ID = "disable-caller-id";
		private static final String TAG_DISABLE_BLUETOOTH_CONTACT_SHARING
		= "disable-bt-contacts-sharing";
		private static final String TAG_DISABLE_SCREEN_CAPTURE = "disable-screen-capture";
		private static final String TAG_DISABLE_ACCOUNT_MANAGEMENT = "disable-account-management";
		private static final String TAG_REQUIRE_AUTO_TIME = "require_auto_time";
		@@ -428,6 +430,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		boolean encryptionRequested = false;
		boolean disableCamera = false;
		boolean disableCallerId = false;
		boolean disableBluetoothContactSharing = true;
		boolean disableScreenCapture = false; // Can only be set by a device/profile owner.
		boolean requireAutoTime = false; // Can only be set by a device owner.

		@@ -569,6 +572,12 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		out.attribute(null, ATTR_VALUE, Boolean.toString(disableCallerId));
		out.endTag(null, TAG_DISABLE_CALLER_ID);
		}
		if (disableBluetoothContactSharing) {
		out.startTag(null, TAG_DISABLE_BLUETOOTH_CONTACT_SHARING);
		out.attribute(null, ATTR_VALUE,
		Boolean.toString(disableBluetoothContactSharing));
		out.endTag(null, TAG_DISABLE_BLUETOOTH_CONTACT_SHARING);
		}
		if (disableScreenCapture) {
		out.startTag(null, TAG_DISABLE_SCREEN_CAPTURE);
		out.attribute(null, ATTR_VALUE, Boolean.toString(disableScreenCapture));
		@@ -714,6 +723,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		} else if (TAG_DISABLE_CALLER_ID.equals(tag)) {
		disableCallerId = Boolean.parseBoolean(
		parser.getAttributeValue(null, ATTR_VALUE));
		} else if (TAG_DISABLE_BLUETOOTH_CONTACT_SHARING.equals(tag)) {
		disableBluetoothContactSharing = Boolean.parseBoolean(parser
		.getAttributeValue(null, ATTR_VALUE));
		} else if (TAG_DISABLE_SCREEN_CAPTURE.equals(tag)) {
		disableScreenCapture = Boolean.parseBoolean(
		parser.getAttributeValue(null, ATTR_VALUE));
		@@ -904,6 +916,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		pw.println(disableCamera);
		pw.print(prefix); pw.print("disableCallerId=");
		pw.println(disableCallerId);
		pw.print(prefix); pw.print("disableBluetoothContactSharing=");
		pw.println(disableBluetoothContactSharing);
		pw.print(prefix); pw.print("disableScreenCapture=");
		pw.println(disableScreenCapture);
		pw.print(prefix); pw.print("requireAutoTime=");
		@@ -5522,6 +5536,46 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		return -1;
		}

		@Override
		public void setBluetoothContactSharingDisabled(ComponentName who, boolean disabled) {
		if (!mHasFeature) {
		return;
		}
		Preconditions.checkNotNull(who, "ComponentName is null");
		synchronized (this) {
		ActiveAdmin admin = getActiveAdminForCallerLocked(who,
		DeviceAdminInfo.USES_POLICY_PROFILE_OWNER);
		if (admin.disableBluetoothContactSharing != disabled) {
		admin.disableBluetoothContactSharing = disabled;
		saveSettingsLocked(UserHandle.getCallingUserId());
		}
		}
		}

		@Override
		public boolean getBluetoothContactSharingDisabled(ComponentName who) {
		if (!mHasFeature) {
		return false;
		}
		Preconditions.checkNotNull(who, "ComponentName is null");
		synchronized (this) {
		ActiveAdmin admin = getActiveAdminForCallerLocked(who,
		DeviceAdminInfo.USES_POLICY_PROFILE_OWNER);
		return admin.disableBluetoothContactSharing;
		}
		}

		@Override
		public boolean getBluetoothContactSharingDisabledForUser(int userId) {
		// TODO: Should there be a check to make sure this relationship is
		// within a profile group?
		// enforceSystemProcess("getCrossProfileCallerIdDisabled can only be called by system");
		synchronized (this) {
		ActiveAdmin admin = getProfileOwnerAdmin(userId);
		return (admin != null) ? admin.disableBluetoothContactSharing : false;
		}
		}

		/**
		* Sets which packages may enter lock task mode.
		*