Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug in DPM#setDrawable" into tm-dev am: e629b8ac9a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17884325

Change-Id: I95b791914001d9f826dab9665380555dbb9b7b3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-04-21 13:03:09 +00:00
committed by Automerger Merge Worker
parent 0d533421f6 e629b8ac9a
commit 2c1177a78e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/devicepolicy/java/com/android/server/devicepolicy/DeviceManagementResourcesProvider.java
View File

@@ -141,11 +141,11 @@ class DeviceManagementResourcesProvider {
String drawableId, String drawableSource, String drawableStyle, String drawableId, String drawableSource, String drawableStyle,
ParcelableResource updatableResource) { ParcelableResource updatableResource) {
synchronized (mLock) { synchronized (mLock) {
Map<String, Map<String, ParcelableResource>> drawablesForId =
mUpdatedDrawablesForSource.get(drawableId);
if (!mUpdatedDrawablesForSource.containsKey(drawableId)) { if (!mUpdatedDrawablesForSource.containsKey(drawableId)) {
mUpdatedDrawablesForSource.put(drawableId, new HashMap<>()); mUpdatedDrawablesForSource.put(drawableId, new HashMap<>());
} }
Map<String, Map<String, ParcelableResource>> drawablesForId =
mUpdatedDrawablesForSource.get(drawableId);
if (!drawablesForId.containsKey(drawableSource)) { if (!drawablesForId.containsKey(drawableSource)) {
mUpdatedDrawablesForSource.get(drawableId).put(drawableSource, new HashMap<>()); mUpdatedDrawablesForSource.get(drawableId).put(drawableSource, new HashMap<>());
} }