am ee0d8deb: Merge "Skip merge and assign RemoteViews directly if updateAppWidget() has not been called. (Bug 7214731)" into jb-mr1-dev

* commit 'ee0d8deb5e4bb9e2d9caef2c988f483afe9f24a7': Skip merge and assign RemoteViews directly if updateAppWidget() has not been called. (Bug 7214731)
2012-10-11 13:59:13 -07:00
parent 756cf7e882 ee0d8deb5e
commit f0a8045e72
1 changed files with 1 additions and 1 deletions
--- 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 {