Merge "Fix widget not being masked when freshly added." into nyc-dev am: 9c63f3c (1e162aed) · Commits · e / os / android_frameworks_base

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

+15 −16

Original line number	Diff line number	Diff line
		@@ -613,10 +613,6 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
		\| FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
		}
		}
		} finally {
		Binder.restoreCallingIdentity(identity);
		}

		for (int j = 0; j < widgetCount; j++) {
		Widget widget = provider.widgets.get(j);
		if (targetWidget != null && targetWidget != widget) continue;
		@@ -630,6 +626,9 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
		scheduleNotifyUpdateAppWidgetLocked(widget, widget.getEffectiveViewsLocked());
		}
		}
		} finally {
		Binder.restoreCallingIdentity(identity);
		}
		}

		private void unmaskWidgetsViewsLocked(Provider provider) {
		@@ -1062,8 +1061,6 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
		widget.provider = provider;
		widget.options = (options != null) ? cloneIfLocalBinder(options) : new Bundle();

		onWidgetProviderAddedOrChangedLocked(widget);

		// We need to provide a default value for the widget category if it is not specified
		if (!widget.options.containsKey(AppWidgetManager.OPTION_APPWIDGET_HOST_CATEGORY)) {
		widget.options.putInt(AppWidgetManager.OPTION_APPWIDGET_HOST_CATEGORY,
		@@ -1072,6 +1069,8 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku

		provider.widgets.add(widget);

		onWidgetProviderAddedOrChangedLocked(widget);

		final int widgetCount = provider.widgets.size();
		if (widgetCount == 1) {
		// Tell the provider that it's ready.