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

Merge "Expose some constants as testAPIs"

Browse Source
This commit is contained in:
Kholoud Mohamed
2023-02-15 15:42:22 +00:00
committed by Android (Google) Code Review
parent 6057a609da b2e810c782
commit 0562cb99a6
3 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/api/test-current.txt
View File

@@ -627,6 +627,13 @@ package android.app.admin {
method @NonNull public android.app.admin.ResolutionMechanism<V> getResolutionMechanism();
}
public abstract class PolicyUpdateReceiver extends android.content.BroadcastReceiver {
field public static final String EXTRA_POLICY_BUNDLE_KEY = "android.app.admin.extra.POLICY_BUNDLE_KEY";
field public static final String EXTRA_POLICY_KEY = "android.app.admin.extra.POLICY_KEY";
field public static final String EXTRA_POLICY_TARGET_USER_ID = "android.app.admin.extra.POLICY_TARGET_USER_ID";
field public static final String EXTRA_POLICY_UPDATE_RESULT_KEY = "android.app.admin.extra.POLICY_UPDATE_RESULT_KEY";
}
public abstract class ResolutionMechanism<V> implements android.os.Parcelable {
}
@@ -642,6 +649,13 @@ package android.app.admin {
field @NonNull public static final android.app.admin.StringSetUnion STRING_SET_UNION;
}
public final class TargetUser {
field public static final int GLOBAL_USER_ID = -3; // 0xfffffffd
field public static final int LOCAL_USER_ID = -1; // 0xffffffff
field public static final int PARENT_USER_ID = -2; // 0xfffffffe
field public static final int UNKNOWN_USER_ID = -3; // 0xfffffffd
}
public final class TopPriority<V> extends android.app.admin.ResolutionMechanism<V> {
method public int describeContents();
method @NonNull public java.util.List<android.app.admin.Authority> getHighestToLowestPriorityAuthorities();

19
core/java/android/app/admin/PolicyUpdateReceiver.java
View File

@@ -19,6 +19,7 @@ package android.app.admin;
import android.annotation.BroadcastBehavior;
import android.annotation.NonNull;
import android.annotation.SdkConstant;
import android.annotation.TestApi;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -112,31 +113,37 @@ public abstract class PolicyUpdateReceiver extends BroadcastReceiver {
"android.app.admin.extra.ACCOUNT_TYPE";
/**
* String extra containing the policy identifier.
*
* @hide
*/
public static final String EXTRA_POLICY_CHANGED_KEY =
"android.app.admin.extra.POLICY_CHANGED_KEY";
/**
* @hide
*/
@TestApi
public static final String EXTRA_POLICY_KEY = "android.app.admin.extra.POLICY_KEY";
/**
* Bundle extra containing additional information related to a policy.
*
* @hide
*/
@TestApi
public static final String EXTRA_POLICY_BUNDLE_KEY =
"android.app.admin.extra.POLICY_BUNDLE_KEY";
/**
* Int extra containing the {@link PolicyUpdateResult} code.
*
* @hide
*/
@TestApi
public static final String EXTRA_POLICY_UPDATE_RESULT_KEY =
"android.app.admin.extra.POLICY_UPDATE_RESULT_KEY";
/**
* Int extra containing the target user this policy update applies to.
*
* @hide
*/
@TestApi
public static final String EXTRA_POLICY_TARGET_USER_ID =
"android.app.admin.extra.POLICY_TARGET_USER_ID";

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

@@ -18,6 +18,7 @@ package android.app.admin;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.TestApi;
import java.util.Objects;
@@ -29,23 +30,35 @@ import java.util.Objects;
*/
public final class TargetUser {
/**
* Indicates that the policy relates to the user the admin is installed on.
*
* @hide
*/
@TestApi
public static final int LOCAL_USER_ID = -1;
/**
* For admins of profiles, this indicates that the policy relates to the parent profile.
*
* @hide
*/
@TestApi
public static final int PARENT_USER_ID = -2;
/**
* This indicates the policy is a global policy.
*
* @hide
*/
@TestApi
public static final int GLOBAL_USER_ID = -3;
/**
* Indicates that the policy relates to some unknown user on the device.
*
* @hide
*/
@TestApi
public static final int UNKNOWN_USER_ID = -3;
/**