| commit | bfcca8bc61bb6068427821958d91d3fc5f11fbe7 | [log] [tgz] |
|---|---|---|
| author | lijilou <lijilou@xiaomi.corp-partner.google.com> | Fri May 10 14:44:20 2024 +0800 |
| committer | Pinyao Ting <pinyaoting@google.com> | Fri May 17 01:48:41 2024 +0000 |
| tree | efe935db75f613b5c0a77069e52931d99382032c | |
| parent | 43dc73188e63b383f3c331afea3909c39303bd00 [diff] |
AppWidgetServiceImpl:fix NPE in pruneWidgetStateLocked mthod . When the hostsPackageForUser method return true,No nonNull judgment is made on the provider var which may be a null var. Bug: 339747311 Merged-In: I00f8c12b5dec00eac6e50e2ef755742db3fe4521 Change-Id: I00f8c12b5dec00eac6e50e2ef755742db3fe4521
diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java index a4b2896..96ae790 100644 --- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java +++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
@@ -5084,7 +5084,9 @@ // so we tear it down in anticipation of it (possibly) being // reconstructed due to the restore host.widgets.remove(widget); - provider.widgets.remove(widget); + if (provider != null) { + provider.widgets.remove(widget); + } // Check if we need to destroy any services (if no other app widgets are // referencing the same service) decrementAppWidgetServiceRefCount(widget);