From aef103de2f5475e63fcd37b5c659050868345342 Mon Sep 17 00:00:00 2001
From: kholoud mohamed <kholoudm@google.com>
Date: Thu, 21 Apr 2022 09:10:37 +0100
Subject: [PATCH] Fix bug in DPM#setDrawable

Fixes: 229265302
Test: atest android.devicepolicy.cts.DevicePolicyResourcesTests
Change-Id: Ida6e72565733c717243a2ffc83b6b5975a9b5a3b
---
 .../devicepolicy/DeviceManagementResourcesProvider.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DeviceManagementResourcesProvider.java b/services/devicepolicy/java/com/android/server/devicepolicy/DeviceManagementResourcesProvider.java
index 6aef90c797055..cc32c4d8e61cc 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DeviceManagementResourcesProvider.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DeviceManagementResourcesProvider.java
@@ -141,11 +141,11 @@ class DeviceManagementResourcesProvider {
             String drawableId, String drawableSource, String drawableStyle,
             ParcelableResource updatableResource) {
         synchronized (mLock) {
-            Map<String, Map<String, ParcelableResource>> drawablesForId =
-                    mUpdatedDrawablesForSource.get(drawableId);
             if (!mUpdatedDrawablesForSource.containsKey(drawableId)) {
                 mUpdatedDrawablesForSource.put(drawableId, new HashMap<>());
             }
+            Map<String, Map<String, ParcelableResource>> drawablesForId =
+                    mUpdatedDrawablesForSource.get(drawableId);
             if (!drawablesForId.containsKey(drawableSource)) {
                 mUpdatedDrawablesForSource.get(drawableId).put(drawableSource, new HashMap<>());
             }