Merge "Merge "Expose policy key constructors as testAPIs" into udc-dev am:... (807d6142) · Commits · e / os / android_frameworks_base

core/api/test-current.txt

+20 −0

Original line number	Diff line number	Diff line
		@@ -516,6 +516,10 @@ package android.app {

		package android.app.admin {

		public final class AccountTypePolicyKey extends android.app.admin.PolicyKey {
		ctor public AccountTypePolicyKey(@NonNull String, @NonNull String);
		}

		public final class DeviceAdminAuthority extends android.app.admin.Authority {
		field @NonNull public static final android.app.admin.DeviceAdminAuthority DEVICE_ADMIN_AUTHORITY;
		}
		@@ -612,6 +616,10 @@ package android.app.admin {
		field @NonNull public static final android.app.admin.FlagUnion FLAG_UNION;
		}

		public final class IntentFilterPolicyKey extends android.app.admin.PolicyKey {
		ctor public IntentFilterPolicyKey(@NonNull String, @NonNull android.content.IntentFilter);
		}

		public final class MostRecent<V> extends android.app.admin.ResolutionMechanism<V> {
		ctor public MostRecent();
		method public int describeContents();
		@@ -627,6 +635,14 @@ package android.app.admin {
		field @NonNull public static final android.os.Parcelable.Creator<android.app.admin.MostRestrictive<?>> CREATOR;
		}

		public final class PackagePermissionPolicyKey extends android.app.admin.PolicyKey {
		ctor public PackagePermissionPolicyKey(@NonNull String, @NonNull String, @NonNull String);
		}

		public final class PackagePolicyKey extends android.app.admin.PolicyKey {
		ctor public PackagePolicyKey(@NonNull String, @NonNull String);
		}

		public final class PolicyState<V> implements android.os.Parcelable {
		method @NonNull public android.app.admin.ResolutionMechanism<V> getResolutionMechanism();
		}
		@@ -676,6 +692,10 @@ package android.app.admin {
		method public int getOperation();
		}

		public final class UserRestrictionPolicyKey extends android.app.admin.PolicyKey {
		ctor public UserRestrictionPolicyKey(@NonNull String, @NonNull String);
		}

		}

		package android.app.assist {

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import static android.app.admin.PolicyUpdateReceiver.EXTRA_POLICY_KEY;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.os.Bundle;
		import android.os.Parcel;

		@@ -49,6 +50,7 @@ public final class AccountTypePolicyKey extends PolicyKey {
		/**
		* @hide
		*/
		@TestApi
		public AccountTypePolicyKey(@NonNull String key, @NonNull String accountType) {
		super(key);
		mAccountType = Objects.requireNonNull((accountType));

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import static android.app.admin.PolicyUpdateReceiver.EXTRA_POLICY_KEY;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.content.IntentFilter;
		import android.os.Bundle;
		import android.os.Parcel;
		@@ -49,6 +50,7 @@ public final class IntentFilterPolicyKey extends PolicyKey {
		/**
		* @hide
		*/
		@TestApi
		public IntentFilterPolicyKey(@NonNull String identifier, @NonNull IntentFilter filter) {
		super(identifier);
		mFilter = Objects.requireNonNull(filter);

core/java/android/app/admin/PackagePermissionPolicyKey.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import static android.app.admin.PolicyUpdateReceiver.EXTRA_POLICY_KEY;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.os.Bundle;
		import android.os.Parcel;
		import android.os.Parcelable;
		@@ -53,6 +54,7 @@ public final class PackagePermissionPolicyKey extends PolicyKey {
		/**
		* @hide
		*/
		@TestApi
		public PackagePermissionPolicyKey(@NonNull String identifier, @NonNull String packageName,
		@NonNull String permissionName) {
		super(identifier);

core/java/android/app/admin/PackagePolicyKey.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import static android.app.admin.PolicyUpdateReceiver.EXTRA_POLICY_KEY;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.os.Bundle;
		import android.os.Parcel;
		import android.os.Parcelable;
		@@ -50,6 +51,7 @@ public final class PackagePolicyKey extends PolicyKey {
		/**
		* @hide
		*/
		@TestApi
		public PackagePolicyKey(@NonNull String key, @NonNull String packageName) {
		super(key);
		mPackageName = Objects.requireNonNull((packageName));