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

Commit b8845384 authored by Zhong Dong's avatar Zhong Dong
Browse files

Fix NPE in notifyCrossProfileProvidersChanged 

The mWidgetProviderListeners is by default null. It is initialized by
addOnCrossProfileWidgetProvidersChangeListener method. And this method
is called by AppWidgetServiceImpl.

On devices without app widget service, e.g. Wear,
mWidgetProviderListeners is null. And calling
notifyCrossProfileProvidersChanged throws NPE.

Flag: EXEMPT BUGFIX
Bug: 436819350
Test: Locally build and test work profile provision
Test: Presubmit

Change-Id: Ic7216edddf5e3564e81da7eefbedb826f7deb421
parent e8976188

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

+5 −1
Original line number Diff line number Diff line
@@ -16234,8 +16234,12 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            mHandler.post(() -> {

                final List<OnCrossProfileWidgetProvidersChangeListener> listeners;

                synchronized (getLockObject()) {

                    if (mWidgetProviderListeners == null) {

                        return;

                    } else {

                        listeners = new ArrayList<>(mWidgetProviderListeners);

                    }

                }

                final int listenerCount = listeners.size();

                for (int i = 0; i < listenerCount; i++) {

                    OnCrossProfileWidgetProvidersChangeListener listener = listeners.get(i);