Snap for 13362916 from 24879150daeeaa8b755c01f425fc0f43a2f8ab7c to 25Q3-release (f7440f5b) · Commits · e / os / android_frameworks_base

core/java/android/app/IActivityTaskManager.aidl

+0 −5

Original line number	Diff line number	Diff line
		@@ -368,11 +368,6 @@ interface IActivityTaskManager {
		android.window.BackNavigationInfo startBackNavigation(
		in RemoteCallback navigationObserver, in BackAnimationAdapter adaptor);

		/**
		* Registers a callback to be invoked when the system server requests a back gesture.
		*/
		void registerBackGestureDelegate(in RemoteCallback monitor);

		/**
		* registers a callback to be invoked when a background activity launch is aborted.
		*

core/java/android/app/LoadedApk.java

+17 −13

Original line number	Diff line number	Diff line
		@@ -969,6 +969,15 @@ public final class LoadedApk {
		}
		}

		List<String> nativeSharedLibraries = new ArrayList<>();
		if (mApplicationInfo.sharedLibraryInfos != null) {
		for (SharedLibraryInfo info : mApplicationInfo.sharedLibraryInfos) {
		if (info.isNative()) {
		nativeSharedLibraries.add(info.getName());
		}
		}
		}

		// If we're not asked to include code, we construct a classloader that has
		// no code path included. We still need to set up the library search paths
		// and permitted path because NativeActivity relies on it (it attempts to
		@@ -977,10 +986,14 @@ public final class LoadedApk {
		if (!mIncludeCode) {
		if (mDefaultClassLoader == null) {
		StrictMode.ThreadPolicy oldPolicy = allowThreadDiskReads();
		mDefaultClassLoader = ApplicationLoaders.getDefault().getClassLoader(
		mDefaultClassLoader = ApplicationLoaders.getDefault()
		.getClassLoaderWithSharedLibraries(
		"" /* codePath */, mApplicationInfo.targetSdkVersion, isBundledApp,
		librarySearchPath, libraryPermittedPath, mBaseClassLoader,
		null /* classLoaderName */);
		null /* classLoaderName */,
		null /* sharedLibraries */,
		nativeSharedLibraries,
		null /* sharedLibrariesLoadedAfterApp */);
		setThreadPolicy(oldPolicy);
		mAppComponentFactory = AppComponentFactory.DEFAULT;
		}
		@@ -1030,15 +1043,6 @@ public final class LoadedApk {
		createSharedLibrariesLoaders(mApplicationInfo.sharedLibraryInfos, isBundledApp,
		librarySearchPath, libraryPermittedPath);

		List<String> nativeSharedLibraries = new ArrayList<>();
		if (mApplicationInfo.sharedLibraryInfos != null) {
		for (SharedLibraryInfo info : mApplicationInfo.sharedLibraryInfos) {
		if (info.isNative()) {
		nativeSharedLibraries.add(info.getName());
		}
		}
		}

		mDefaultClassLoader = ApplicationLoaders.getDefault().getClassLoaderWithSharedLibraries(
		zip, mApplicationInfo.targetSdkVersion, isBundledApp, librarySearchPath,
		libraryPermittedPath, mBaseClassLoader,

core/java/android/app/notification.aconfig

+0 −28

Original line number	Diff line number	Diff line
		@@ -115,13 +115,6 @@ flag {
		bug: "299448097"
		}

		flag {
		name: "check_autogroup_before_post"
		namespace: "systemui"
		description: "Does a check to see if notification should be autogrouped before posting, and if so groups before post."
		bug: "330214226"
		}

		flag {
		name: "notification_expansion_optional"
		namespace: "systemui"
		@@ -199,27 +192,6 @@ flag {
		bug: "330193582"
		}

		flag {
		name: "restrict_audio_attributes_call"
		namespace: "systemui"
		description: "Only CallStyle notifs can use USAGE_NOTIFICATION_RINGTONE"
		bug: "331793339"
		}

		flag {
		name: "restrict_audio_attributes_alarm"
		namespace: "systemui"
		description: "Only alarm category notifs can use USAGE_ALARM"
		bug: "331793339"
		}

		flag {
		name: "restrict_audio_attributes_media"
		namespace: "systemui"
		description: "No notifs can use USAGE_UNKNOWN or USAGE_MEDIA"
		bug: "331793339"
		}

		flag {
		name: "clean_up_spans_and_new_lines"
		namespace: "systemui"

core/java/android/content/pm/LauncherActivityInfo.java

+6 −7

Original line number	Diff line number	Diff line
		@@ -85,16 +85,15 @@ public class LauncherActivityInfo {
		}

		/**
		* Retrieves the label for the activity.
		* Retrieves the label for the activity. If the activity's label is invisible
		* for the user, use the application's label instead. If the application's label
		* is still invisible for the user, use the package name instead.
		*
		* @return The label for the activity.
		* @return The label for the activity. If the activity's label is invisible for the user,
		* return the application's label instead. If the application's label
		* is still invisible for the user, return the package name instead.
		*/
		public CharSequence getLabel() {
		if (!Flags.lightweightInvisibleLabelDetection()) {
		// TODO: Go through LauncherAppsService
		return getActivityInfo().loadLabel(mPm);
		}

		CharSequence label = getActivityInfo().loadLabel(mPm).toString().trim();
		// If the activity label is visible to the user, return the original activity label
		if (isVisible(label)) {

core/java/android/content/pm/flags.aconfig

+0 −22

Original line number	Diff line number	Diff line
		@@ -82,13 +82,6 @@ flag {
		bug: "269728874"
		}

		flag {
		name: "lightweight_invisible_label_detection"
		namespace: "package_manager_service"
		description: "Feature flag to detect the invisible labels in Launcher Apps"
		bug: "299586370"
		}

		flag {
		name: "read_install_info"
		is_exported: true
		@@ -165,13 +158,6 @@ flag {
		bug: "317788011"
		}

		flag {
		name: "encode_app_intent"
		namespace: "package_manager_service"
		description: "Feature flag to encode app intent."
		bug: "281848623"
		}

		flag {
		name: "recoverability_detection"
		is_exported: true
		@@ -205,14 +191,6 @@ flag {
		is_fixed_read_only: true
		}

		flag {
		name: "force_multi_arch_native_libs_match"
		namespace: "package_manager_service"
		description: "Feature flag to force an multiArch app's native libraries to match with the natively supported ABIs of the device"
		bug: "282783453"
		is_fixed_read_only: true
		}

		flag {
		name: "set_pre_verified_domains"
		is_exported: true