Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83502b27 authored by Shawn Willden's avatar Shawn Willden Committed by Android (Google) Code Review
Browse files

Merge "Remove frp_enforcement flag." into main

parents 24793c59 165cc54f

core/api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -11357,7 +11357,7 @@ package android.content { 
    field public static final String OVERLAY_SERVICE = "overlay";

    field public static final String PEOPLE_SERVICE = "people";

    field public static final String PERFORMANCE_HINT_SERVICE = "performance_hint";

    field @FlaggedApi("android.security.frp_enforcement") public static final String PERSISTENT_DATA_BLOCK_SERVICE = "persistent_data_block";

    field public static final String PERSISTENT_DATA_BLOCK_SERVICE = "persistent_data_block";

    field public static final String POWER_SERVICE = "power";

    field public static final String PRINT_SERVICE = "print";

    field @FlaggedApi("android.os.telemetry_apis_framework_initialization") public static final String PROFILING_SERVICE = "profiling";
@@ -42868,8 +42868,8 @@ package android.service.notification { 














package android.service.persistentdata {



























  @FlaggedApi("android.security.frp_enforcement") public class PersistentDataBlockManager {













    method @FlaggedApi("android.security.frp_enforcement") public boolean isFactoryResetProtectionActive();













  public class PersistentDataBlockManager {













    method public boolean isFactoryResetProtectionActive();















  }





























}

























core/api/system-current.txt



+4
−4




























Original line number
Diff line number
Diff line








@@ -4033,7 +4033,7 @@ package android.content {













    field public static final String ACTION_INSTANT_APP_RESOLVER_SETTINGS = "android.intent.action.INSTANT_APP_RESOLVER_SETTINGS";















    field @Deprecated public static final String ACTION_INTENT_FILTER_NEEDS_VERIFICATION = "android.intent.action.INTENT_FILTER_NEEDS_VERIFICATION";















    field public static final String ACTION_LOAD_DATA = "android.intent.action.LOAD_DATA";













    field @FlaggedApi("android.security.frp_enforcement") public static final String ACTION_MAIN_USER_LOCKSCREEN_KNOWLEDGE_FACTOR_CHANGED = "android.intent.action.MAIN_USER_LOCKSCREEN_KNOWLEDGE_FACTOR_CHANGED";













    field public static final String ACTION_MAIN_USER_LOCKSCREEN_KNOWLEDGE_FACTOR_CHANGED = "android.intent.action.MAIN_USER_LOCKSCREEN_KNOWLEDGE_FACTOR_CHANGED";















    field @RequiresPermission(android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS) public static final String ACTION_MANAGE_APP_PERMISSION = "android.intent.action.MANAGE_APP_PERMISSION";















    field @Deprecated public static final String ACTION_MANAGE_APP_PERMISSIONS = "android.intent.action.MANAGE_APP_PERMISSIONS";















    field @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) public static final String ACTION_MANAGE_DEFAULT_APP = "android.intent.action.MANAGE_DEFAULT_APP";










@@ -13894,15 +13894,15 @@ package android.service.oemlock {



























package android.service.persistentdata {



























  @FlaggedApi("android.security.frp_enforcement") public class PersistentDataBlockManager {













    method @FlaggedApi("android.security.frp_enforcement") @RequiresPermission(android.Manifest.permission.CONFIGURE_FACTORY_RESET_PROTECTION) public boolean deactivateFactoryResetProtection(@NonNull byte[]);













  public class PersistentDataBlockManager {













    method @RequiresPermission(android.Manifest.permission.CONFIGURE_FACTORY_RESET_PROTECTION) public boolean deactivateFactoryResetProtection(@NonNull byte[]);















    method @RequiresPermission(android.Manifest.permission.ACCESS_PDB_STATE) public int getDataBlockSize();















    method @RequiresPermission(anyOf={android.Manifest.permission.READ_OEM_UNLOCK_STATE, "android.permission.OEM_UNLOCK_STATE"}) public int getFlashLockState();















    method public long getMaximumDataBlockSize();















    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_OEM_UNLOCK_STATE, "android.permission.OEM_UNLOCK_STATE"}) public boolean getOemUnlockEnabled();















    method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_PDB_STATE) public String getPersistentDataPackageName();















    method @Nullable public byte[] read();













    method @FlaggedApi("android.security.frp_enforcement") public boolean setFactoryResetProtectionSecret(@NonNull byte[]);













    method public boolean setFactoryResetProtectionSecret(@NonNull byte[]);















    method @Deprecated @RequiresPermission("android.permission.OEM_UNLOCK_STATE") public void setOemUnlockEnabled(boolean);















    method @RequiresPermission("android.permission.OEM_UNLOCK_STATE") public void wipe();















    method public int write(@Nullable byte[]);

























core/java/android/content/Context.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -6234,7 +6234,6 @@ public abstract class Context {













     * @see #getSystemService(String)















     * @see android.service.persistentdata.PersistentDataBlockManager















     */













    @FlaggedApi(android.security.Flags.FLAG_FRP_ENFORCEMENT)















    public static final String PERSISTENT_DATA_BLOCK_SERVICE = "persistent_data_block";































    /**

































core/java/android/content/Intent.java



+0
−2




























Original line number
Diff line number
Diff line








@@ -19,7 +19,6 @@ package android.content;













import static android.content.ContentProvider.maybeAddUserId;















import static android.content.flags.Flags.FLAG_STOP_VOICE_COMMAND;















import static android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE;













import static android.security.Flags.FLAG_FRP_ENFORCEMENT;















import static android.security.Flags.FLAG_PREVENT_INTENT_REDIRECT;















import static android.security.Flags.preventIntentRedirect;
























@@ -4058,7 +4057,6 @@ public class Intent implements Parcelable, Cloneable {













     *















     * @hide















     */













    @FlaggedApi(FLAG_FRP_ENFORCEMENT)















    @SystemApi















    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)















    @BroadcastBehavior(protectedBroadcast = true)

































core/java/android/service/persistentdata/PersistentDataBlockManager.java



+0
−6




























Original line number
Diff line number
Diff line








@@ -16,7 +16,6 @@





























package android.service.persistentdata;





























import android.annotation.FlaggedApi;















import android.annotation.IntDef;















import android.annotation.NonNull;















import android.annotation.Nullable;









@@ -26,7 +25,6 @@ import android.annotation.SystemApi;













import android.annotation.SystemService;















import android.content.Context;















import android.os.RemoteException;













import android.security.Flags;















import android.service.oemlock.OemLockManager;































import java.lang.annotation.Retention;









@@ -36,7 +34,6 @@ import java.lang.annotation.RetentionPolicy;













 * Interface to the persistent data partition.  Provides access to information about the state















 * of factory reset protection.















 */













@FlaggedApi(Flags.FLAG_FRP_ENFORCEMENT)















@SystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE)















public class PersistentDataBlockManager {















    private static final String TAG = PersistentDataBlockManager.class.getSimpleName();










@@ -259,7 +256,6 @@ public class PersistentDataBlockManager {













     * not been able to deactivate FRP because the deactivation secrets were wiped by an untrusted















     * factory reset.















     */













    @FlaggedApi(Flags.FLAG_FRP_ENFORCEMENT)















    public boolean isFactoryResetProtectionActive() {















        try {















            return sService.isFactoryResetProtectionActive();









@@ -275,7 +271,6 @@ public class PersistentDataBlockManager {













     *















     * @hide















     */













    @FlaggedApi(Flags.FLAG_FRP_ENFORCEMENT)















    @SystemApi















    @RequiresPermission(android.Manifest.permission.CONFIGURE_FACTORY_RESET_PROTECTION)















    public boolean deactivateFactoryResetProtection(@NonNull byte[] secret) {










@@ -312,7 +307,6 @@ public class PersistentDataBlockManager {













     *















     * @hide















     */













    @FlaggedApi(Flags.FLAG_FRP_ENFORCEMENT)















    @SystemApi















    @SuppressLint("RequiresPermission")















    public boolean setFactoryResetProtectionSecret(@NonNull byte[] secret) {