diff options
| author | 2024-03-19 10:33:44 -0700 | |
|---|---|---|
| committer | 2024-03-19 10:33:44 -0700 | |
| commit | 52664d84d2fd89ad29508ff9493b22f7178bd084 (patch) | |
| tree | ab799cfc7fab97f36b50d37b6a66f510bef9de8b | |
| parent | c4c128e9b9e9b8db0e909b58b0332c3a4970b04e (diff) | |
Make Context.PERSISTENT_DATA_BLOCK_SERVICE public
As a new public API is added in PersistentDataBlockManager, and the
app uses context.getSystemService(...) to access the manager, change the
constant from @SystemApi to public.
Bug: 315380237
Test: m
Change-Id: Ie4bfb85c96184dba108faea601192894bbf32bb6
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/Context.java | 5 |
3 files changed, 3 insertions, 4 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 4d3ca1335416..e72e758d592e 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -10764,6 +10764,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 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"; diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 8ceda62e0e02..0023e2a3d579 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -3797,7 +3797,6 @@ package android.content { field @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public static final String ON_DEVICE_INTELLIGENCE_SERVICE = "on_device_intelligence"; field public static final String PERMISSION_CONTROLLER_SERVICE = "permission_controller"; field public static final String PERMISSION_SERVICE = "permission"; - field public static final String PERSISTENT_DATA_BLOCK_SERVICE = "persistent_data_block"; field public static final String REBOOT_READINESS_SERVICE = "reboot_readiness"; field public static final String ROLLBACK_SERVICE = "rollback"; field public static final String SAFETY_CENTER_SERVICE = "safety_center"; diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 89300e3a15f1..284e3184d436 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -4208,7 +4208,7 @@ public abstract class Context { MEDIA_COMMUNICATION_SERVICE, BATTERY_SERVICE, JOB_SCHEDULER_SERVICE, - //@hide: PERSISTENT_DATA_BLOCK_SERVICE, + PERSISTENT_DATA_BLOCK_SERVICE, //@hide: OEM_LOCK_SERVICE, MEDIA_PROJECTION_SERVICE, MIDI_SERVICE, @@ -5930,9 +5930,8 @@ public abstract class Context { * * @see #getSystemService(String) * @see android.service.persistentdata.PersistentDataBlockManager - * @hide */ - @SystemApi + @FlaggedApi(android.security.Flags.FLAG_FRP_ENFORCEMENT) public static final String PERSISTENT_DATA_BLOCK_SERVICE = "persistent_data_block"; /** |