Snap for 7940976 from 35185d54b4352ac30d587ee42b360d9c46136d10 to sc-v2-release (ee8ca63d) · Commits · e / os / android_frameworks_base

core/api/test-current.txt

+1 −7

Original line number	Diff line number	Diff line
		@@ -3204,12 +3204,6 @@ package android.window {
		field @NonNull public static final android.os.Parcelable.Creator<android.window.TaskAppearedInfo> CREATOR;
		}

		public final class TaskFragmentAppearedInfo implements android.os.Parcelable {
		method @NonNull public android.view.SurfaceControl getLeash();
		method @NonNull public android.window.TaskFragmentInfo getTaskFragmentInfo();
		field @NonNull public static final android.os.Parcelable.Creator<android.window.TaskFragmentAppearedInfo> CREATOR;
		}

		public final class TaskFragmentCreationParams implements android.os.Parcelable {
		method @NonNull public android.os.IBinder getFragmentToken();
		method @NonNull public android.graphics.Rect getInitialBounds();
		@@ -3246,7 +3240,7 @@ package android.window {
		ctor public TaskFragmentOrganizer(@NonNull java.util.concurrent.Executor);
		method @NonNull public java.util.concurrent.Executor getExecutor();
		method @NonNull public android.window.TaskFragmentOrganizerToken getOrganizerToken();
		method public void onTaskFragmentAppeared(@NonNull android.window.TaskFragmentAppearedInfo);
		method public void onTaskFragmentAppeared(@NonNull android.window.TaskFragmentInfo);
		method public void onTaskFragmentError(@NonNull android.os.IBinder, @NonNull Throwable);
		method public void onTaskFragmentInfoChanged(@NonNull android.window.TaskFragmentInfo);
		method public void onTaskFragmentParentInfoChanged(@NonNull android.os.IBinder, @NonNull android.content.res.Configuration);

+28 −0

Original line number	Diff line number	Diff line
		@@ -4075,6 +4075,34 @@ public class ActivityManager {
		return switchUser(user.getIdentifier());
		}

		/**
		* Gets the message that is shown when a user is switched from.
		*
		* @hide
		*/
		@RequiresPermission(Manifest.permission.MANAGE_USERS)
		public @Nullable String getSwitchingFromUserMessage() {
		try {
		return getService().getSwitchingFromUserMessage();
		} catch (RemoteException re) {
		throw re.rethrowFromSystemServer();
		}
		}

		/**
		* Gets the message that is shown when a user is switched to.
		*
		* @hide
		*/
		@RequiresPermission(Manifest.permission.MANAGE_USERS)
		public @Nullable String getSwitchingToUserMessage() {
		try {
		return getService().getSwitchingToUserMessage();
		} catch (RemoteException re) {
		throw re.rethrowFromSystemServer();
		}
		}

		/**
		* Uses the value defined by the platform.
		*

+2 −0

Original line number	Diff line number	Diff line
		@@ -338,6 +338,8 @@ interface IActivityManager {
		void setPackageScreenCompatMode(in String packageName, int mode);
		@UnsupportedAppUsage
		boolean switchUser(int userid);
		String getSwitchingFromUserMessage();
		String getSwitchingToUserMessage();
		@UnsupportedAppUsage
		void setStopUserOnSwitch(int value);
		boolean removeTask(int taskId);

+1 −2

Original line number	Diff line number	Diff line
		@@ -19,12 +19,11 @@ package android.window;
		import android.content.res.Configuration;
		import android.os.Bundle;
		import android.os.IBinder;
		import android.window.TaskFragmentAppearedInfo;
		import android.window.TaskFragmentInfo;

		/** @hide */
		oneway interface ITaskFragmentOrganizer {
		void onTaskFragmentAppeared(in TaskFragmentAppearedInfo taskFragmentAppearedInfo);
		void onTaskFragmentAppeared(in TaskFragmentInfo taskFragmentInfo);
		void onTaskFragmentInfoChanged(in TaskFragmentInfo taskFragmentInfo);
		void onTaskFragmentVanished(in TaskFragmentInfo taskFragmentInfo);

deleted100644 → 0

+0 −23

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.window;

		/**
		* Data object for the TaskFragment info provided when a TaskFragment is presented to an organizer.
		* @hide
		*/
		parcelable TaskFragmentAppearedInfo;