Merge "Remove released flag notify_single_item_change_on_icon_load" into main (e1c0e11b) · Commits · e / os / android_frameworks_base

core/java/android/service/chooser/flags.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -33,16 +33,6 @@ flag {
		bug: "263474465"
		}

		flag {
		name: "notify_single_item_change_on_icon_load"
		namespace: "intentresolver"
		description: "ChooserGridAdapter to notify specific items change when the target icon is loaded (instead of all-item change)."
		bug: "298193161"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "fix_resolver_memory_leak"
		is_exported: true

core/java/com/android/internal/app/ChooserActivity.java

+4 −13

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_CANT
		import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_CROSS_PROFILE_BLOCKED_TITLE;
		import static android.content.ContentProvider.getUriWithoutUserId;
		import static android.content.ContentProvider.getUserIdFromUri;
		import static android.service.chooser.Flags.notifySingleItemChangeOnIconLoad;
		import static android.stats.devicepolicy.DevicePolicyEnums.RESOLVER_EMPTY_STATE_NO_SHARING_TO_PERSONAL;
		import static android.stats.devicepolicy.DevicePolicyEnums.RESOLVER_EMPTY_STATE_NO_SHARING_TO_WORK;

		@@ -3222,10 +3221,8 @@ public class ChooserActivity extends ResolverActivity implements
		notifyDataSetChanged();
		}
		});
		if (notifySingleItemChangeOnIconLoad()) {
		wrappedAdapter.setOnIconLoadedListener(this::onTargetIconLoaded);
		}
		}

		private void onTargetIconLoaded(DisplayResolveInfo info) {
		for (ViewHolderBase holder : mBoundViewHolders) {
		@@ -3397,9 +3394,7 @@ public class ChooserActivity extends ResolverActivity implements

		@Override
		public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
		if (notifySingleItemChangeOnIconLoad()) {
		mBoundViewHolders.add((ViewHolderBase) holder);
		}
		int viewType = ((ViewHolderBase) holder).getViewType();
		switch (viewType) {
		case VIEW_TYPE_DIRECT_SHARE:
		@@ -3415,17 +3410,13 @@ public class ChooserActivity extends ResolverActivity implements

		@Override
		public void onViewRecycled(RecyclerView.ViewHolder holder) {
		if (notifySingleItemChangeOnIconLoad()) {
		mBoundViewHolders.remove((ViewHolderBase) holder);
		}
		super.onViewRecycled(holder);
		}

		@Override
		public boolean onFailedToRecycleView(RecyclerView.ViewHolder holder) {
		if (notifySingleItemChangeOnIconLoad()) {
		mBoundViewHolders.remove((ViewHolderBase) holder);
		}
		return super.onFailedToRecycleView(holder);
		}

core/java/com/android/internal/app/ChooserListAdapter.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -16,8 +16,6 @@

		package com.android.internal.app;

		import static android.service.chooser.Flags.notifySingleItemChangeOnIconLoad;

		import static com.android.internal.app.ChooserActivity.TARGET_TYPE_SHORTCUTS_FROM_PREDICTION_SERVICE;
		import static com.android.internal.app.ChooserActivity.TARGET_TYPE_SHORTCUTS_FROM_SHORTCUT_MANAGER;

		@@ -326,7 +324,7 @@ public class ChooserListAdapter extends ResolverListAdapter {

		@Override
		protected void onIconLoaded(DisplayResolveInfo info) {
		if (notifySingleItemChangeOnIconLoad() && mOnIconLoadedListener != null) {
		if (mOnIconLoadedListener != null) {
		mOnIconLoadedListener.accept(info);
		} else {
		notifyDataSetChanged();