Merge "Rename PolicyUpdatesReceiver to PolicyUpdateReceiver" (72c4a7ab) · Commits · e / os / android_frameworks_base

core/api/current.txt

+13 −13

Original line number	Diff line number	Diff line
		@@ -8274,19 +8274,8 @@ package android.app.admin {
		field public static final int PACKAGE_POLICY_BLOCKLIST = 1; // 0x1
		}

		public final class PolicyUpdateResult {
		ctor public PolicyUpdateResult(int);
		method public int getResultCode();
		field public static final int RESULT_FAILURE_CONFLICTING_ADMIN_POLICY = 1; // 0x1
		field public static final int RESULT_FAILURE_HARDWARE_LIMITATION = 4; // 0x4
		field public static final int RESULT_FAILURE_STORAGE_LIMIT_REACHED = 3; // 0x3
		field public static final int RESULT_FAILURE_UNKNOWN = -1; // 0xffffffff
		field public static final int RESULT_POLICY_CLEARED = 2; // 0x2
		field public static final int RESULT_SUCCESS = 0; // 0x0
		}

		public abstract class PolicyUpdatesReceiver extends android.content.BroadcastReceiver {
		ctor public PolicyUpdatesReceiver();
		public abstract class PolicyUpdateReceiver extends android.content.BroadcastReceiver {
		ctor public PolicyUpdateReceiver();
		method public void onPolicyChanged(@NonNull android.content.Context, @NonNull String, @NonNull android.os.Bundle, @NonNull android.app.admin.TargetUser, @NonNull android.app.admin.PolicyUpdateResult);
		method public void onPolicySetResult(@NonNull android.content.Context, @NonNull String, @NonNull android.os.Bundle, @NonNull android.app.admin.TargetUser, @NonNull android.app.admin.PolicyUpdateResult);
		method public final void onReceive(android.content.Context, android.content.Intent);
		@@ -8298,6 +8287,17 @@ package android.app.admin {
		field public static final String EXTRA_PERMISSION_NAME = "android.app.admin.extra.PERMISSION_NAME";
		}

		public final class PolicyUpdateResult {
		ctor public PolicyUpdateResult(int);
		method public int getResultCode();
		field public static final int RESULT_FAILURE_CONFLICTING_ADMIN_POLICY = 1; // 0x1
		field public static final int RESULT_FAILURE_HARDWARE_LIMITATION = 4; // 0x4
		field public static final int RESULT_FAILURE_STORAGE_LIMIT_REACHED = 3; // 0x3
		field public static final int RESULT_FAILURE_UNKNOWN = -1; // 0xffffffff
		field public static final int RESULT_POLICY_CLEARED = 2; // 0x2
		field public static final int RESULT_SUCCESS = 0; // 0x0
		}

		public final class PreferentialNetworkServiceConfig implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public int[] getExcludedUids();

core/java/android/app/admin/AccountTypePolicyKey.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -16,9 +16,9 @@

		package android.app.admin;

		import static android.app.admin.PolicyUpdatesReceiver.EXTRA_ACCOUNT_TYPE;
		import static android.app.admin.PolicyUpdatesReceiver.EXTRA_POLICY_BUNDLE_KEY;
		import static android.app.admin.PolicyUpdatesReceiver.EXTRA_POLICY_KEY;
		import static android.app.admin.PolicyUpdateReceiver.EXTRA_ACCOUNT_TYPE;
		import static android.app.admin.PolicyUpdateReceiver.EXTRA_POLICY_BUNDLE_KEY;
		import static android.app.admin.PolicyUpdateReceiver.EXTRA_POLICY_KEY;

		import android.annotation.NonNull;
		import android.annotation.Nullable;

core/java/android/app/admin/DeviceAdminService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ import android.os.IBinder;
		* <p>Starting from Android {@link android.os.Build.VERSION_CODES#UPSIDE_DOWN_CAKE},
		* non-DPC admins can also optionally implement this service using the details
		* mentioned above to ensure they receive policy update broadcasts
		* (see {@link PolicyUpdatesReceiver}).
		* (see {@link PolicyUpdateReceiver}).
		*/
		public class DeviceAdminService extends Service {
		private final IDeviceAdminServiceImpl mImpl;

core/java/android/app/admin/DevicePolicyIdentifiers.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -23,8 +23,8 @@ import java.util.Objects;

		/**
		* Class containing identifiers for policy APIs in {@link DevicePolicyManager}, for example they
		* will be passed in {@link PolicyUpdatesReceiver#onPolicySetResult} and
		* {@link PolicyUpdatesReceiver#onPolicyChanged} to communicate updates of a certain policy back
		* will be passed in {@link PolicyUpdateReceiver#onPolicySetResult} and
		* {@link PolicyUpdateReceiver#onPolicyChanged} to communicate updates of a certain policy back
		* to the admin.
		*/
		public final class DevicePolicyIdentifiers {

core/java/android/app/admin/IntentFilterPolicyKey.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -16,9 +16,9 @@

		package android.app.admin;

		import static android.app.admin.PolicyUpdatesReceiver.EXTRA_INTENT_FILTER;
		import static android.app.admin.PolicyUpdatesReceiver.EXTRA_POLICY_BUNDLE_KEY;
		import static android.app.admin.PolicyUpdatesReceiver.EXTRA_POLICY_KEY;
		import static android.app.admin.PolicyUpdateReceiver.EXTRA_INTENT_FILTER;
		import static android.app.admin.PolicyUpdateReceiver.EXTRA_POLICY_BUNDLE_KEY;
		import static android.app.admin.PolicyUpdateReceiver.EXTRA_POLICY_KEY;

		import android.annotation.NonNull;
		import android.annotation.Nullable;