summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Kholoud Mohamed <kholoudm@google.com> 2023-05-02 15:57:01 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-05-02 15:57:01 +0000
commit25ffa22319d6d3c6f0d0152837ed96af6bd7779f (patch)
treeebcdc0171d244b19bbed2192a9c74ab8c11bb2f9 /libs/androidfw/ZipFileRO.cpp
parente8899cf6512ac881c087d1a53fe19df33bf7f3f4 (diff)
parenta77dc6b83501c1c55a65e75ba8e5f3288b1c3ff2 (diff)
Merge changes from topic "fixSettingsCrash" into udc-dev
* changes: Gate unicorn APIs behind a separate flag Transfer policies on admin ownership transfer Revert "Revert "Enable unicorn APIs"" Allow system to retrieve keyguardDisabledFeatures for an admin
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions