Merge "Add nullability annotations to state save/restoration" (1433f50d) · Commits · e / os / android_frameworks_base

core/java/android/app/Activity.java

+18 −12

Original line number	Diff line number	Diff line
		@@ -1086,7 +1086,7 @@ public class Activity extends ContextThemeWrapper
		*
		* @param savedInstanceState contains the saved state
		*/
		final void performRestoreInstanceState(Bundle savedInstanceState) {
		final void performRestoreInstanceState(@NonNull Bundle savedInstanceState) {
		onRestoreInstanceState(savedInstanceState);
		restoreManagedDialogs(savedInstanceState);
		}
		@@ -1100,8 +1100,8 @@ public class Activity extends ContextThemeWrapper
		* @param savedInstanceState contains the saved state
		* @param persistentState contains the persistable saved state
		*/
		final void performRestoreInstanceState(Bundle savedInstanceState,
		PersistableBundle persistentState) {
		final void performRestoreInstanceState(@Nullable Bundle savedInstanceState,
		@Nullable PersistableBundle persistentState) {
		onRestoreInstanceState(savedInstanceState, persistentState);
		if (savedInstanceState != null) {
		restoreManagedDialogs(savedInstanceState);
		@@ -1128,7 +1128,7 @@ public class Activity extends ContextThemeWrapper
		* @see #onResume
		* @see #onSaveInstanceState
		*/
		protected void onRestoreInstanceState(Bundle savedInstanceState) {
		protected void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
		if (mWindow != null) {
		Bundle windowState = savedInstanceState.getBundle(WINDOW_HIERARCHY_TAG);
		if (windowState != null) {
		@@ -1149,8 +1149,12 @@ public class Activity extends ContextThemeWrapper
		*
		* <p>If this method is called {@link #onRestoreInstanceState(Bundle)} will not be called.
		*
		* @param savedInstanceState the data most recently supplied in {@link #onSaveInstanceState}.
		* @param persistentState the data most recently supplied in {@link #onSaveInstanceState}.
		* <p>At least one of {@code savedInstanceState} or {@code persistentState} will not be null.
		*
		* @param savedInstanceState the data most recently supplied in {@link #onSaveInstanceState}
		* or null.
		* @param persistentState the data most recently supplied in {@link #onSaveInstanceState}
		* or null.
		*
		* @see #onRestoreInstanceState(Bundle)
		* @see #onCreate
		@@ -1158,8 +1162,8 @@ public class Activity extends ContextThemeWrapper
		* @see #onResume
		* @see #onSaveInstanceState
		*/
		public void onRestoreInstanceState(Bundle savedInstanceState,
		PersistableBundle persistentState) {
		public void onRestoreInstanceState(@Nullable Bundle savedInstanceState,
		@Nullable PersistableBundle persistentState) {
		if (savedInstanceState != null) {
		onRestoreInstanceState(savedInstanceState);
		}
		@@ -1545,7 +1549,7 @@ public class Activity extends ContextThemeWrapper
		*
		* @param outState The bundle to save the state to.
		*/
		final void performSaveInstanceState(Bundle outState) {
		final void performSaveInstanceState(@NonNull Bundle outState) {
		onSaveInstanceState(outState);
		saveManagedDialogs(outState);
		mActivityTransitionState.saveState(outState);
		@@ -1562,7 +1566,8 @@ public class Activity extends ContextThemeWrapper
		* @param outState The bundle to save the state to.
		* @param outPersistentState The bundle to save persistent state to.
		*/
		final void performSaveInstanceState(Bundle outState, PersistableBundle outPersistentState) {
		final void performSaveInstanceState(@NonNull Bundle outState,
		@NonNull PersistableBundle outPersistentState) {
		onSaveInstanceState(outState, outPersistentState);
		saveManagedDialogs(outState);
		storeHasCurrentPermissionRequest(outState);
		@@ -1618,7 +1623,7 @@ public class Activity extends ContextThemeWrapper
		* @see #onRestoreInstanceState
		* @see #onPause
		*/
		protected void onSaveInstanceState(Bundle outState) {
		protected void onSaveInstanceState(@NonNull Bundle outState) {
		outState.putBundle(WINDOW_HIERARCHY_TAG, mWindow.saveHierarchyState());

		outState.putInt(LAST_AUTOFILL_ID, mLastAutofillId);
		@@ -1648,7 +1653,8 @@ public class Activity extends ContextThemeWrapper
		* @see #onRestoreInstanceState(Bundle, PersistableBundle)
		* @see #onPause
		*/
		public void onSaveInstanceState(Bundle outState, PersistableBundle outPersistentState) {
		public void onSaveInstanceState(@NonNull Bundle outState,
		@NonNull PersistableBundle outPersistentState) {
		onSaveInstanceState(outState);
		}

core/java/android/app/Instrumentation.java

+20 −14

Original line number	Diff line number	Diff line
		@@ -1313,7 +1313,8 @@ public class Instrumentation {
		* @param activity The activity being restored.
		* @param savedInstanceState The previously saved state being restored.
		*/
		public void callActivityOnRestoreInstanceState(Activity activity, Bundle savedInstanceState) {
		public void callActivityOnRestoreInstanceState(@NonNull Activity activity,
		@NonNull Bundle savedInstanceState) {
		activity.performRestoreInstanceState(savedInstanceState);
		}

		@@ -1322,11 +1323,12 @@ public class Instrumentation {
		* method. The default implementation simply calls through to that method.
		*
		* @param activity The activity being restored.
		* @param savedInstanceState The previously saved state being restored.
		* @param savedInstanceState The previously saved state being restored (or null).
		* @param persistentState The previously persisted state (or null)
		*/
		public void callActivityOnRestoreInstanceState(Activity activity, Bundle savedInstanceState,
		PersistableBundle persistentState) {
		public void callActivityOnRestoreInstanceState(@NonNull Activity activity,
		@Nullable Bundle savedInstanceState,
		@Nullable PersistableBundle persistentState) {
		activity.performRestoreInstanceState(savedInstanceState, persistentState);
		}

		@@ -1335,11 +1337,12 @@ public class Instrumentation {
		* The default implementation simply calls through to that method.
		*
		* @param activity The activity being created.
		* @param icicle The previously frozen state (or null) to pass through to
		* @param savedInstanceState The previously saved state (or null) to pass through to
		* onPostCreate().
		*/
		public void callActivityOnPostCreate(Activity activity, Bundle icicle) {
		activity.onPostCreate(icicle);
		public void callActivityOnPostCreate(@NonNull Activity activity,
		@Nullable Bundle savedInstanceState) {
		activity.onPostCreate(savedInstanceState);
		}

		/**
		@@ -1347,12 +1350,14 @@ public class Instrumentation {
		* The default implementation simply calls through to that method.
		*
		* @param activity The activity being created.
		* @param icicle The previously frozen state (or null) to pass through to
		* @param savedInstanceState The previously frozen state (or null) to pass through to
		* onPostCreate().
		* @param persistentState The previously persisted state (or null)
		*/
		public void callActivityOnPostCreate(Activity activity, Bundle icicle,
		PersistableBundle persistentState) {
		activity.onPostCreate(icicle, persistentState);
		public void callActivityOnPostCreate(@NonNull Activity activity,
		@Nullable Bundle savedInstanceState,
		@Nullable PersistableBundle persistentState) {
		activity.onPostCreate(savedInstanceState, persistentState);
		}

		/**
		@@ -1439,7 +1444,8 @@ public class Instrumentation {
		* @param activity The activity being saved.
		* @param outState The bundle to pass to the call.
		*/
		public void callActivityOnSaveInstanceState(Activity activity, Bundle outState) {
		public void callActivityOnSaveInstanceState(@NonNull Activity activity,
		@NonNull Bundle outState) {
		activity.performSaveInstanceState(outState);
		}

		@@ -1450,8 +1456,8 @@ public class Instrumentation {
		* @param outState The bundle to pass to the call.
		* @param outPersistentState The persistent bundle to pass to the call.
		*/
		public void callActivityOnSaveInstanceState(Activity activity, Bundle outState,
		PersistableBundle outPersistentState) {
		public void callActivityOnSaveInstanceState(@NonNull Activity activity,
		@NonNull Bundle outState, @NonNull PersistableBundle outPersistentState) {
		activity.performSaveInstanceState(outState, outPersistentState);
		}