Revert "Add Activity non-config instance map-like API"
Revert "Tests for non-config instance map"
Revert submission 11077952-non-config-map
Reason for revert: API council would like to go straight to Jetpack
Reverted Changes:
Ib2484d433:Add Activity non-config instance map-like API
Ibc3daf82f:Tests for non-config instance map
Bug: 155401916
Change-Id: I9dd8226375e86d66b8cef3731642c0cf9f74434c
diff --git a/api/current.txt b/api/current.txt
index 99d69ee..ecee4f5 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -3788,14 +3788,13 @@
method @Nullable public android.view.View getCurrentFocus();
method @Deprecated public android.app.FragmentManager getFragmentManager();
method public android.content.Intent getIntent();
- method @Deprecated @Nullable public Object getLastNonConfigurationInstance();
+ method @Nullable public Object getLastNonConfigurationInstance();
method @NonNull public android.view.LayoutInflater getLayoutInflater();
method @Deprecated public android.app.LoaderManager getLoaderManager();
method @NonNull public String getLocalClassName();
method public int getMaxNumPictureInPictureActions();
method public final android.media.session.MediaController getMediaController();
method @NonNull public android.view.MenuInflater getMenuInflater();
- method @Nullable public final <T> T getNonConfigurationInstance(@NonNull Class<T>);
method public final android.app.Activity getParent();
method @Nullable public android.content.Intent getParentActivityIntent();
method public android.content.SharedPreferences getPreferences(int);
@@ -3896,7 +3895,7 @@
method protected void onRestoreInstanceState(@NonNull android.os.Bundle);
method public void onRestoreInstanceState(@Nullable android.os.Bundle, @Nullable android.os.PersistableBundle);
method @CallSuper protected void onResume();
- method @Deprecated @Nullable public Object onRetainNonConfigurationInstance();
+ method public Object onRetainNonConfigurationInstance();
method protected void onSaveInstanceState(@NonNull android.os.Bundle);
method public void onSaveInstanceState(@NonNull android.os.Bundle, @NonNull android.os.PersistableBundle);
method public boolean onSearchRequested(@Nullable android.view.SearchEvent);
@@ -3920,7 +3919,6 @@
method public void openOptionsMenu();
method public void overridePendingTransition(int, int);
method public void postponeEnterTransition();
- method @Nullable public final <T> T putNonConfigurationInstance(@NonNull Class<T>, @Nullable T);
method public void recreate();
method public void registerActivityLifecycleCallbacks(@NonNull android.app.Application.ActivityLifecycleCallbacks);
method public void registerForContextMenu(android.view.View);
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 3c3ad2d..c19575b 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -851,7 +851,6 @@
static final class NonConfigurationInstances {
Object activity;
- ArrayMap<Class<?>, Object> activityMap;
HashMap<String, Object> children;
FragmentManagerNonConfig fragments;
ArrayMap<String, LoaderManager> loaders;
@@ -860,9 +859,6 @@
@UnsupportedAppUsage
/* package */ NonConfigurationInstances mLastNonConfigurationInstances;
- // Stored separately since NonConfigurationInstances are set to null in onResume.
- private ArrayMap<Class<?>, Object> mNonConfigurationInstanceMap;
-
@UnsupportedAppUsage
private Window mWindow;
@@ -3016,12 +3012,8 @@
* available on older platforms through the Android support libraries.
*
* @return the object previously returned by {@link #onRetainNonConfigurationInstance()}
- *
- * @deprecated Use {@link #getNonConfigurationInstance} which supports map-like behavior for
- * fetching and retaining multiple objects without requiring a subclass.
*/
@Nullable
- @Deprecated
public Object getLastNonConfigurationInstance() {
return mLastNonConfigurationInstances != null
? mLastNonConfigurationInstances.activity : null;
@@ -3078,11 +3070,7 @@
*
* @return any Object holding the desired state to propagate to the
* next activity instance
- * @deprecated Use {@link #getNonConfigurationInstance} which supports map-like behavior for
- * fetching and retaining multiple objects without requiring a subclass.
*/
- @Nullable
- @Deprecated
public Object onRetainNonConfigurationInstance() {
return null;
}
@@ -3122,91 +3110,8 @@
return null;
}
- /**
- * Retrieve a non-configuration instance for {@code cls} that was previously associated via a
- * call to {@link #putNonConfigurationInstance}. This method can be called at any time after
- * the initial {@link #onCreate} call, allowing you to extract any useful dynamic state from
- * the previous instance of this activity.
- * <p>
- * Note that the data you retrieve here should <em>only</em> be used as an optimization for
- * handling configuration changes. You should always be able to handle getting a null
- * reference back, and an activity must still be able to restore itself to its previous state
- * (through the normal {@link #onSaveInstanceState(Bundle)} mechanism) even if this method
- * returns null.
- * <p>
- * This functionality is not supported for child activities in an {@link ActivityGroup}.
- */
- @Nullable
- public final <T> T getNonConfigurationInstance(@NonNull Class<T> cls) {
- if (cls == null) {
- throw new NullPointerException("cls == null");
- }
- return cls.cast(mNonConfigurationInstanceMap.get(cls));
- }
-
- /**
- * Retain {@code instance} across configuration changes when it is known that a new instance of
- * this activity will immediately be created for the new configuration. You can pass any object
- * you like here, which can later be retrieved by calling {@link #getNonConfigurationInstance}
- * in the new activity instance using the same {@code cls}.
- * <p>
- * Instances supplied to this function are used purely as an optimization, and you must not
- * rely on them being available in the new instance. This method can be called at any time
- * during {@link #onCreate} through (and including) {@link #onDestroy}.
- * <p>
- * Each instance is associated with and retrieved by its corresponding {@link Class}. Only one
- * instance can be associated with a class in an activity. If an existing instance is mapped to
- * the supplied class it will be replaced and the old instance returned. Passing null for
- * {@code instance} will remove any stored instance. A return value of null means there was no
- * previous mapping.
- * <p>
- * If you need to dynamically retain instances where a unique class is not available, create a
- * unique class and instance which contains a list, map, or whatever structure facilitates your
- * dynamic setup.
- * <code><pre>
- * class MyLibraryState {
- * Map<String, State> keyToState = new ArrayMap<>();
- * }
- * </pre></code>
- * Similarly, if you need to store something generic like {@code List<String>} you should wrap
- * it in a unique class with no generic parameters.
- * <code><pre>
- * class MyLibraryState {
- * List<String> states = new ArrayList<>();
- * }
- * </pre></code>
- * <p>
- * This API can be used to propagate extensive state from the old to new activity instance, from
- * loaded bitmaps, to network connections, to even actively running threads. Note that you
- * should <em>not</em> propagate any data that may change based on the configuration, including
- * any data loaded from resources such as strings, layouts, or drawables.
- * <p>
- * This functionality is not supported for child activities in an {@link ActivityGroup}.
- *
- * @param cls The class to which {@code instance} will be associated. This will be used to
- * retrieve the instance after configuration change.
- *
- * @param instance The instance associated with {@code cls}.
- *
- * @return The previous instance stored for {@code cls}. This may have come from a previous
- * activity instance or simply a previous call to this method. A return value of null indicates
- * no instance was associated with the specified class.
- */
- @Nullable
- public final <T> T putNonConfigurationInstance(@NonNull Class<T> cls, @Nullable T instance) {
- if (cls == null) {
- throw new NullPointerException("cls == null");
- }
- ArrayMap<Class<?>, Object> map = mNonConfigurationInstanceMap;
- Object removed = instance == null
- ? map.remove(cls)
- : map.put(cls, cls.cast(instance));
- return cls.cast(removed);
- }
-
NonConfigurationInstances retainNonConfigurationInstances() {
Object activity = onRetainNonConfigurationInstance();
- ArrayMap<Class<?>, Object> activityMap = mNonConfigurationInstanceMap;
HashMap<String, Object> children = onRetainNonConfigurationChildInstances();
FragmentManagerNonConfig fragments = mFragments.retainNestedNonConfig();
@@ -3218,9 +3123,13 @@
mFragments.doLoaderStop(true);
ArrayMap<String, LoaderManager> loaders = mFragments.retainLoaderNonConfig();
+ if (activity == null && children == null && fragments == null && loaders == null
+ && mVoiceInteractor == null) {
+ return null;
+ }
+
NonConfigurationInstances nci = new NonConfigurationInstances();
nci.activity = activity;
- nci.activityMap = activityMap;
nci.children = children;
nci.fragments = fragments;
nci.loaders = loaders;
@@ -8013,14 +7922,6 @@
mParent = parent;
mEmbeddedID = id;
mLastNonConfigurationInstances = lastNonConfigurationInstances;
- if (lastNonConfigurationInstances != null) {
- mNonConfigurationInstanceMap = lastNonConfigurationInstances.activityMap;
- } else {
- // This map is eagerly instantiated because we want people to be able to insert items
- // in onDestroy which is *after* the non-config instances are collected. Being a mutable
- // map, these otherwise-late puts are thus able to still be retained.
- mNonConfigurationInstanceMap = new ArrayMap<>(0);
- }
if (voiceInteractor != null) {
if (lastNonConfigurationInstances != null) {
mVoiceInteractor = lastNonConfigurationInstances.voiceInteractor;
