diff options
| author | 2012-10-11 13:56:23 -0700 | |
|---|---|---|
| committer | 2012-10-11 13:56:24 -0700 | |
| commit | ee0d8deb5e4bb9e2d9caef2c988f483afe9f24a7 (patch) | |
| tree | 2a928a371abb32da818cbe4fefb6feb59291f620 | |
| parent | b3c38156fc3f1ff2621c8e0961ebf75a5486d2b4 (diff) | |
| parent | 596b1850f39e6d4b2f4392dbfb591d99a73b7563 (diff) | |
Merge "Skip merge and assign RemoteViews directly if updateAppWidget() has not been called. (Bug 7214731)" into jb-mr1-dev
| -rw-r--r-- | services/java/com/android/server/AppWidgetServiceImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/AppWidgetServiceImpl.java b/services/java/com/android/server/AppWidgetServiceImpl.java index 41617c8df6d1..04cfa4f4edc4 100644 --- a/services/java/com/android/server/AppWidgetServiceImpl.java +++ b/services/java/com/android/server/AppWidgetServiceImpl.java @@ -996,7 +996,7 @@ class AppWidgetServiceImpl { // drop unbound appWidgetIds (shouldn't be possible under normal circumstances) if (id != null && id.provider != null && !id.provider.zombie && !id.host.zombie) { - if (!isPartialUpdate) { + if (!isPartialUpdate || id.views == null) { // For a full update we replace the RemoteViews completely. id.views = views; } else { |