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

Commit 08270813 authored by Samuel Fufa's avatar Samuel Fufa Committed by Automerger Merge Worker
Browse files

Merge "Resolve NPE on widget.provider.id" into rvc-dev am: f5de7b09 

Change-Id: I73581733387d0758d8753cde494229e67fe2153d
parents 025cc613 f5de7b09

services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java

+4 −8
Original line number Original line Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.server.appwidget; 
import static android.content.Context.KEYGUARD_SERVICE;

import static android.content.Context.KEYGUARD_SERVICE;

import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS;

import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS;

import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;

import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;



import static com.android.server.pm.PackageManagerService.PLATFORM_PACKAGE_NAME;

import static com.android.server.pm.PackageManagerService.PLATFORM_PACKAGE_NAME;





import android.annotation.UserIdInt;

import android.annotation.UserIdInt;
@@ -101,7 +100,6 @@ import android.util.proto.ProtoOutputStream; 
import android.view.Display;

import android.view.Display;

import android.view.View;

import android.view.View;

import android.widget.RemoteViews;

import android.widget.RemoteViews;



import com.android.internal.R;

import com.android.internal.R;

import com.android.internal.app.SuspendedAppActivity;

import com.android.internal.app.SuspendedAppActivity;

import com.android.internal.app.UnlaunchableAppActivity;

import com.android.internal.app.UnlaunchableAppActivity;
@@ -116,11 +114,6 @@ import com.android.internal.widget.IRemoteViewsFactory; 
import com.android.server.LocalServices;

import com.android.server.LocalServices;

import com.android.server.WidgetBackupProvider;

import com.android.server.WidgetBackupProvider;

import com.android.server.policy.IconUtilities;

import com.android.server.policy.IconUtilities;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;

import org.xmlpull.v1.XmlSerializer;



import java.io.ByteArrayInputStream;

import java.io.ByteArrayInputStream;

import java.io.ByteArrayOutputStream;

import java.io.ByteArrayOutputStream;

import java.io.File;

import java.io.File;
@@ -142,6 +135,9 @@ import java.util.Map; 
import java.util.Objects;

import java.util.Objects;

import java.util.Set;

import java.util.Set;

import java.util.concurrent.atomic.AtomicLong;

import java.util.concurrent.atomic.AtomicLong;

import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;

import org.xmlpull.v1.XmlSerializer;





class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBackupProvider,

class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBackupProvider,

        OnCrossProfileWidgetProvidersChangeListener {

        OnCrossProfileWidgetProvidersChangeListener {
@@ -4887,7 +4883,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
                final int widgetCount = mWidgets.size();

                final int widgetCount = mWidgets.size();

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

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

                    final Widget widget = mWidgets.get(i);

                    final Widget widget = mWidgets.get(i);

                    if  (widget.host.id.uid == uid) {

                    if  (widget.host.id.uid == uid && widget.provider != null) {

                        if (widgetPackages == null) {

                        if (widgetPackages == null) {

                            widgetPackages = new ArraySet<>();

                            widgetPackages = new ArraySet<>();

                        }

                        }