Merge "Add setTime and setTimeZone API." (302318bc) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -6451,6 +6451,8 @@ package android.app.admin {
		method public boolean setStatusBarDisabled(android.content.ComponentName, boolean);
		method public int setStorageEncryption(android.content.ComponentName, boolean);
		method public void setSystemUpdatePolicy(android.content.ComponentName, android.app.admin.SystemUpdatePolicy);
		method public boolean setTime(android.content.ComponentName, long);
		method public boolean setTimeZone(android.content.ComponentName, java.lang.String);
		method public void setTrustAgentConfiguration(android.content.ComponentName, android.content.ComponentName, android.os.PersistableBundle);
		method public void setUninstallBlocked(android.content.ComponentName, java.lang.String, boolean);
		method public void setUserIcon(android.content.ComponentName, android.graphics.Bitmap);

api/system-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -6686,6 +6686,8 @@ package android.app.admin {
		method public boolean setStatusBarDisabled(android.content.ComponentName, boolean);
		method public int setStorageEncryption(android.content.ComponentName, boolean);
		method public void setSystemUpdatePolicy(android.content.ComponentName, android.app.admin.SystemUpdatePolicy);
		method public boolean setTime(android.content.ComponentName, long);
		method public boolean setTimeZone(android.content.ComponentName, java.lang.String);
		method public void setTrustAgentConfiguration(android.content.ComponentName, android.content.ComponentName, android.os.PersistableBundle);
		method public void setUninstallBlocked(android.content.ComponentName, java.lang.String, boolean);
		method public void setUserIcon(android.content.ComponentName, android.graphics.Bitmap);

api/test-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -6519,6 +6519,8 @@ package android.app.admin {
		method public boolean setStatusBarDisabled(android.content.ComponentName, boolean);
		method public int setStorageEncryption(android.content.ComponentName, boolean);
		method public void setSystemUpdatePolicy(android.content.ComponentName, android.app.admin.SystemUpdatePolicy);
		method public boolean setTime(android.content.ComponentName, long);
		method public boolean setTimeZone(android.content.ComponentName, java.lang.String);
		method public void setTrustAgentConfiguration(android.content.ComponentName, android.content.ComponentName, android.os.PersistableBundle);
		method public void setUninstallBlocked(android.content.ComponentName, java.lang.String, boolean);
		method public void setUserIcon(android.content.ComponentName, android.graphics.Bitmap);

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

+46 −0

Original line number	Diff line number	Diff line
		@@ -6532,6 +6532,52 @@ public class DevicePolicyManager {
		}
		}

		/**
		* Called by device owner to set the system wall clock time. This only takes effect if called
		* when {@link android.provider.Settings.Global#AUTO_TIME} is 0, otherwise {@code false} will be
		* returned.
		*
		* @param admin Which {@link DeviceAdminReceiver} this request is associated with
		* @param millis time in milliseconds since the Epoch
		* @return {@code true} if set time succeeded, {@code false} otherwise.
		* @throws SecurityException if {@code admin} is not a device owner.
		*/
		public boolean setTime(@NonNull ComponentName admin, long millis) {
		throwIfParentInstance("setTime");
		if (mService != null) {
		try {
		return mService.setTime(admin, millis);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}
		return false;
		}

		/**
		* Called by device owner to set the system's persistent default time zone. This only takes
		* effect if called when {@link android.provider.Settings.Global#AUTO_TIME_ZONE} is 0, otherwise
		* {@code false} will be returned.
		*
		* @see android.app.AlarmManager#setTimeZone(String)
		* @param admin Which {@link DeviceAdminReceiver} this request is associated with
		* @param timeZone one of the Olson ids from the list returned by
		* {@link java.util.TimeZone#getAvailableIDs}
		* @return {@code true} if set timezone succeeded, {@code false} otherwise.
		* @throws SecurityException if {@code admin} is not a device owner.
		*/
		public boolean setTimeZone(@NonNull ComponentName admin, String timeZone) {
		throwIfParentInstance("setTimeZone");
		if (mService != null) {
		try {
		return mService.setTimeZone(admin, timeZone);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}
		return false;
		}

		/**
		* Called by profile or device owners to update {@link android.provider.Settings.Secure}
		* settings. Validation that the value of the setting is in the correct form for the setting

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -229,6 +229,9 @@ interface IDevicePolicyManager {
		void setGlobalSetting(in ComponentName who, in String setting, in String value);
		void setSecureSetting(in ComponentName who, in String setting, in String value);

		boolean setTime(in ComponentName who, long millis);
		boolean setTimeZone(in ComponentName who, String timeZone);

		void setMasterVolumeMuted(in ComponentName admin, boolean on);
		boolean isMasterVolumeMuted(in ComponentName admin);