Merge "Hide AppStartInfo API" (424a14ee) · Commits · e / os / android_frameworks_base

core/api/current.txt

+0 −53

Original line number	Diff line number	Diff line
		@@ -4619,7 +4619,6 @@ package android.app {
		method public java.util.List<android.app.ActivityManager.AppTask> getAppTasks();
		method public android.content.pm.ConfigurationInfo getDeviceConfigurationInfo();
		method @NonNull public java.util.List<android.app.ApplicationExitInfo> getHistoricalProcessExitReasons(@Nullable String, @IntRange(from=0) int, @IntRange(from=0) int);
		method @NonNull public java.util.List<android.app.ApplicationStartInfo> getHistoricalProcessStartReasons(@IntRange(from=0) int);
		method public int getLargeMemoryClass();
		method public int getLauncherLargeIconDensity();
		method public int getLauncherLargeIconSize();
		@@ -4645,9 +4644,7 @@ package android.app {
		method @RequiresPermission(android.Manifest.permission.KILL_BACKGROUND_PROCESSES) public void killBackgroundProcesses(String);
		method @RequiresPermission(android.Manifest.permission.REORDER_TASKS) public void moveTaskToFront(int, int);
		method @RequiresPermission(android.Manifest.permission.REORDER_TASKS) public void moveTaskToFront(int, int, android.os.Bundle);
		method public void removeApplicationStartInfoCompleteListener();
		method @Deprecated public void restartPackage(String);
		method public void setApplicationStartInfoCompleteListener(@NonNull java.util.concurrent.Executor, @NonNull android.app.ActivityManager.ApplicationStartInfoCompleteListener);
		method public void setProcessStateSummary(@Nullable byte[]);
		method public static void setVrThread(int);
		method public void setWatchHeapLimit(long);
		@@ -4670,10 +4667,6 @@ package android.app {
		method public void startActivity(android.content.Context, android.content.Intent, android.os.Bundle);
		}

		public static interface ActivityManager.ApplicationStartInfoCompleteListener {
		method public void onApplicationStartInfoComplete(@NonNull android.app.ApplicationStartInfo);
		}

		public static class ActivityManager.MemoryInfo implements android.os.Parcelable {
		ctor public ActivityManager.MemoryInfo();
		method public int describeContents();
		@@ -5233,52 +5226,6 @@ package android.app {
		field public static final int REASON_USER_STOPPED = 11; // 0xb
		}

		public final class ApplicationStartInfo implements android.os.Parcelable {
		method public int describeContents();
		method public int getDefiningUid();
		method @Nullable public android.content.Intent getIntent();
		method public int getLaunchMode();
		method public int getPackageUid();
		method public int getPid();
		method @NonNull public String getProcessName();
		method public int getRealUid();
		method public int getReason();
		method public int getStartType();
		method public int getStartupState();
		method @NonNull public java.util.Map<java.lang.Integer,java.lang.Long> getStartupTimestamps();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.app.ApplicationStartInfo> CREATOR;
		field public static final int LAUNCH_MODE_SINGLE_INSTANCE = 2; // 0x2
		field public static final int LAUNCH_MODE_SINGLE_INSTANCE_PER_TASK = 4; // 0x4
		field public static final int LAUNCH_MODE_SINGLE_TASK = 3; // 0x3
		field public static final int LAUNCH_MODE_SINGLE_TOP = 1; // 0x1
		field public static final int LAUNCH_MODE_STANDARD = 0; // 0x0
		field public static final int STARTUP_STATE_ERROR = 1; // 0x1
		field public static final int STARTUP_STATE_FIRST_FRAME_DRAWN = 2; // 0x2
		field public static final int STARTUP_STATE_STARTED = 0; // 0x0
		field public static final int START_REASON_ALARM = 0; // 0x0
		field public static final int START_REASON_BACKUP = 1; // 0x1
		field public static final int START_REASON_BOOT_COMPLETE = 2; // 0x2
		field public static final int START_REASON_BROADCAST = 3; // 0x3
		field public static final int START_REASON_CONTENT_PROVIDER = 4; // 0x4
		field public static final int START_REASON_JOB = 5; // 0x5
		field public static final int START_REASON_LAUNCHER = 6; // 0x6
		field public static final int START_REASON_OTHER = 7; // 0x7
		field public static final int START_REASON_PUSH = 8; // 0x8
		field public static final int START_REASON_RESUMED_ACTIVITY = 9; // 0x9
		field public static final int START_REASON_SERVICE = 10; // 0xa
		field public static final int START_REASON_START_ACTIVITY = 11; // 0xb
		field public static final int START_TIMESTAMP_APPLICATION_ONCREATE = 2; // 0x2
		field public static final int START_TIMESTAMP_BIND_APPLICATION = 3; // 0x3
		field public static final int START_TIMESTAMP_FIRST_FRAME = 4; // 0x4
		field public static final int START_TIMESTAMP_FULLY_DRAWN = 5; // 0x5
		field public static final int START_TIMESTAMP_JAVA_CLASSLOADING_COMPLETE = 1; // 0x1
		field public static final int START_TIMESTAMP_LAUNCH = 0; // 0x0
		field public static final int START_TYPE_COLD = 0; // 0x0
		field public static final int START_TYPE_HOT = 2; // 0x2
		field public static final int START_TYPE_WARM = 1; // 0x1
		}

		public final class AsyncNotedAppOp implements android.os.Parcelable {
		method public int describeContents();
		method @Nullable public String getAttributionTag();

core/api/system-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -526,7 +526,6 @@ package android.app {
		method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public void addOnUidImportanceListener(android.app.ActivityManager.OnUidImportanceListener, int);
		method @RequiresPermission(android.Manifest.permission.FORCE_STOP_PACKAGES) public void forceStopPackage(String);
		method @RequiresPermission(anyOf={"android.permission.INTERACT_ACROSS_USERS", "android.permission.INTERACT_ACROSS_USERS_FULL"}) public static int getCurrentUser();
		method @NonNull @RequiresPermission(android.Manifest.permission.DUMP) public java.util.List<android.app.ApplicationStartInfo> getExternalHistoricalProcessStartReasons(@NonNull String, @IntRange(from=0) int);
		method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public int getPackageImportance(String);
		method @NonNull public java.util.Collection<java.util.Locale> getSupportedLocales();
		method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public int getUidImportance(int);

core/java/android/app/ActivityManager.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -3688,6 +3688,8 @@ public class ActivityManager {
		*
		* @return a list of {@link ApplicationStartInfo} records matching the criteria, sorted in
		* the order from most recent to least recent.
		*
		* @hide
		*/
		@NonNull
		public List<ApplicationStartInfo> getHistoricalProcessStartReasons(
		@@ -3719,7 +3721,6 @@ public class ActivityManager {
		* @hide
		*/
		@NonNull
		@SystemApi
		@RequiresPermission(Manifest.permission.DUMP)
		public List<ApplicationStartInfo> getExternalHistoricalProcessStartReasons(
		@NonNull String packageName, @IntRange(from = 0) int maxNum) {
		@@ -3736,6 +3737,8 @@ public class ActivityManager {
		* Callback to receive {@link ApplicationStartInfo} object once recording of startup related
		* metrics is complete.
		* Use with {@link #setApplicationStartInfoCompleteListener}.
		*
		* @hide
		*/
		public interface ApplicationStartInfoCompleteListener {
		/** {@link ApplicationStartInfo} is complete, no more info will be added. */
		@@ -3761,6 +3764,8 @@ public class ActivityManager {
		* complete. Will replace existing listener if one is already attached.
		*
		* @throws IllegalArgumentException if executor or listener are null.
		*
		* @hide
		*/
		public void setApplicationStartInfoCompleteListener(@NonNull final Executor executor,
		@NonNull final ApplicationStartInfoCompleteListener listener) {
		@@ -3783,6 +3788,8 @@ public class ActivityManager {

		/**
		* Removes the callback set by {@link #setApplicationStartInfoCompleteListener} if there is one.
		*
		* @hide
		*/
		public void removeApplicationStartInfoCompleteListener() {
		try {

core/java/android/app/ApplicationStartInfo.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,11 @@ import java.lang.annotation.Target;
		import java.util.HashMap;
		import java.util.Map;

		/** Provide information related to a processes startup. */
		/**
		* Provide information related to a processes startup.
		*
		* @hide
		*/
		public final class ApplicationStartInfo implements Parcelable {

		/**

services/core/java/com/android/server/am/ActivityManagerService.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -9507,6 +9507,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		return retList;
		}

		/* @hide */
		@Override
		public ParceledListSlice<ApplicationStartInfo> getHistoricalProcessStartReasons(
		String packageName, int maxNum, int userId) {
		@@ -9521,6 +9522,8 @@ public class ActivityManagerService extends IActivityManager.Stub
		return new ParceledListSlice<ApplicationStartInfo>(results);
		}


		/* @hide */
		@Override
		public void setApplicationStartInfoCompleteListener(
		IApplicationStartInfoCompleteListener listener, int userId) {
		@@ -9530,6 +9533,8 @@ public class ActivityManagerService extends IActivityManager.Stub
		enforceNotIsolatedCaller("setApplicationStartInfoCompleteListener");
		}


		/* @hide */
		@Override
		public void removeApplicationStartInfoCompleteListener(int userId) {
		if (!mConstants.mFlagApplicationStartInfoEnabled) {