Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6b10d78 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I9aabd8ead2eb035d0067630b27245aee83ac85a7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 257ac41d b29c6071

services/devicepolicy/java/com/android/server/devicepolicy/DeviceManagementResourcesProvider.java

+2 −2
Original line number Diff line number Diff line
@@ -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<>());

            }