Merge cherrypicks of ['googleplex-android-review.googlesource.com/27941201',... (dba9f96a) · Commits · e / os / android_frameworks_base

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

+11 −0

Original line number	Diff line number	Diff line
		@@ -32,3 +32,14 @@ flag {
		description: "Provides additional callbacks with information about user actions in ChooserResult"
		bug: "263474465"
		}

		flag {
		name: "fix_resolver_memory_leak"
		is_exported: true
		namespace: "intentresolver"
		description: "ResolverActivity memory leak (through the AppPredictor callback) fix"
		bug: "346671041"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

+13 −3

Original line number	Diff line number	Diff line
		@@ -1209,9 +1209,19 @@ public class ResolverActivity extends Activity implements
		if (!isChangingConfigurations() && mPickOptionRequest != null) {
		mPickOptionRequest.cancel();
		}
		if (mMultiProfilePagerAdapter != null
		&& mMultiProfilePagerAdapter.getActiveListAdapter() != null) {
		mMultiProfilePagerAdapter.getActiveListAdapter().onDestroy();
		if (mMultiProfilePagerAdapter != null) {
		ResolverListAdapter activeAdapter =
		mMultiProfilePagerAdapter.getActiveListAdapter();
		if (activeAdapter != null) {
		activeAdapter.onDestroy();
		}
		if (android.service.chooser.Flags.fixResolverMemoryLeak()) {
		ResolverListAdapter inactiveAdapter =
		mMultiProfilePagerAdapter.getInactiveListAdapter();
		if (inactiveAdapter != null) {
		inactiveAdapter.onDestroy();
		}
		}
		}
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -161,5 +161,6 @@ constructor(
		TASK_FRAGMENT_TRANSIT_CLOSE,
		false
		)
		organizer.unregisterOrganizer()
		}
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -792,10 +792,11 @@ public class TarBackupReader {
		}

		private String getVToUAllowlist(Context context, int userId) {
		return Settings.Secure.getStringForUser(
		String allowlist = Settings.Secure.getStringForUser(
		context.getContentResolver(),
		Settings.Secure.V_TO_U_RESTORE_ALLOWLIST,
		userId);
		return (allowlist == null) ? "" : allowlist;
		}

		private static long extractRadix(byte[] data, int offset, int maxChars, int radix)

+110 −105

File changed.

Preview size limit exceeded, changes collapsed.