summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAlex Johnston <acjohnston@google.com>2020-05-27 10:10:45 +0100
committerAlex Johnston <acjohnston@google.com>2020-06-02 19:38:57 +0100
commit1ab58c3b8b8aac1645103a491515c3d3efeec156 (patch)
treef8d2875e49c5b66ecfe4333c3bce5e85da81fc13 /tools/aapt2/java/JavaClassGenerator.cpp
parent09aa3bc4b7c2033af7dffc6e46b3db7aa6224623 (diff)
Non-system camera PPA set by DPC
Background ag/10760163 introduced a change which requires camera intents to match system apps only. As a result, the DPC will no longer have the aility to control the camera PPA. This CL gives the DPC the ability to set a camera PPA, by adding a new field isSetByDPM to the PersistentPreferredActivity. If this field is set, the camera intent does not have to match a system app. Changes * Added isSetByDPM to PersistentPreferredActivity * Added helper method in PackageManagerService to check if an intent is an image capture intent and not set by the DPC * updated the is isImplicitImageCaptureIntentAndNotSetByDpc parameter to updateFlagsForResolve() in PackageManagerService Bug: 153921883 Test: atest com.android.server.pm.PackageManagerServiceTest atest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testPersistentIntentResolving atest com.android.cts.devicepolicy.MixedProfileOwnerTest#testPersistentIntentResolving atest com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPersistentIntentResolving Change-Id: I667a7e613b76514ecc1d814393d173c2987ca0b6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions