diff options
| author | 2024-11-13 19:40:22 +0000 | |
|---|---|---|
| committer | 2024-11-13 19:40:22 +0000 | |
| commit | 741f80f3b59022548694cb77aad7984d1aa9f5fe (patch) | |
| tree | 83d04a487786126bfb31308a49dec4ae95e7334d | |
| parent | 0555e7b7322d292dd6b3958ddcc5fef0bf851d8e (diff) | |
| parent | 47f505bb5cbcbdb20734ab8d788de8f02812fe55 (diff) | |
Merge "Add psap_ai flag to protect DeviceConfig flags" into main am: 494fd28753 am: 47f505bb5c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3341310
Change-Id: Id2d1556294cd08b51a9cf54512b0733c1c0be8e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/security/flags.aconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/security/flags.aconfig b/core/java/android/security/flags.aconfig index ce901217d700..09004b3dcf03 100644 --- a/core/java/android/security/flags.aconfig +++ b/core/java/android/security/flags.aconfig @@ -115,6 +115,14 @@ flag { } flag { + name: "protect_device_config_flags" + namespace: "psap_ai" + description: "Feature flag to limit adb shell to allowlisted flags" + bug: "364083026" + is_fixed_read_only: true +} + +flag { name: "keystore_grant_api" namespace: "hardware_backed_security" description: "Feature flag for exposing KeyStore grant APIs" |