Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename PolicyUpdatesReceiver to PolicyUpdateReceiver"

Browse Source
This commit is contained in:
Kholoud Mohamed
2023-02-15 10:25:00 +00:00
committed by Android (Google) Code Review
parent 223f197eeb cc01d71ed2
commit 72c4a7ab11
13 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/api/current.txt
View File

@@ -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();

6
core/java/android/app/admin/AccountTypePolicyKey.java
View File

@@ -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;

2
core/java/android/app/admin/DeviceAdminService.java
View File

@@ -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;

4
core/java/android/app/admin/DevicePolicyIdentifiers.java
View File

@@ -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 {

6
core/java/android/app/admin/IntentFilterPolicyKey.java
View File

@@ -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;

2
core/java/android/app/admin/NoArgsPolicyKey.java
View File

@@ -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;

8
core/java/android/app/admin/PackagePermissionPolicyKey.java
View File

@@ -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;

6
core/java/android/app/admin/PackagePolicyKey.java
View File

@@ -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;

34
core/java/android/app/admin/PolicyUpdatesReceiver.java → core/java/android/app/admin/PolicyUpdateReceiver.java
View File

@@ -35,15 +35,15 @@ import java.util.Objects;
* <p>The callback methods happen on the main thread of the process. Thus, long-running
* operations must be done on another thread.
*
* <p>When publishing your {@code PolicyUpdatesReceiver} subclass as a receiver, it must
* <p>When publishing your {@code PolicyUpdateReceiver} subclass as a receiver, it must
* require the {@link android.Manifest.permission#BIND_DEVICE_ADMIN} permission.
*
* <p>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.
*
* <p>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.
*
* <p>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.

8
core/java/android/app/admin/PolicyUpdateResult.java
View File

@@ -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.

4
core/java/android/app/admin/TargetUser.java
View File

@@ -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 {
/**

2
core/java/android/app/admin/UserRestrictionPolicyKey.java
View File

@@ -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;

10
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyEngine.java
View File

@@ -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 <V> void sendPolicyResultToAdmin(
EnforcingAdmin admin, PolicyDefinition<V> 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<ResolveInfo> receivers = mContext.getPackageManager().queryBroadcastReceiversAsUser(
@@ -801,7 +801,7 @@ final class DevicePolicyEngine {
private <V> void maybeSendOnPolicyChanged(
EnforcingAdmin admin, PolicyDefinition<V> 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<ResolveInfo> receivers = mContext.getPackageManager().queryBroadcastReceiversAsUser(