Merge "Store pending OTA state and make it accessible via polling api." (b271f346) · Commits · e / os / android_frameworks_base

api/current.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -6116,6 +6116,7 @@ package android.app.admin {
		method public int getPasswordMinimumSymbols(android.content.ComponentName);
		method public int getPasswordMinimumUpperCase(android.content.ComponentName);
		method public int getPasswordQuality(android.content.ComponentName);
		method public android.app.admin.SystemUpdateInfo getPendingSystemUpdate(android.content.ComponentName);
		method public int getPermissionGrantState(android.content.ComponentName, java.lang.String, java.lang.String);
		method public int getPermissionPolicy(android.content.ComponentName);
		method public java.util.List<java.lang.String> getPermittedAccessibilityServices(android.content.ComponentName);
		@@ -6337,6 +6338,13 @@ package android.app.admin {
		field public static final android.os.Parcelable.Creator<android.app.admin.SecurityLog.SecurityEvent> CREATOR;
		}

		public final class SystemUpdateInfo implements android.os.Parcelable {
		method public int describeContents();
		method public long getReceivedTime();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.admin.SystemUpdateInfo> CREATOR;
		}

		public class SystemUpdatePolicy implements android.os.Parcelable {
		method public static android.app.admin.SystemUpdatePolicy createAutomaticInstallPolicy();
		method public static android.app.admin.SystemUpdatePolicy createPostponeInstallPolicy();

api/system-current.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -6312,6 +6312,7 @@ package android.app.admin {
		method public int getPasswordMinimumSymbols(android.content.ComponentName);
		method public int getPasswordMinimumUpperCase(android.content.ComponentName);
		method public int getPasswordQuality(android.content.ComponentName);
		method public android.app.admin.SystemUpdateInfo getPendingSystemUpdate(android.content.ComponentName);
		method public int getPermissionGrantState(android.content.ComponentName, java.lang.String, java.lang.String);
		method public int getPermissionPolicy(android.content.ComponentName);
		method public java.util.List<java.lang.String> getPermittedAccessibilityServices(android.content.ComponentName);
		@@ -6557,6 +6558,13 @@ package android.app.admin {
		field public static final android.os.Parcelable.Creator<android.app.admin.SecurityLog.SecurityEvent> CREATOR;
		}

		public final class SystemUpdateInfo implements android.os.Parcelable {
		method public int describeContents();
		method public long getReceivedTime();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.admin.SystemUpdateInfo> CREATOR;
		}

		public class SystemUpdatePolicy implements android.os.Parcelable {
		method public static android.app.admin.SystemUpdatePolicy createAutomaticInstallPolicy();
		method public static android.app.admin.SystemUpdatePolicy createPostponeInstallPolicy();

api/test-current.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -6137,6 +6137,7 @@ package android.app.admin {
		method public int getPasswordMinimumSymbols(android.content.ComponentName);
		method public int getPasswordMinimumUpperCase(android.content.ComponentName);
		method public int getPasswordQuality(android.content.ComponentName);
		method public android.app.admin.SystemUpdateInfo getPendingSystemUpdate(android.content.ComponentName);
		method public int getPermissionGrantState(android.content.ComponentName, java.lang.String, java.lang.String);
		method public int getPermissionPolicy(android.content.ComponentName);
		method public java.util.List<java.lang.String> getPermittedAccessibilityServices(android.content.ComponentName);
		@@ -6359,6 +6360,13 @@ package android.app.admin {
		field public static final android.os.Parcelable.Creator<android.app.admin.SecurityLog.SecurityEvent> CREATOR;
		}

		public final class SystemUpdateInfo implements android.os.Parcelable {
		method public int describeContents();
		method public long getReceivedTime();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.admin.SystemUpdateInfo> CREATOR;
		}

		public class SystemUpdatePolicy implements android.os.Parcelable {
		method public static android.app.admin.SystemUpdatePolicy createAutomaticInstallPolicy();
		method public static android.app.admin.SystemUpdatePolicy createPostponeInstallPolicy();

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

+18 −3

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ import android.annotation.ColorInt;
		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.RequiresPermission;
		import android.annotation.SdkConstant;
		import android.annotation.SdkConstant.SdkConstantType;
		import android.annotation.SystemApi;
		@@ -28,7 +27,6 @@ import android.annotation.TestApi;
		import android.annotation.UserIdInt;
		import android.annotation.WorkerThread;
		import android.app.Activity;
		import android.app.admin.PasswordMetrics;
		import android.app.IServiceConnection;
		import android.app.admin.SecurityLog.SecurityEvent;
		import android.content.ComponentName;
		@@ -5536,7 +5534,7 @@ public class DevicePolicyManager {
		* {@link DevicePolicyManager#setApplicationRestrictions} was called, or an empty
		* {@link Bundle} if no restrictions have been set.
		* @throws SecurityException if {@code admin} is not a device or profile owner.
		* @see {@link #setApplicationRestrictionsManagingPackage}
		* @see #setApplicationRestrictionsManagingPackage
		*/
		@WorkerThread
		public @NonNull Bundle getApplicationRestrictions(
		@@ -6220,6 +6218,23 @@ public class DevicePolicyManager {
		}
		}

		/**
		* Called by device or profile owners to get information about a pending system update.
		*
		* @param admin Which profile or device owner this request is associated with.
		* @return Information about a pending system update or {@code null} if no update pending.
		* @throws SecurityException if {@code admin} is not a device or profile owner.
		* @see DeviceAdminReceiver#onSystemUpdatePending(Context, Intent, long)
		*/
		public @Nullable SystemUpdateInfo getPendingSystemUpdate(@NonNull ComponentName admin) {
		throwIfParentInstance("getPendingSystemUpdate");
		try {
		return mService.getPendingSystemUpdate(admin);
		} catch (RemoteException re) {
		throw re.rethrowFromSystemServer();
		}
		}

		/**
		* Called by profile or device owners to set the default response for future runtime permission
		* requests by applications. The policy can allow for normal operation which prompts the user to

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ package android.app.admin;
		import android.app.admin.NetworkEvent;
		import android.app.IApplicationThread;
		import android.app.IServiceConnection;
		import android.app.admin.SystemUpdateInfo;
		import android.app.admin.SystemUpdatePolicy;
		import android.app.admin.PasswordMetrics;
		import android.content.ComponentName;
		@@ -264,6 +265,7 @@ interface IDevicePolicyManager {
		boolean getDoNotAskCredentialsOnBoot();

		void notifyPendingSystemUpdate(in long updateReceivedTime);
		SystemUpdateInfo getPendingSystemUpdate(in ComponentName admin);

		void setPermissionPolicy(in ComponentName admin, int policy);
		int getPermissionPolicy(in ComponentName admin);