am 12df8729: am 45fb047d: am eb3f4b1c: Merge "Provide lockdown of date/time... (b6c0fc86) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -5427,6 +5427,7 @@ package android.app.admin {
		method public java.lang.String[] getAccountTypesWithManagementDisabled();
		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 getCameraDisabled(android.content.ComponentName);
		method public boolean getCrossProfileCallerIdDisabled(android.content.ComponentName);
		method public java.util.List<java.lang.String> getCrossProfileWidgetProviders(android.content.ComponentName);
		@@ -5474,6 +5475,7 @@ package android.app.admin {
		method public void setAccountManagementDisabled(android.content.ComponentName, java.lang.String, boolean);
		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 setCameraDisabled(android.content.ComponentName, boolean);
		method public void setCrossProfileCallerIdDisabled(android.content.ComponentName, boolean);
		method public void setGlobalSetting(android.content.ComponentName, java.lang.String, java.lang.String);

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

+37 −1

Original line number	Diff line number	Diff line
		@@ -1914,7 +1914,7 @@ public class DevicePolicyManager {
		* security exception will be thrown.
		*
		* @param admin Which {@link DeviceAdminReceiver} this request is associated with.
		* @param disabled Whether or not screen capture should be disabled.
		* @param disabled Whether screen capture is disabled or not.
		*/
		public void setScreenCaptureDisabled(ComponentName admin, boolean disabled) {
		if (mService != null) {
		@@ -1948,6 +1948,42 @@ public class DevicePolicyManager {
		return false;
		}

		/**
		* Called by a device owner to set whether auto time is required. If auto time is
		* required the user cannot set the date and time, but has to use network date and time.
		*
		* <p>Note: if auto time is required the user can still manually set the time zone.
		*
		* <p>The calling device admin must be a device owner. If it is not, a security exception will
		* be thrown.
		*
		* @param admin Which {@link DeviceAdminReceiver} this request is associated with.
		* @param required Whether auto time is set required or not.
		*/
		public void setAutoTimeRequired(ComponentName admin, boolean required) {
		if (mService != null) {
		try {
		mService.setAutoTimeRequired(admin, UserHandle.myUserId(), required);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		}
		}

		/**
		* @return true if auto time is required.
		*/
		public boolean getAutoTimeRequired() {
		if (mService != null) {
		try {
		return mService.getAutoTimeRequired();
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}
		}
		return false;
		}

		/**
		* Called by an application that is administering the device to disable keyguard customizations,
		* such as widgets. After setting this, keyguard features will be disabled according to the

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -193,4 +193,7 @@ interface IDevicePolicyManager {
		boolean addCrossProfileWidgetProvider(in ComponentName admin, String packageName);
		boolean removeCrossProfileWidgetProvider(in ComponentName admin, String packageName);
		List<String> getCrossProfileWidgetProviders(in ComponentName admin);

		void setAutoTimeRequired(in ComponentName who, int userHandle, boolean required);
		boolean getAutoTimeRequired();
		}

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

+76 −0

Original line number	Diff line number	Diff line
		@@ -294,6 +294,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		private static final String TAG_DISABLE_CALLER_ID = "disable-caller-id";
		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";
		private static final String TAG_ACCOUNT_TYPE = "account-type";
		private static final String TAG_PERMITTED_ACCESSIBILITY_SERVICES
		= "permitted-accessiblity-services";
		@@ -372,6 +373,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		boolean disableCamera = false;
		boolean disableCallerId = false;
		boolean disableScreenCapture = false; // Can only be set by a device/profile owner.
		boolean requireAutoTime = false; // Can only be set by a device owner.

		Set<String> accountTypesWithManagementDisabled = new HashSet<String>();

		@@ -508,6 +510,11 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		out.attribute(null, ATTR_VALUE, Boolean.toString(disableScreenCapture));
		out.endTag(null, TAG_DISABLE_SCREEN_CAPTURE);
		}
		if (requireAutoTime) {
		out.startTag(null, TAG_REQUIRE_AUTO_TIME);
		out.attribute(null, ATTR_VALUE, Boolean.toString(requireAutoTime));
		out.endTag(null, TAG_REQUIRE_AUTO_TIME);
		}
		if (disabledKeyguardFeatures != DEF_KEYGUARD_FEATURES_DISABLED) {
		out.startTag(null, TAG_DISABLE_KEYGUARD_FEATURES);
		out.attribute(null, ATTR_VALUE, Integer.toString(disabledKeyguardFeatures));
		@@ -641,6 +648,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		} else if (TAG_DISABLE_SCREEN_CAPTURE.equals(tag)) {
		disableScreenCapture = Boolean.parseBoolean(
		parser.getAttributeValue(null, ATTR_VALUE));
		} else if (TAG_REQUIRE_AUTO_TIME.equals(tag)) {
		requireAutoTime= Boolean.parseBoolean(
		parser.getAttributeValue(null, ATTR_VALUE));
		} else if (TAG_DISABLE_KEYGUARD_FEATURES.equals(tag)) {
		disabledKeyguardFeatures = Integer.parseInt(
		parser.getAttributeValue(null, ATTR_VALUE));
		@@ -825,6 +835,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		pw.println(disableCallerId);
		pw.print(prefix); pw.print("disableScreenCapture=");
		pw.println(disableScreenCapture);
		pw.print(prefix); pw.print("requireAutoTime=");
		pw.println(requireAutoTime);
		pw.print(prefix); pw.print("disabledKeyguardFeatures=");
		pw.println(disabledKeyguardFeatures);
		pw.print(prefix); pw.print("crossProfileWidgetProviders=");
		@@ -3425,6 +3437,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		if (!mHasFeature) {
		return;
		}
		enforceCrossUserPermission(userHandle);
		synchronized (this) {
		if (who == null) {
		throw new NullPointerException("ComponentName is null");
		@@ -3476,6 +3489,51 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		}
		}

		/**
		* Set whether auto time is required by the specified admin (must be device owner).
		*/
		public void setAutoTimeRequired(ComponentName who, int userHandle, boolean required) {
		if (!mHasFeature) {
		return;
		}
		enforceCrossUserPermission(userHandle);
		synchronized (this) {
		if (who == null) {
		throw new NullPointerException("ComponentName is null");
		}
		ActiveAdmin admin = getActiveAdminForCallerLocked(who,
		DeviceAdminInfo.USES_POLICY_DEVICE_OWNER);
		if (admin.requireAutoTime != required) {
		admin.requireAutoTime = required;
		saveSettingsLocked(userHandle);
		}
		}

		// Turn AUTO_TIME on in settings if it is required
		if (required) {
		long ident = Binder.clearCallingIdentity();
		try {
		Settings.Global.putInt(mContext.getContentResolver(),
		Settings.Global.AUTO_TIME, 1 /* AUTO_TIME on */);
		} finally {
		Binder.restoreCallingIdentity(ident);
		}
		}
		}

		/**
		* Returns whether or not auto time is required by the device owner.
		*/
		public boolean getAutoTimeRequired() {
		if (!mHasFeature) {
		return false;
		}
		synchronized (this) {
		ActiveAdmin deviceOwner = getDeviceOwnerAdmin();
		return (deviceOwner != null) ? deviceOwner.requireAutoTime : false;
		}
		}

		/**
		* The system property used to share the state of the camera. The native camera service
		* is expected to read this property and act accordingly.
		@@ -3656,6 +3714,24 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		return null;
		}

		// Returns the active device owner or null if there is no device owner.
		private ActiveAdmin getDeviceOwnerAdmin() {
		String deviceOwnerPackageName = getDeviceOwner();
		if (deviceOwnerPackageName == null) {
		return null;
		}

		DevicePolicyData policy = getUserData(UserHandle.USER_OWNER);
		final int n = policy.mAdminList.size();
		for (int i = 0; i < n; i++) {
		ActiveAdmin admin = policy.mAdminList.get(i);
		if (deviceOwnerPackageName.equals(admin.info.getPackageName())) {
		return admin;
		}
		}
		return null;
		}

		@Override
		public void clearDeviceOwner(String packageName) {
		if (packageName == null) {