diff options
| author | 2024-03-14 21:59:53 +0000 | |
|---|---|---|
| committer | 2024-03-14 21:59:53 +0000 | |
| commit | ab355a205ddf5f8eaff47cec0f1ff7fc62c68e2c (patch) | |
| tree | f303c5ac8af44ba94775306d0549c432f2508e8a | |
| parent | 6c562bbfc14c6d647b1b522567406b7425819cec (diff) | |
| parent | bee96742f2c28a9b4f161b7c4cc96102944be156 (diff) | |
Merge "Add nullability annotations to the SystemApi." into main
| -rw-r--r-- | core/api/system-current.txt | 4 | ||||
| -rw-r--r-- | core/java/android/service/persistentdata/PersistentDataBlockManager.java | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 7aeecbfeb3ad..465ee5baca23 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -12979,11 +12979,11 @@ package android.service.persistentdata { 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 public byte[] read(); + method @Nullable public byte[] read(); method @FlaggedApi("android.security.frp_enforcement") 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(byte[]); + method public int write(@Nullable byte[]); field public static final int FLASH_LOCK_LOCKED = 1; // 0x1 field public static final int FLASH_LOCK_UNKNOWN = -1; // 0xffffffff field public static final int FLASH_LOCK_UNLOCKED = 0; // 0x0 diff --git a/core/java/android/service/persistentdata/PersistentDataBlockManager.java b/core/java/android/service/persistentdata/PersistentDataBlockManager.java index 9b9cc1933b93..7a1c75a6034f 100644 --- a/core/java/android/service/persistentdata/PersistentDataBlockManager.java +++ b/core/java/android/service/persistentdata/PersistentDataBlockManager.java @@ -19,6 +19,7 @@ package android.service.persistentdata; import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SuppressLint; import android.annotation.SystemApi; @@ -100,7 +101,7 @@ public class PersistentDataBlockManager { */ @SystemApi @SuppressLint("RequiresPermission") - public int write(byte[] data) { + public int write(@Nullable byte[] data) { try { return sService.write(data); } catch (RemoteException e) { @@ -115,7 +116,7 @@ public class PersistentDataBlockManager { */ @SystemApi @SuppressLint("RequiresPermission") - public byte[] read() { + public @Nullable byte[] read() { try { return sService.read(); } catch (RemoteException e) { |