Merge "Fix some Java doc errors" into rvc-dev am: 0cfca4a3c4 am: 2173365c0e am: fdcc629715 (c07b61ed) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityManager.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -73,8 +73,8 @@ import android.util.ArrayMap;
		import android.util.DisplayMetrics;
		import android.util.Singleton;
		import android.util.Size;
		import android.window.WindowContainerToken;
		import android.view.Surface;
		import android.window.WindowContainerToken;

		import com.android.internal.app.LocalePicker;
		import com.android.internal.app.procstats.ProcessStats;
		@@ -3632,7 +3632,8 @@ public class ActivityManager {
		* Set custom state data for this process. It will be included in the record of
		* {@link ApplicationExitInfo} on the death of the current calling process; the new process
		* of the app can retrieve this state data by calling
		* {@link ApplicationExitInfo#getProcessStateSummary} on the record returned by
		* {@link android.app.ApplicationExitInfo#getProcessStateSummary()
		* ApplicationExitInfo.getProcessStateSummary()} on the record returned by
		* {@link #getHistoricalProcessExitReasons}.
		*
		* <p> This would be useful for the calling app to save its stateful data: if it's
		@@ -3657,7 +3658,7 @@ public class ActivityManager {
		}
		}

		/*
		/**
		* @return Whether or not the low memory kill will be reported in
		* {@link #getHistoricalProcessExitReasons}.
		*

core/java/android/app/ApplicationExitInfo.java

+8 −6

Original line number	Diff line number	Diff line
		@@ -90,7 +90,8 @@ public final class ApplicationExitInfo implements Parcelable {
		* {@link #REASON_SIGNALED} and {@link #getStatus} will return
		* the value {@link android.system.OsConstants#SIGKILL}.
		*
		* Application should use {@link ActivityManager#isLowMemoryKillReportSupported} to check
		* Application should use {@link android.app.ActivityManager#isLowMemoryKillReportSupported()
		* ActivityManager.isLowMemoryKillReportSupported()} to check
		* if the device supports reporting {@link #REASON_LOW_MEMORY} or not.
		* </p>
		*/
		@@ -523,7 +524,7 @@ public final class ApplicationExitInfo implements Parcelable {
		return mReason;
		}

		/*
		/**
		* The exit status argument of exit() if the application calls it, or the signal
		* number if the application is signaled.
		*/
		@@ -538,7 +539,7 @@ public final class ApplicationExitInfo implements Parcelable {
		return mImportance;
		}

		/*
		/**
		* Last proportional set size of the memory that the process had used in kB.
		*
		* <p class="note">Note: This is the value from last sampling on the process,
		@@ -562,7 +563,7 @@ public final class ApplicationExitInfo implements Parcelable {

		/**
		* The timestamp of the process's death, in milliseconds since the epoch,
		* as returned by {@link System#currentTimeMillis System.currentTimeMillis()}.
		* as returned by {@link java.lang.System#currentTimeMillis() System.currentTimeMillis()}.
		*/
		public @CurrentTimeMillisLong long getTimestamp() {
		return mTimestamp;
		@@ -586,8 +587,9 @@ public final class ApplicationExitInfo implements Parcelable {
		}

		/**
		* Return the state data set by calling {@link ActivityManager#setProcessStateSummary}
		* from the process before its death.
		* Return the state data set by calling
		* {@link android.app.ActivityManager#setProcessStateSummary(byte[])
		* ActivityManager.setProcessStateSummary(byte[])} from the process before its death.
		*
		* @return The process-customized data
		* @see ActivityManager#setProcessStateSummary(byte[])