Merge "Remove initiator name param." into mnc-dev (396d9440) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -5749,7 +5749,7 @@ package android.app.admin {
		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);
		method public boolean setDeviceInitializer(android.content.ComponentName, android.content.ComponentName, java.lang.String) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;
		method public boolean setDeviceInitializer(android.content.ComponentName, android.content.ComponentName) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;
		method public void setGlobalSetting(android.content.ComponentName, java.lang.String, java.lang.String);
		method public boolean setKeyguardDisabled(android.content.ComponentName, boolean);
		method public void setKeyguardDisabledFeatures(android.content.ComponentName, int);

api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -5855,7 +5855,7 @@ package android.app.admin {
		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);
		method public boolean setDeviceInitializer(android.content.ComponentName, android.content.ComponentName, java.lang.String) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;
		method public boolean setDeviceInitializer(android.content.ComponentName, android.content.ComponentName) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;
		method public void setGlobalSetting(android.content.ComponentName, java.lang.String, java.lang.String);
		method public boolean setKeyguardDisabled(android.content.ComponentName, boolean);
		method public void setKeyguardDisabledFeatures(android.content.ComponentName, int);

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

+3 −4

Original line number	Diff line number	Diff line
		@@ -2793,17 +2793,16 @@ public class DevicePolicyManager {
		* @param who Which {@link DeviceAdminReceiver} this request is associated with, or null if not
		* called by the device owner.
		* @param initializer Which {@link DeviceAdminReceiver} to make device initializer.
		* @param initializerName The user-visible name of the device initializer.
		* @return whether the component was successfully registered as the device initializer.
		* @throws IllegalArgumentException if the componentname is null or invalid
		* @throws IllegalStateException if the caller is not device owner or the device has
		* already been provisioned or a device initializer already exists.
		*/
		public boolean setDeviceInitializer(ComponentName who, ComponentName initializer,
		String initializerName) throws IllegalArgumentException, IllegalStateException {
		public boolean setDeviceInitializer(ComponentName who, ComponentName initializer)
		throws IllegalArgumentException, IllegalStateException {
		if (mService != null) {
		try {
		return mService.setDeviceInitializer(who, initializer, initializerName);
		return mService.setDeviceInitializer(who, initializer);
		} catch (RemoteException re) {
		Log.w(TAG, "Failed to set device initializer");
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -213,7 +213,7 @@ interface IDevicePolicyManager {
		boolean setUserEnabled(in ComponentName who);
		boolean isDeviceInitializer(String packageName);
		void clearDeviceInitializer(in ComponentName who);
		boolean setDeviceInitializer(in ComponentName who, in ComponentName initializer, String initializerName);
		boolean setDeviceInitializer(in ComponentName who, in ComponentName initializer);
		String getDeviceInitializer();
		ComponentName getDeviceInitializerComponent();

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

+6 −14

Original line number	Diff line number	Diff line
		@@ -116,9 +116,9 @@ class DeviceOwner {
		/**
		* Creates an instance of the device owner object with the device initializer set.
		*/
		static DeviceOwner createWithDeviceInitializer(ComponentName admin, String ownerName) {
		static DeviceOwner createWithDeviceInitializer(ComponentName admin) {
		DeviceOwner owner = new DeviceOwner();
		owner.mDeviceInitializer = new OwnerInfo(ownerName, admin);
		owner.mDeviceInitializer = new OwnerInfo(null, admin);
		return owner;
		}

		@@ -155,12 +155,8 @@ class DeviceOwner {
		return mDeviceInitializer != null ? mDeviceInitializer.packageName : null;
		}

		String getDeviceInitializerName() {
		return mDeviceInitializer != null ? mDeviceInitializer.name : null;
		}

		void setDeviceInitializer(ComponentName admin, String ownerName) {
		mDeviceInitializer = new OwnerInfo(ownerName, admin);
		void setDeviceInitializer(ComponentName admin) {
		mDeviceInitializer = new OwnerInfo(null, admin);
		}

		void clearDeviceInitializer() {
		@@ -255,16 +251,15 @@ class DeviceOwner {
		String packageName = parser.getAttributeValue(null, ATTR_PACKAGE);
		mDeviceOwner = new OwnerInfo(name, packageName);
		} else if (tag.equals(TAG_DEVICE_INITIALIZER)) {
		String name = parser.getAttributeValue(null, ATTR_NAME);
		String packageName = parser.getAttributeValue(null, ATTR_PACKAGE);
		String initializerComponentStr =
		parser.getAttributeValue(null, ATTR_COMPONENT_NAME);
		ComponentName admin =
		ComponentName.unflattenFromString(initializerComponentStr);
		if (admin != null) {
		mDeviceInitializer = new OwnerInfo(name, admin);
		mDeviceInitializer = new OwnerInfo(null, admin);
		} else {
		mDeviceInitializer = new OwnerInfo(name, packageName);
		mDeviceInitializer = new OwnerInfo(null, packageName);
		Slog.e(TAG, "Error parsing device-owner file. Bad component name " +
		initializerComponentStr);
		}
		@@ -334,9 +329,6 @@ class DeviceOwner {
		if (mDeviceInitializer != null) {
		out.startTag(null, TAG_DEVICE_INITIALIZER);
		out.attribute(null, ATTR_PACKAGE, mDeviceInitializer.packageName);
		if (mDeviceInitializer.name != null) {
		out.attribute(null, ATTR_NAME, mDeviceInitializer.name);
		}
		if (mDeviceInitializer.admin != null) {
		out.attribute(
		null, ATTR_COMPONENT_NAME, mDeviceInitializer.admin.flattenToString());