summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lee Shombert <shombert@google.com> 2024-12-09 07:42:04 -0800
committer Lee Shombert <shombert@google.com> 2025-01-02 14:51:20 -0800
commit7aaeea72224758467a1cb49c52ab88f1dbd2058f (patch)
tree679642e12c1349ba79bea73ce589223f4ed35c03
parentd6b3bdf805b44d7d1b27be92d252d600b2e241a2 (diff)
Allow DevicePolicy caches to cache nulls
DevicePolicyManager caches are in front of binder APIs that may return legitimate nulls. This change allows those nulls to be cached. Flag: EXEMPT bug-fix Bug: 378762206 Test: atest * atest FrameworksServicesTests:DevicePolicyConstantsTest * atest FrameworksServicesTests:DevicePolicyEventLoggerTest * atest FrameworksServicesTests:DevicePolicyManagerServiceMigrationTest * atest FrameworksServicesTests:DevicePolicyManagerTest * atest FrameworksServicesTests:EnterpriseSpecificIdCalculatorTest * atest FrameworksServicesTests:OverlayPackagesProviderTest * atest FrameworksServicesTests:OwnersTest * atest FrameworksServicesTests:PolicyVersionUpgraderTest * atest FrameworksServicesTests:SecurityEventTest * atest FrameworksServicesTests:SystemUpdatePolicyTest * atest FrameworksServicesTests:TransferOwnershipMetadataManagerTest * atest MixedDeviceOwnerTest#testIsDeviceOrganizationOwnedWithManagedProfile * atest MixedManagedProfileOwnerTest#testIsDeviceOrganizationOwnedWithManagedProfile * atest MixedManagedProfileOwnerTest#testNetworkLoggingDelegate * atest OrgOwnedProfileOwnerTest#testIsDeviceOrganizationOwnedWithManagedProfile * atest OrgOwnedProfileOwnerTest#testNetworkLoggingDelegate * atest com.android.cts.devicepolicy.DeviceOwnerTest#testAdminActionBookkeeping Change-Id: Ibce0ccc8191e9aff2b87a7967c5f47a8b7788e49
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 84d67415a4b4..a2fddb045179 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -4443,7 +4443,8 @@ public class DevicePolicyManager {
* disabled through this Config.
*/
private static final IpcDataCache.Config sDpmCaches =
- new IpcDataCache.Config(8, IpcDataCache.MODULE_SYSTEM, "DevicePolicyManagerCaches");
+ new IpcDataCache.Config(8, IpcDataCache.MODULE_SYSTEM, "DevicePolicyManagerCaches")
+ .cacheNulls(true);
/** @hide */
public static void invalidateBinderCaches() {