Merge "Tweak SystemUpdatePolicy according to API review." into mnc-dev (9fc8bb63) · Commits · e / os / android_frameworks_base

Android.mk

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -483,6 +483,7 @@ aidl_files := \
	frameworks/base/graphics/java/android/graphics/Rect.aidl \		frameworks/base/graphics/java/android/graphics/Rect.aidl \
	frameworks/base/core/java/android/accounts/AuthenticatorDescription.aidl \		frameworks/base/core/java/android/accounts/AuthenticatorDescription.aidl \
	frameworks/base/core/java/android/accounts/Account.aidl \		frameworks/base/core/java/android/accounts/Account.aidl \
			frameworks/base/core/java/android/app/admin/SystemUpdatePolicy.aidl \
	frameworks/base/core/java/android/print/PrintDocumentInfo.aidl \		frameworks/base/core/java/android/print/PrintDocumentInfo.aidl \
	frameworks/base/core/java/android/print/PageRange.aidl \		frameworks/base/core/java/android/print/PageRange.aidl \
	frameworks/base/core/java/android/print/PrintAttributes.aidl \		frameworks/base/core/java/android/print/PrintAttributes.aidl \

api/current.txt

+7 −9

Original line number	Original line	Diff line number	Diff line
	@@ -5865,23 +5865,21 @@ package android.app.admin {
	field public static final int WIPE_RESET_PROTECTION_DATA = 2; // 0x2		field public static final int WIPE_RESET_PROTECTION_DATA = 2; // 0x2
	}		}

	public class SystemUpdatePolicy {		public class SystemUpdatePolicy implements android.os.Parcelable {
	ctor public SystemUpdatePolicy();		method public static android.app.admin.SystemUpdatePolicy createAutomaticInstallPolicy();
			method public static android.app.admin.SystemUpdatePolicy createPostponeInstallPolicy();
			method public static android.app.admin.SystemUpdatePolicy createWindowedInstallPolicy(int, int);
			method public int describeContents();
	method public int getInstallWindowEnd();		method public int getInstallWindowEnd();
	method public int getInstallWindowStart();		method public int getInstallWindowStart();
	method public int getPolicyType();		method public int getPolicyType();
	method public void setAutomaticInstallPolicy();		method public void writeToParcel(android.os.Parcel, int);
	method public void setPostponeInstallPolicy();		field public static final android.os.Parcelable.Creator<android.app.admin.SystemUpdatePolicy> CREATOR;
	method public void setWindowedInstallPolicy(int, int) throws android.app.admin.SystemUpdatePolicy.InvalidWindowException;
	field public static final int TYPE_INSTALL_AUTOMATIC = 1; // 0x1		field public static final int TYPE_INSTALL_AUTOMATIC = 1; // 0x1
	field public static final int TYPE_INSTALL_WINDOWED = 2; // 0x2		field public static final int TYPE_INSTALL_WINDOWED = 2; // 0x2
	field public static final int TYPE_POSTPONE = 3; // 0x3		field public static final int TYPE_POSTPONE = 3; // 0x3
	}		}

	public static class SystemUpdatePolicy.InvalidWindowException extends java.lang.Exception {
	ctor public SystemUpdatePolicy.InvalidWindowException(java.lang.String);
	}

	}		}

	package android.app.backup {		package android.app.backup {

api/system-current.txt

+7 −9

Original line number	Original line	Diff line number	Diff line
	@@ -5976,23 +5976,21 @@ package android.app.admin {
	field public static final int WIPE_RESET_PROTECTION_DATA = 2; // 0x2		field public static final int WIPE_RESET_PROTECTION_DATA = 2; // 0x2
	}		}

	public class SystemUpdatePolicy {		public class SystemUpdatePolicy implements android.os.Parcelable {
	ctor public SystemUpdatePolicy();		method public static android.app.admin.SystemUpdatePolicy createAutomaticInstallPolicy();
			method public static android.app.admin.SystemUpdatePolicy createPostponeInstallPolicy();
			method public static android.app.admin.SystemUpdatePolicy createWindowedInstallPolicy(int, int);
			method public int describeContents();
	method public int getInstallWindowEnd();		method public int getInstallWindowEnd();
	method public int getInstallWindowStart();		method public int getInstallWindowStart();
	method public int getPolicyType();		method public int getPolicyType();
	method public void setAutomaticInstallPolicy();		method public void writeToParcel(android.os.Parcel, int);
	method public void setPostponeInstallPolicy();		field public static final android.os.Parcelable.Creator<android.app.admin.SystemUpdatePolicy> CREATOR;
	method public void setWindowedInstallPolicy(int, int) throws android.app.admin.SystemUpdatePolicy.InvalidWindowException;
	field public static final int TYPE_INSTALL_AUTOMATIC = 1; // 0x1		field public static final int TYPE_INSTALL_AUTOMATIC = 1; // 0x1
	field public static final int TYPE_INSTALL_WINDOWED = 2; // 0x2		field public static final int TYPE_INSTALL_WINDOWED = 2; // 0x2
	field public static final int TYPE_POSTPONE = 3; // 0x3		field public static final int TYPE_POSTPONE = 3; // 0x3
	}		}

	public static class SystemUpdatePolicy.InvalidWindowException extends java.lang.Exception {
	ctor public SystemUpdatePolicy.InvalidWindowException(java.lang.String);
	}

	}		}

	package android.app.backup {		package android.app.backup {

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

+2 −11

Original line number	Original line	Diff line number	Diff line
	@@ -4253,11 +4253,7 @@ public class DevicePolicyManager {
	public void setSystemUpdatePolicy(ComponentName who, SystemUpdatePolicy policy) {		public void setSystemUpdatePolicy(ComponentName who, SystemUpdatePolicy policy) {
	if (mService != null) {		if (mService != null) {
	try {		try {
	if (policy != null) {		mService.setSystemUpdatePolicy(who, policy);
	mService.setSystemUpdatePolicy(who, policy.getPolicyBundle());
	} else {
	mService.setSystemUpdatePolicy(who, null);
	}
	} catch (RemoteException re) {		} catch (RemoteException re) {
	Log.w(TAG, "Error calling setSystemUpdatePolicy", re);		Log.w(TAG, "Error calling setSystemUpdatePolicy", re);
	}		}
	@@ -4272,12 +4268,7 @@ public class DevicePolicyManager {
	public SystemUpdatePolicy getSystemUpdatePolicy() {		public SystemUpdatePolicy getSystemUpdatePolicy() {
	if (mService != null) {		if (mService != null) {
	try {		try {
	PersistableBundle bundle = mService.getSystemUpdatePolicy();		return mService.getSystemUpdatePolicy();
	if (bundle != null) {
	return new SystemUpdatePolicy(bundle);
	} else {
	return null;
	}
	} catch (RemoteException re) {		} catch (RemoteException re) {
	Log.w(TAG, "Error calling getSystemUpdatePolicy", re);		Log.w(TAG, "Error calling getSystemUpdatePolicy", re);
	}		}

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

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@

	package android.app.admin;		package android.app.admin;

			import android.app.admin.SystemUpdatePolicy;
	import android.content.ComponentName;		import android.content.ComponentName;
	import android.content.Intent;		import android.content.Intent;
	import android.content.IntentFilter;		import android.content.IntentFilter;
	@@ -221,8 +222,8 @@ interface IDevicePolicyManager {
	void setUserIcon(in ComponentName admin, in Bitmap icon);		void setUserIcon(in ComponentName admin, in Bitmap icon);

	void sendDeviceInitializerStatus(int statusCode, String description);		void sendDeviceInitializerStatus(int statusCode, String description);
	void setSystemUpdatePolicy(in ComponentName who, in PersistableBundle policy);		void setSystemUpdatePolicy(in ComponentName who, in SystemUpdatePolicy policy);
	PersistableBundle getSystemUpdatePolicy();		SystemUpdatePolicy getSystemUpdatePolicy();

	boolean setKeyguardDisabled(in ComponentName admin, boolean disabled);		boolean setKeyguardDisabled(in ComponentName admin, boolean disabled);
	boolean setStatusBarDisabled(in ComponentName who, boolean disabled);		boolean setStatusBarDisabled(in ComponentName who, boolean disabled);