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

Commit 9074e8bf authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Annotate System Manager classes that are restricted in SdkSandbox 5/n" into main

parents 9d0df884 298e64e6
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -42952,7 +42952,7 @@ package android.service.notification {
package android.service.persistentdata {
  public class PersistentDataBlockManager {
  @RestrictedForEnvironment(environments=android.annotation.RestrictedForEnvironment.ENVIRONMENT_SDK_RUNTIME, from=android.os.Build.VERSION_CODES.VANILLA_ICE_CREAM) public class PersistentDataBlockManager {
    method public boolean isFactoryResetProtectionActive();
  }
+1 −1
Original line number Diff line number Diff line
@@ -14002,7 +14002,7 @@ package android.service.oemlock {
package android.service.persistentdata {
  public class PersistentDataBlockManager {
  @RestrictedForEnvironment(environments=android.annotation.RestrictedForEnvironment.ENVIRONMENT_SDK_RUNTIME, from=android.os.Build.VERSION_CODES.VANILLA_ICE_CREAM) 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();
+6 −0
Original line number Diff line number Diff line
@@ -16,14 +16,18 @@

package android.service.persistentdata;

import static android.annotation.RestrictedForEnvironment.ENVIRONMENT_SDK_RUNTIME;

import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.RequiresPermission;
import android.annotation.RestrictedForEnvironment;
import android.annotation.SuppressLint;
import android.annotation.SystemApi;
import android.annotation.SystemService;
import android.content.Context;
import android.os.Build;
import android.os.RemoteException;
import android.service.oemlock.OemLockManager;

@@ -34,6 +38,8 @@ import java.lang.annotation.RetentionPolicy;
 * Interface to the persistent data partition.  Provides access to information about the state
 * of factory reset protection.
 */
@RestrictedForEnvironment(
        environments = ENVIRONMENT_SDK_RUNTIME, from = Build.VERSION_CODES.VANILLA_ICE_CREAM)
@SystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE)
public class PersistentDataBlockManager {
    private static final String TAG = PersistentDataBlockManager.class.getSimpleName();