Merge "Create remote collection cache to eliminate duplicate intent" into main (3e54a58f) · Commits · e / os / android_frameworks_base

core/java/android/appwidget/AppWidgetManager.java

+55 −34

Original line number	Diff line number	Diff line
		@@ -562,13 +562,6 @@ public class AppWidgetManager {
		});
		}

		private boolean isPostingTaskToBackground(@Nullable RemoteViews views) {
		return Looper.myLooper() == Looper.getMainLooper()
		&& RemoteViews.isAdapterConversionEnabled()
		&& (mHasPostedLegacyLists = mHasPostedLegacyLists
		\|\| (views != null && views.hasLegacyLists()));
		}

		/**
		* Set the RemoteViews to use for the specified appWidgetIds.
		* <p>
		@@ -593,10 +586,18 @@ public class AppWidgetManager {
		return;
		}

		if (isPostingTaskToBackground(views)) {
		final boolean isConvertingAdapter = RemoteViews.isAdapterConversionEnabled()
		&& (mHasPostedLegacyLists = mHasPostedLegacyLists
		\|\| (views != null && views.hasLegacyLists()));

		if (isConvertingAdapter) {
		views.collectAllIntents();

		if (Looper.getMainLooper() == Looper.myLooper()) {
		RemoteViews viewsCopy = new RemoteViews(views);
		createUpdateExecutorIfNull().execute(() -> {
		try {
		mService.updateAppWidgetIds(mPackageName, appWidgetIds, views);
		mService.updateAppWidgetIds(mPackageName, appWidgetIds, viewsCopy);
		} catch (RemoteException e) {
		Log.e(TAG, "Error updating app widget views in background", e);
		}
		@@ -604,6 +605,7 @@ public class AppWidgetManager {

		return;
		}
		}

		try {
		mService.updateAppWidgetIds(mPackageName, appWidgetIds, views);
		@@ -714,10 +716,18 @@ public class AppWidgetManager {
		return;
		}

		if (isPostingTaskToBackground(views)) {
		final boolean isConvertingAdapter = RemoteViews.isAdapterConversionEnabled()
		&& (mHasPostedLegacyLists = mHasPostedLegacyLists
		\|\| (views != null && views.hasLegacyLists()));

		if (isConvertingAdapter) {
		views.collectAllIntents();

		if (Looper.getMainLooper() == Looper.myLooper()) {
		RemoteViews viewsCopy = new RemoteViews(views);
		createUpdateExecutorIfNull().execute(() -> {
		try {
		mService.partiallyUpdateAppWidgetIds(mPackageName, appWidgetIds, views);
		mService.partiallyUpdateAppWidgetIds(mPackageName, appWidgetIds, viewsCopy);
		} catch (RemoteException e) {
		Log.e(TAG, "Error partially updating app widget views in background", e);
		}
		@@ -725,6 +735,7 @@ public class AppWidgetManager {

		return;
		}
		}

		try {
		mService.partiallyUpdateAppWidgetIds(mPackageName, appWidgetIds, views);
		@@ -782,17 +793,27 @@ public class AppWidgetManager {
		return;
		}

		if (isPostingTaskToBackground(views)) {
		final boolean isConvertingAdapter = RemoteViews.isAdapterConversionEnabled()
		&& (mHasPostedLegacyLists = mHasPostedLegacyLists
		\|\| (views != null && views.hasLegacyLists()));

		if (isConvertingAdapter) {
		views.collectAllIntents();

		if (Looper.getMainLooper() == Looper.myLooper()) {
		RemoteViews viewsCopy = new RemoteViews(views);
		createUpdateExecutorIfNull().execute(() -> {
		try {
		mService.updateAppWidgetProvider(provider, views);
		mService.updateAppWidgetProvider(provider, viewsCopy);
		} catch (RemoteException e) {
		Log.e(TAG, "Error updating app widget view using provider in background", e);
		Log.e(TAG, "Error updating app widget view using provider in background",
		e);
		}
		});

		return;
		}
		}

		try {
		mService.updateAppWidgetProvider(provider, views);

core/java/android/widget/RemoteViews.java

+195 −25

Original line number	Diff line number	Diff line
		@@ -85,6 +85,7 @@ import android.util.Log;
		import android.util.LongArray;
		import android.util.Pair;
		import android.util.SizeF;
		import android.util.SparseArray;
		import android.util.SparseIntArray;
		import android.util.TypedValue;
		import android.util.TypedValue.ComplexDimensionUnit;
		@@ -367,6 +368,11 @@ public class RemoteViews implements Parcelable, Filter {
		@UnsupportedAppUsage
		private BitmapCache mBitmapCache = new BitmapCache();

		/**
		* Maps Intent ID to RemoteCollectionItems to avoid duplicate items
		*/
		private RemoteCollectionCache mCollectionCache = new RemoteCollectionCache();

		/** Cache of ApplicationInfos used by collection items. */
		private ApplicationInfoCache mApplicationInfoCache = new ApplicationInfoCache();

		@@ -784,9 +790,12 @@ public class RemoteViews implements Parcelable, Filter {
		if (action instanceof SetRemoteCollectionItemListAdapterAction itemsAction
		&& itemsAction.mViewId == viewId
		&& itemsAction.mServiceIntent != null) {
		mActions.set(i,
		new SetRemoteCollectionItemListAdapterAction(itemsAction.mViewId,
		itemsAction.mServiceIntent));
		SetRemoteCollectionItemListAdapterAction newCollectionAction =
		new SetRemoteCollectionItemListAdapterAction(
		itemsAction.mViewId, itemsAction.mServiceIntent);
		newCollectionAction.mIntentId = itemsAction.mIntentId;
		newCollectionAction.mIsReplacedIntoAction = true;
		mActions.set(i, newCollectionAction);
		isActionReplaced = true;
		} else if (action instanceof SetRemoteViewsAdapterIntent intentAction
		&& intentAction.mViewId == viewId) {
		@@ -1048,6 +1057,8 @@ public class RemoteViews implements Parcelable, Filter {
		@NonNull
		private CompletableFuture<RemoteCollectionItems> mItemsFuture;
		final Intent mServiceIntent;
		int mIntentId = -1;
		boolean mIsReplacedIntoAction = false;

		SetRemoteCollectionItemListAdapterAction(@IdRes int id,
		@NonNull RemoteCollectionItems items) {
		@@ -1108,38 +1119,36 @@ public class RemoteViews implements Parcelable, Filter {

		SetRemoteCollectionItemListAdapterAction(Parcel parcel) {
		mViewId = parcel.readInt();
		mItemsFuture = CompletableFuture.completedFuture(
		new RemoteCollectionItems(parcel, getHierarchyRootData()));
		mIntentId = parcel.readInt();
		mItemsFuture = CompletableFuture.completedFuture(mIntentId != -1
		? null
		: new RemoteCollectionItems(parcel, getHierarchyRootData()));
		mServiceIntent = parcel.readTypedObject(Intent.CREATOR);
		}

		@Override
		public void setHierarchyRootData(HierarchyRootData rootData) {
		if (mIntentId == -1) {
		mItemsFuture = mItemsFuture
		.thenApply(rc -> {
		rc.setHierarchyRootData(rootData);
		return rc;
		});
		return;
		}

		private static RemoteCollectionItems getCollectionItemsFromFuture(
		CompletableFuture<RemoteCollectionItems> itemsFuture) {
		RemoteCollectionItems items;
		try {
		items = itemsFuture.get();
		} catch (Exception e) {
		Log.e(LOG_TAG, "Error getting collection items from future", e);
		items = new RemoteCollectionItems.Builder().build();
		}

		return items;
		// Set the root data for items in the cache instead
		mCollectionCache.setHierarchyDataForId(mIntentId, rootData);
		}

		@Override
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeInt(mViewId);
		dest.writeInt(mIntentId);
		if (mIntentId == -1) {
		RemoteCollectionItems items = getCollectionItemsFromFuture(mItemsFuture);
		items.writeToParcel(dest, flags, /* attached= */ true);
		}
		dest.writeTypedObject(mServiceIntent, flags);
		}

		@@ -1149,7 +1158,9 @@ public class RemoteViews implements Parcelable, Filter {
		View target = root.findViewById(mViewId);
		if (target == null) return;

		RemoteCollectionItems items = getCollectionItemsFromFuture(mItemsFuture);
		RemoteCollectionItems items = mIntentId == -1
		? getCollectionItemsFromFuture(mItemsFuture)
		: mCollectionCache.getItemsForId(mIntentId);

		// Ensure that we are applying to an AppWidget root
		if (!(rootParent instanceof AppWidgetHostView)) {
		@@ -1210,6 +1221,153 @@ public class RemoteViews implements Parcelable, Filter {
		}
		}

		private static RemoteCollectionItems getCollectionItemsFromFuture(
		CompletableFuture<RemoteCollectionItems> itemsFuture) {
		RemoteCollectionItems items;
		try {
		items = itemsFuture.get();
		} catch (Exception e) {
		Log.e(LOG_TAG, "Error getting collection items from future", e);
		items = new RemoteCollectionItems.Builder().build();
		}

		return items;
		}

		/**
		* @hide
		*/
		public void collectAllIntents() {
		mCollectionCache.collectAllIntentsNoComplete(this);
		}

		private class RemoteCollectionCache {
		private SparseArray<String> mIdToUriMapping = new SparseArray<>();
		private HashMap<String, RemoteCollectionItems> mUriToCollectionMapping = new HashMap<>();

		// We don't put this into the parcel
		private HashMap<String, CompletableFuture<RemoteCollectionItems>> mTempUriToFutureMapping =
		new HashMap<>();

		RemoteCollectionCache() { }

		RemoteCollectionCache(RemoteCollectionCache src) {
		boolean isWaitingCache = src.mTempUriToFutureMapping.size() != 0;
		for (int i = 0; i < src.mIdToUriMapping.size(); i++) {
		String uri = src.mIdToUriMapping.valueAt(i);
		mIdToUriMapping.put(src.mIdToUriMapping.keyAt(i), uri);
		if (isWaitingCache) {
		mTempUriToFutureMapping.put(uri, src.mTempUriToFutureMapping.get(uri));
		} else {
		mUriToCollectionMapping.put(uri, src.mUriToCollectionMapping.get(uri));
		}
		}
		}

		RemoteCollectionCache(Parcel in) {
		int cacheSize = in.readInt();
		HierarchyRootData currentRootData = new HierarchyRootData(mBitmapCache,
		this,
		mApplicationInfoCache,
		mClassCookies);
		for (int i = 0; i < cacheSize; i++) {
		int intentId = in.readInt();
		String intentUri = in.readString8();
		RemoteCollectionItems items = new RemoteCollectionItems(in, currentRootData);
		mIdToUriMapping.put(intentId, intentUri);
		mUriToCollectionMapping.put(intentUri, items);
		}
		}

		void setHierarchyDataForId(int intentId, HierarchyRootData data) {
		String uri = mIdToUriMapping.get(intentId);
		if (mTempUriToFutureMapping.get(uri) != null) {
		CompletableFuture<RemoteCollectionItems> itemsFuture =
		mTempUriToFutureMapping.get(uri);
		mTempUriToFutureMapping.put(uri, itemsFuture.thenApply(rc -> {
		rc.setHierarchyRootData(data);
		return rc;
		}));

		return;
		}

		RemoteCollectionItems items = mUriToCollectionMapping.get(uri);
		items.setHierarchyRootData(data);
		}

		RemoteCollectionItems getItemsForId(int intentId) {
		String uri = mIdToUriMapping.get(intentId);
		return mUriToCollectionMapping.get(uri);
		}

		void collectAllIntentsNoComplete(@NonNull RemoteViews inViews) {
		if (inViews.hasSizedRemoteViews()) {
		for (RemoteViews remoteViews : inViews.mSizedRemoteViews) {
		remoteViews.collectAllIntents();
		}
		} else if (inViews.hasLandscapeAndPortraitLayouts()) {
		inViews.mLandscape.collectAllIntents();
		inViews.mPortrait.collectAllIntents();
		} else if (inViews.mActions != null) {
		for (Action action : inViews.mActions) {
		if (action instanceof SetRemoteCollectionItemListAdapterAction rca) {
		// Deal with the case where the intent is replaced into the action list
		if (rca.mIntentId != -1 && !rca.mIsReplacedIntoAction) {
		continue;
		}

		if (rca.mIntentId != -1 && rca.mIsReplacedIntoAction) {
		String uri = mIdToUriMapping.get(rca.mIntentId);
		mTempUriToFutureMapping.put(uri, rca.mItemsFuture);
		rca.mItemsFuture = CompletableFuture.completedFuture(null);
		continue;
		}

		// Differentiate between the normal collection actions and the ones with
		// intents.
		if (rca.mServiceIntent != null) {
		String uri = rca.mServiceIntent.toUri(0);
		int index = mIdToUriMapping.indexOfValue(uri);
		if (index == -1) {
		int newIntentId = mIdToUriMapping.size();
		rca.mIntentId = newIntentId;
		mIdToUriMapping.put(newIntentId, uri);
		// mUriToIntentMapping.put(uri, mServiceIntent);
		mTempUriToFutureMapping.put(uri, rca.mItemsFuture);
		} else {
		rca.mIntentId = mIdToUriMapping.keyAt(index);
		}
		rca.mItemsFuture = CompletableFuture.completedFuture(null);
		} else {
		RemoteCollectionItems items = getCollectionItemsFromFuture(
		rca.mItemsFuture);
		for (RemoteViews views : items.mViews) {
		views.collectAllIntents();
		}
		}
		} else if (action instanceof ViewGroupActionAdd vgaa
		&& vgaa.mNestedViews != null) {
		vgaa.mNestedViews.collectAllIntents();
		}
		}
		}
		}

		public void writeToParcel(Parcel out, int flags) {
		out.writeInt(mIdToUriMapping.size());
		for (int i = 0; i < mIdToUriMapping.size(); i++) {
		out.writeInt(mIdToUriMapping.keyAt(i));
		String intentUri = mIdToUriMapping.valueAt(i);
		out.writeString8(intentUri);
		RemoteCollectionItems items = mTempUriToFutureMapping.get(intentUri) != null
		? getCollectionItemsFromFuture(mTempUriToFutureMapping.get(intentUri))
		: mUriToCollectionMapping.get(intentUri);
		items.writeToParcel(out, flags, true);
		}
		}
		}

		private class SetRemoteViewsAdapterIntent extends Action {
		Intent mIntent;
		boolean mIsAsync = false;
		@@ -3850,9 +4008,12 @@ public class RemoteViews implements Parcelable, Filter {
		private void initializeFrom(@NonNull RemoteViews src, @Nullable RemoteViews hierarchyRoot) {
		if (hierarchyRoot == null) {
		mBitmapCache = src.mBitmapCache;
		// We need to create a new instance because we don't reconstruct collection cache
		mCollectionCache = new RemoteCollectionCache(src.mCollectionCache);
		mApplicationInfoCache = src.mApplicationInfoCache;
		} else {
		mBitmapCache = hierarchyRoot.mBitmapCache;
		mCollectionCache = hierarchyRoot.mCollectionCache;
		mApplicationInfoCache = hierarchyRoot.mApplicationInfoCache;
		}
		if (hierarchyRoot == null \|\| src.mIsRoot) {
		@@ -3926,6 +4087,7 @@ public class RemoteViews implements Parcelable, Filter {
		mBitmapCache = new BitmapCache(parcel);
		// Store the class cookies such that they are available when we clone this RemoteView.
		mClassCookies = parcel.copyClassCookies();
		mCollectionCache = new RemoteCollectionCache(parcel);
		} else {
		configureAsChild(rootData);
		}
		@@ -4087,6 +4249,7 @@ public class RemoteViews implements Parcelable, Filter {
		private void configureAsChild(@NonNull HierarchyRootData rootData) {
		mIsRoot = false;
		mBitmapCache = rootData.mBitmapCache;
		mCollectionCache = rootData.mRemoteCollectionCache;
		mApplicationInfoCache = rootData.mApplicationInfoCache;
		mClassCookies = rootData.mClassCookies;
		configureDescendantsAsChildren();
		@@ -6357,6 +6520,7 @@ public class RemoteViews implements Parcelable, Filter {
		// is shared by all children.
		if (mIsRoot) {
		mBitmapCache.writeBitmapsToParcel(dest, flags);
		mCollectionCache.writeToParcel(dest, flags);
		}
		mApplication.writeToParcel(dest, flags);
		if (mIsRoot \|\| mIdealSize == null) {
		@@ -6373,6 +6537,7 @@ public class RemoteViews implements Parcelable, Filter {
		dest.writeInt(MODE_HAS_SIZED_REMOTEVIEWS);
		if (mIsRoot) {
		mBitmapCache.writeBitmapsToParcel(dest, flags);
		mCollectionCache.writeToParcel(dest, flags);
		}
		dest.writeInt(mSizedRemoteViews.size());
		for (RemoteViews view : mSizedRemoteViews) {
		@@ -6384,6 +6549,7 @@ public class RemoteViews implements Parcelable, Filter {
		// is shared by all children.
		if (mIsRoot) {
		mBitmapCache.writeBitmapsToParcel(dest, flags);
		mCollectionCache.writeToParcel(dest, flags);
		}
		mLandscape.writeToParcel(dest, flags);
		// Both RemoteViews already share the same package and user
		@@ -7262,19 +7428,23 @@ public class RemoteViews implements Parcelable, Filter {
		}

		private HierarchyRootData getHierarchyRootData() {
		return new HierarchyRootData(mBitmapCache, mApplicationInfoCache, mClassCookies);
		return new HierarchyRootData(mBitmapCache, mCollectionCache,
		mApplicationInfoCache, mClassCookies);
		}

		private static final class HierarchyRootData {
		final BitmapCache mBitmapCache;
		final RemoteCollectionCache mRemoteCollectionCache;
		final ApplicationInfoCache mApplicationInfoCache;
		final Map<Class, Object> mClassCookies;

		HierarchyRootData(
		BitmapCache bitmapCache,
		RemoteCollectionCache remoteCollectionCache,
		ApplicationInfoCache applicationInfoCache,
		Map<Class, Object> classCookies) {
		mBitmapCache = bitmapCache;
		mRemoteCollectionCache = remoteCollectionCache;
		mApplicationInfoCache = applicationInfoCache;
		mClassCookies = classCookies;
		}