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

Commit 2c1177a7 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 

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



Change-Id: I95b791914001d9f826dab9665380555dbb9b7b3a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0d533421 e629b8ac

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

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

            }

            }