diff --git a/core/api/current.txt b/core/api/current.txt index fb79e08ce13f7..17e52d507247d 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -8327,19 +8327,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); @@ -8351,6 +8340,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(); diff --git a/core/java/android/app/admin/AccountTypePolicyKey.java b/core/java/android/app/admin/AccountTypePolicyKey.java index 14494d7a9a37d..6417cd47b504e 100644 --- a/core/java/android/app/admin/AccountTypePolicyKey.java +++ b/core/java/android/app/admin/AccountTypePolicyKey.java @@ -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; diff --git a/core/java/android/app/admin/DeviceAdminService.java b/core/java/android/app/admin/DeviceAdminService.java index e6f04c64eb3a0..510fe55ce4cbb 100644 --- a/core/java/android/app/admin/DeviceAdminService.java +++ b/core/java/android/app/admin/DeviceAdminService.java @@ -50,7 +50,7 @@ import android.os.IBinder; *

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; diff --git a/core/java/android/app/admin/DevicePolicyIdentifiers.java b/core/java/android/app/admin/DevicePolicyIdentifiers.java index f6b070a4aaa27..9b0a70d65d6fe 100644 --- a/core/java/android/app/admin/DevicePolicyIdentifiers.java +++ b/core/java/android/app/admin/DevicePolicyIdentifiers.java @@ -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 { diff --git a/core/java/android/app/admin/IntentFilterPolicyKey.java b/core/java/android/app/admin/IntentFilterPolicyKey.java index a49152d46b63d..b0af4cd77749a 100644 --- a/core/java/android/app/admin/IntentFilterPolicyKey.java +++ b/core/java/android/app/admin/IntentFilterPolicyKey.java @@ -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; diff --git a/core/java/android/app/admin/NoArgsPolicyKey.java b/core/java/android/app/admin/NoArgsPolicyKey.java index 2c9d2bede586e..204d2d362cf7b 100644 --- a/core/java/android/app/admin/NoArgsPolicyKey.java +++ b/core/java/android/app/admin/NoArgsPolicyKey.java @@ -16,7 +16,7 @@ package android.app.admin; -import static android.app.admin.PolicyUpdatesReceiver.EXTRA_POLICY_KEY; +import static android.app.admin.PolicyUpdateReceiver.EXTRA_POLICY_KEY; import android.annotation.NonNull; import android.annotation.SystemApi; diff --git a/core/java/android/app/admin/PackagePermissionPolicyKey.java b/core/java/android/app/admin/PackagePermissionPolicyKey.java index 90ca0528ceba4..08c4224021f17 100644 --- a/core/java/android/app/admin/PackagePermissionPolicyKey.java +++ b/core/java/android/app/admin/PackagePermissionPolicyKey.java @@ -16,10 +16,10 @@ package android.app.admin; -import static android.app.admin.PolicyUpdatesReceiver.EXTRA_PACKAGE_NAME; -import static android.app.admin.PolicyUpdatesReceiver.EXTRA_PERMISSION_NAME; -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_PACKAGE_NAME; +import static android.app.admin.PolicyUpdateReceiver.EXTRA_PERMISSION_NAME; +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; diff --git a/core/java/android/app/admin/PackagePolicyKey.java b/core/java/android/app/admin/PackagePolicyKey.java index 08b6110fa821e..b2a8d5d24b841 100644 --- a/core/java/android/app/admin/PackagePolicyKey.java +++ b/core/java/android/app/admin/PackagePolicyKey.java @@ -16,9 +16,9 @@ package android.app.admin; -import static android.app.admin.PolicyUpdatesReceiver.EXTRA_PACKAGE_NAME; -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_PACKAGE_NAME; +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; diff --git a/core/java/android/app/admin/PolicyUpdatesReceiver.java b/core/java/android/app/admin/PolicyUpdateReceiver.java similarity index 89% rename from core/java/android/app/admin/PolicyUpdatesReceiver.java rename to core/java/android/app/admin/PolicyUpdateReceiver.java index be32d83e6f371..58f4f1be086c4 100644 --- a/core/java/android/app/admin/PolicyUpdatesReceiver.java +++ b/core/java/android/app/admin/PolicyUpdateReceiver.java @@ -35,15 +35,15 @@ import java.util.Objects; *

The callback methods happen on the main thread of the process. Thus, long-running * operations must be done on another thread. * - *

When publishing your {@code PolicyUpdatesReceiver} subclass as a receiver, it must + *

When publishing your {@code PolicyUpdateReceiver} subclass as a receiver, it must * require the {@link android.Manifest.permission#BIND_DEVICE_ADMIN} permission. * *

Admins can implement {@link DeviceAdminService} to ensure they receive all policy updates * (for policies they have set) via {@link #onPolicyChanged} by constantly being bound to by the * system. For more information see {@link DeviceAdminService}. */ -public abstract class PolicyUpdatesReceiver extends BroadcastReceiver { - private static String TAG = "PolicyUpdatesReceiver"; +public abstract class PolicyUpdateReceiver extends BroadcastReceiver { + private static String TAG = "PolicyUpdateReceiver"; /** * Action for a broadcast sent to admins to communicate back the result of setting a policy in @@ -81,32 +81,32 @@ public abstract class PolicyUpdatesReceiver extends BroadcastReceiver { /** * A string extra holding the package name the policy applies to, (see - * {@link PolicyUpdatesReceiver#onPolicyChanged} and - * {@link PolicyUpdatesReceiver#onPolicySetResult}) + * {@link PolicyUpdateReceiver#onPolicyChanged} and + * {@link PolicyUpdateReceiver#onPolicySetResult}) */ public static final String EXTRA_PACKAGE_NAME = "android.app.admin.extra.PACKAGE_NAME"; /** * A string extra holding the permission name the policy applies to, (see - * {@link PolicyUpdatesReceiver#onPolicyChanged} and - * {@link PolicyUpdatesReceiver#onPolicySetResult}) + * {@link PolicyUpdateReceiver#onPolicyChanged} and + * {@link PolicyUpdateReceiver#onPolicySetResult}) */ public static final String EXTRA_PERMISSION_NAME = "android.app.admin.extra.PERMISSION_NAME"; /** * An {@link android.content.IntentFilter} extra holding the intent filter the policy relates - * to, (see {@link PolicyUpdatesReceiver#onPolicyChanged} and - * {@link PolicyUpdatesReceiver#onPolicySetResult}) + * to, (see {@link PolicyUpdateReceiver#onPolicyChanged} and + * {@link PolicyUpdateReceiver#onPolicySetResult}) */ public static final String EXTRA_INTENT_FILTER = "android.app.admin.extra.INTENT_FILTER"; /** * A string extra holding the account type this policy applies to, (see - * {@link PolicyUpdatesReceiver#onPolicyChanged} and - * {@link PolicyUpdatesReceiver#onPolicySetResult}) + * {@link PolicyUpdateReceiver#onPolicyChanged} and + * {@link PolicyUpdateReceiver#onPolicySetResult}) */ public static final String EXTRA_ACCOUNT_TYPE = "android.app.admin.extra.ACCOUNT_TYPE"; @@ -216,7 +216,7 @@ public abstract class PolicyUpdatesReceiver extends BroadcastReceiver { * {@link DevicePolicyManager} to notify the admin whether it has been successful or not. * *

Admins wishing to receive this callback should include - * {@link PolicyUpdatesReceiver#ACTION_DEVICE_POLICY_SET_RESULT} in the intent filter for their + * {@link PolicyUpdateReceiver#ACTION_DEVICE_POLICY_SET_RESULT} in the intent filter for their * receiver in the manifest, the receiver must be protected by * {@link android.Manifest.permission#BIND_DEVICE_ADMIN} to ensure that only the system can * send updates. @@ -225,8 +225,8 @@ public abstract class PolicyUpdatesReceiver extends BroadcastReceiver { * @param policyIdentifier Key to identify which policy this callback relates to. * @param additionalPolicyParams Bundle containing additional params that may be required to * identify some of the policy - * (e.g. {@link PolicyUpdatesReceiver#EXTRA_PACKAGE_NAME} - * and {@link PolicyUpdatesReceiver#EXTRA_PERMISSION_NAME}). + * (e.g. {@link PolicyUpdateReceiver#EXTRA_PACKAGE_NAME} + * and {@link PolicyUpdateReceiver#EXTRA_PERMISSION_NAME}). * Each policy will document the required additional params if * needed. * @param targetUser The {@link TargetUser} which this policy relates to. @@ -249,7 +249,7 @@ public abstract class PolicyUpdatesReceiver extends BroadcastReceiver { * Callback triggered when a policy previously set by the admin has changed. * *

Admins wishing to receive this callback should include - * {@link PolicyUpdatesReceiver#ACTION_DEVICE_POLICY_CHANGED} in the intent filter for their + * {@link PolicyUpdateReceiver#ACTION_DEVICE_POLICY_CHANGED} in the intent filter for their * receiver in the manifest, the receiver must be protected by * {@link android.Manifest.permission#BIND_DEVICE_ADMIN} to ensure that only the system can * send updates. @@ -258,8 +258,8 @@ public abstract class PolicyUpdatesReceiver extends BroadcastReceiver { * @param policyIdentifier Key to identify which policy this callback relates to. * @param additionalPolicyParams Bundle containing additional params that may be required to * identify some of the policy - * (e.g. {@link PolicyUpdatesReceiver#EXTRA_PACKAGE_NAME} - * and {@link PolicyUpdatesReceiver#EXTRA_PERMISSION_NAME}). + * (e.g. {@link PolicyUpdateReceiver#EXTRA_PACKAGE_NAME} + * and {@link PolicyUpdateReceiver#EXTRA_PERMISSION_NAME}). * Each policy will document the required additional params if * needed. * @param targetUser The {@link TargetUser} which this policy relates to. diff --git a/core/java/android/app/admin/PolicyUpdateResult.java b/core/java/android/app/admin/PolicyUpdateResult.java index 79a76f222dc98..7d7d91ae442c5 100644 --- a/core/java/android/app/admin/PolicyUpdateResult.java +++ b/core/java/android/app/admin/PolicyUpdateResult.java @@ -24,8 +24,8 @@ import java.lang.annotation.RetentionPolicy; /** * Class containing the reason for the policy (set from {@link DevicePolicyManager}) update (e.g. * success, failure reasons, etc.). This is passed in to - * {@link PolicyUpdatesReceiver#onPolicySetResult}) and - * {@link PolicyUpdatesReceiver#onPolicyChanged}). + * {@link PolicyUpdateReceiver#onPolicySetResult}) and + * {@link PolicyUpdateReceiver#onPolicyChanged}). */ public final class PolicyUpdateResult { @@ -80,7 +80,7 @@ public final class PolicyUpdateResult { * @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag = true, prefix = { "RESULT_" }, value = { + @IntDef(prefix = { "RESULT_" }, value = { RESULT_FAILURE_UNKNOWN, RESULT_SUCCESS, RESULT_FAILURE_CONFLICTING_ADMIN_POLICY, @@ -93,7 +93,7 @@ public final class PolicyUpdateResult { private final int mResultCode; /** - * Constructor for {@code PolicyUpdateReason} that takes in a result code describing why the + * Constructor for {@code PolicyUpdateResult} that takes in a result code describing why the * policy has changed. * * @param resultCode Describes why the policy has changed. diff --git a/core/java/android/app/admin/TargetUser.java b/core/java/android/app/admin/TargetUser.java index 1ec2d5225f4a3..ed4fae0d9848d 100644 --- a/core/java/android/app/admin/TargetUser.java +++ b/core/java/android/app/admin/TargetUser.java @@ -24,8 +24,8 @@ import java.util.Objects; /** * Class representing the target user of a policy set by an admin * (set from {@link DevicePolicyManager}), this is passed in to - * {@link PolicyUpdatesReceiver#onPolicySetResult} and - * {@link PolicyUpdatesReceiver#onPolicyChanged}. + * {@link PolicyUpdateReceiver#onPolicySetResult} and + * {@link PolicyUpdateReceiver#onPolicyChanged}. */ public final class TargetUser { /** diff --git a/core/java/android/app/admin/UserRestrictionPolicyKey.java b/core/java/android/app/admin/UserRestrictionPolicyKey.java index 920147634d680..880b58b8c321b 100644 --- a/core/java/android/app/admin/UserRestrictionPolicyKey.java +++ b/core/java/android/app/admin/UserRestrictionPolicyKey.java @@ -16,7 +16,7 @@ package android.app.admin; -import static android.app.admin.PolicyUpdatesReceiver.EXTRA_POLICY_KEY; +import static android.app.admin.PolicyUpdateReceiver.EXTRA_POLICY_KEY; import android.annotation.NonNull; import android.annotation.SystemApi; diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyEngine.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyEngine.java index 5013fb063406c..c7f99521f6694 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyEngine.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyEngine.java @@ -19,8 +19,8 @@ package com.android.server.devicepolicy; import static android.app.admin.PolicyUpdateResult.RESULT_FAILURE_CONFLICTING_ADMIN_POLICY; import static android.app.admin.PolicyUpdateResult.RESULT_POLICY_CLEARED; import static android.app.admin.PolicyUpdateResult.RESULT_SUCCESS; -import static android.app.admin.PolicyUpdatesReceiver.EXTRA_POLICY_TARGET_USER_ID; -import static android.app.admin.PolicyUpdatesReceiver.EXTRA_POLICY_UPDATE_RESULT_KEY; +import static android.app.admin.PolicyUpdateReceiver.EXTRA_POLICY_TARGET_USER_ID; +import static android.app.admin.PolicyUpdateReceiver.EXTRA_POLICY_UPDATE_RESULT_KEY; import static android.content.pm.UserProperties.INHERIT_DEVICE_POLICY_FROM_PARENT; import static android.provider.DeviceConfig.NAMESPACE_DEVICE_POLICY_MANAGER; @@ -30,7 +30,7 @@ import android.annotation.Nullable; import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyState; import android.app.admin.PolicyKey; -import android.app.admin.PolicyUpdatesReceiver; +import android.app.admin.PolicyUpdateReceiver; import android.app.admin.PolicyValue; import android.app.admin.TargetUser; import android.app.admin.UserRestrictionPolicyKey; @@ -751,7 +751,7 @@ final class DevicePolicyEngine { private void sendPolicyResultToAdmin( EnforcingAdmin admin, PolicyDefinition policyDefinition, int result, int userId) { - Intent intent = new Intent(PolicyUpdatesReceiver.ACTION_DEVICE_POLICY_SET_RESULT); + Intent intent = new Intent(PolicyUpdateReceiver.ACTION_DEVICE_POLICY_SET_RESULT); intent.setPackage(admin.getPackageName()); List receivers = mContext.getPackageManager().queryBroadcastReceiversAsUser( @@ -801,7 +801,7 @@ final class DevicePolicyEngine { private void maybeSendOnPolicyChanged( EnforcingAdmin admin, PolicyDefinition policyDefinition, int reason, int userId) { - Intent intent = new Intent(PolicyUpdatesReceiver.ACTION_DEVICE_POLICY_CHANGED); + Intent intent = new Intent(PolicyUpdateReceiver.ACTION_DEVICE_POLICY_CHANGED); intent.setPackage(admin.getPackageName()); List receivers = mContext.getPackageManager().queryBroadcastReceiversAsUser(