Snap for 12235414 from 37262db58d267dc61b08f307a5605647670f47fe to 24Q4-release (4ccddcdb) · Commits · e / os / android_frameworks_base

Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -261,7 +261,6 @@ java_library {
		"devicepolicyprotosnano",
		"ImmutabilityAnnotation",

		"com.android.sysprop.init",
		"com.android.sysprop.localization",
		"PlatformProperties",
		],

core/api/current.txt

+24 −0

Original line number	Diff line number	Diff line
		@@ -8718,6 +8718,30 @@ package android.app.admin {

		}

		package android.app.appfunctions {

		@FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") public final class AppFunctionManager {
		}

		@FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") public final class ExecuteAppFunctionRequest implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public android.os.Bundle getExtras();
		method @NonNull public String getFunctionIdentifier();
		method @NonNull public android.app.appsearch.GenericDocument getParameters();
		method @NonNull public String getTargetPackageName();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.app.appfunctions.ExecuteAppFunctionRequest> CREATOR;
		}

		public static final class ExecuteAppFunctionRequest.Builder {
		ctor public ExecuteAppFunctionRequest.Builder(@NonNull String, @NonNull String);
		method @NonNull public android.app.appfunctions.ExecuteAppFunctionRequest build();
		method @NonNull public android.app.appfunctions.ExecuteAppFunctionRequest.Builder setExtras(@NonNull android.os.Bundle);
		method @NonNull public android.app.appfunctions.ExecuteAppFunctionRequest.Builder setParameters(@NonNull android.app.appsearch.GenericDocument);
		}

		}

		package android.app.assist {

		public class AssistContent implements android.os.Parcelable {

core/java/android/app/ActivityOptions.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -1587,6 +1587,16 @@ public class ActivityOptions extends ComponentOptions {
		}
		}

		/** @hide */
		public static boolean hasLaunchTargetContainer(ActivityOptions options) {
		return options.getLaunchDisplayId() != INVALID_DISPLAY
		\|\| options.getLaunchTaskDisplayArea() != null
		\|\| options.getLaunchTaskDisplayAreaFeatureId() != FEATURE_UNDEFINED
		\|\| options.getLaunchRootTask() != null
		\|\| options.getLaunchTaskId() != -1
		\|\| options.getLaunchTaskFragmentToken() != null;
		}

		/**
		* Gets whether the activity is to be launched into LockTask mode.
		* @return {@code true} if the activity is to be launched into LockTask mode.

core/java/android/app/ContextImpl.java

+25 −5

Original line number	Diff line number	Diff line
		@@ -1160,7 +1160,7 @@ class ContextImpl extends Context {
		}
		mMainThread.getInstrumentation().execStartActivity(
		getOuterContext(), mMainThread.getApplicationThread(), null,
		(Activity) null, intent, -1, options);
		(Activity) null, intent, -1, applyLaunchDisplayIfNeeded(options));
		}

		/** @hide */
		@@ -1170,8 +1170,8 @@ class ContextImpl extends Context {
		ActivityTaskManager.getService().startActivityAsUser(
		mMainThread.getApplicationThread(), getOpPackageName(), getAttributionTag(),
		intent, intent.resolveTypeIfNeeded(getContentResolver()),
		null, null, 0, Intent.FLAG_ACTIVITY_NEW_TASK, null, options,
		user.getIdentifier());
		null, null, 0, Intent.FLAG_ACTIVITY_NEW_TASK, null,
		applyLaunchDisplayIfNeeded(options), user.getIdentifier());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -1194,7 +1194,8 @@ class ContextImpl extends Context {
		}
		return mMainThread.getInstrumentation().execStartActivitiesAsUser(
		getOuterContext(), mMainThread.getApplicationThread(), null,
		(Activity) null, intents, options, userHandle.getIdentifier());
		(Activity) null, intents, applyLaunchDisplayIfNeeded(options),
		userHandle.getIdentifier());
		}

		@Override
		@@ -1208,7 +1209,26 @@ class ContextImpl extends Context {
		}
		mMainThread.getInstrumentation().execStartActivities(
		getOuterContext(), mMainThread.getApplicationThread(), null,
		(Activity) null, intents, options);
		(Activity) null, intents, applyLaunchDisplayIfNeeded(options));
		}

		private Bundle applyLaunchDisplayIfNeeded(@Nullable Bundle options) {
		if (!isAssociatedWithDisplay()) {
		// return if this Context has no associated display.
		return options;
		}

		final ActivityOptions activityOptions;
		if (options != null) {
		activityOptions = ActivityOptions.fromBundle(options);
		if (ActivityOptions.hasLaunchTargetContainer(activityOptions)) {
		// return if the options already has launching target.
		return options;
		}
		} else {
		activityOptions = ActivityOptions.makeBasic();
		}
		return activityOptions.setLaunchDisplayId(getAssociatedDisplayId()).toBundle();
		}

		@Override

core/java/android/app/appfunctions/AppFunctionManager.java

+4 −1

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

		package android.app.appfunctions;

		import static android.app.appfunctions.flags.Flags.FLAG_ENABLE_APP_FUNCTION_MANAGER;

		import android.annotation.FlaggedApi;
		import android.annotation.SystemService;
		import android.content.Context;

		@@ -25,8 +28,8 @@ import android.content.Context;
		* <p>App function is a specific piece of functionality that an app offers to the system. These
		* functionalities can be integrated into various system features.
		*
		* @hide
		*/
		@FlaggedApi(FLAG_ENABLE_APP_FUNCTION_MANAGER)
		@SystemService(Context.APP_FUNCTION_SERVICE)
		public final class AppFunctionManager {
		private final IAppFunctionManager mService;