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

Browse Source
This commit is contained in:
TreeHugger Robot
2022-04-21 12:36:11 +00:00
committed by Android (Google) Code Review
parent db7b4503f3 aef103de2f
commit e629b8ac9a
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<>());
} }