diff options
| author | 2022-04-21 13:18:30 +0000 | |
|---|---|---|
| committer | 2022-04-21 13:18:30 +0000 | |
| commit | a6b10d782ad24f30e71f07f8fb9e16726064ec85 (patch) | |
| tree | b9d6e0c3b137a44366ff1c1691734c5271234644 | |
| parent | 257ac41d75dd92963bf1e8ab93e5283d07f57cef (diff) | |
| parent | b29c6071c9e5d5445fcc36f0a81fe85561576109 (diff) | |
Merge "Fix bug in DPM#setDrawable" into tm-dev am: e629b8ac9a am: b29c6071c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17884325
Change-Id: I9aabd8ead2eb035d0067630b27245aee83ac85a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DeviceManagementResourcesProvider.java | 4 |
1 files 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 6aef90c79705..cc32c4d8e61c 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<>()); } |