Remove ActivityConfigurationChangeItem pool (8/n).
Remove the use of ObjectPool in the creation and management of
ActivityConfigurationChangeItem object. Instead of being obtained from
the pool, these objects are now directly instantiated, simplifying their
handling and aligning with the broader removal of the object pooling
mechanism.
Bug: 311089192
Test: atest FrameworksCoreTests:ActivityThreadTest
Test: atest FrameworksCoreTests:ObjectPoolTests
Test: atest FrameworksCoreTests:TransactionParcelTests
Test: atest WmTests:ActivityRecordTests
Flag: EXEMPT removing com.android.window.flags.disable_object_pool
Change-Id: Ib458941e91cf86500524b0c3a99c5790f89586ba
diff --git a/core/java/android/app/servertransaction/ActivityConfigurationChangeItem.java b/core/java/android/app/servertransaction/ActivityConfigurationChangeItem.java
index 11d7ff8..2b52681 100644
--- a/core/java/android/app/servertransaction/ActivityConfigurationChangeItem.java
+++ b/core/java/android/app/servertransaction/ActivityConfigurationChangeItem.java
@@ -19,6 +19,8 @@
import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER;
import static android.view.Display.INVALID_DISPLAY;
+import static java.util.Objects.requireNonNull;
+
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.app.ActivityThread.ActivityClientRecord;
@@ -34,12 +36,23 @@
/**
* Activity configuration changed callback.
+ *
* @hide
*/
public class ActivityConfigurationChangeItem extends ActivityTransactionItem {
- private Configuration mConfiguration;
- private ActivityWindowInfo mActivityWindowInfo;
+ @NonNull
+ private final Configuration mConfiguration;
+
+ @NonNull
+ private final ActivityWindowInfo mActivityWindowInfo;
+
+ public ActivityConfigurationChangeItem(@NonNull IBinder activityToken,
+ @NonNull Configuration config, @NonNull ActivityWindowInfo activityWindowInfo) {
+ super(activityToken);
+ mConfiguration = new Configuration(config);
+ mActivityWindowInfo = new ActivityWindowInfo(activityWindowInfo);
+ }
@Override
public void preExecute(@NonNull ClientTransactionHandler client) {
@@ -59,38 +72,9 @@
Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER);
}
- // ObjectPoolItem implementation
-
- private ActivityConfigurationChangeItem() {}
-
- /** Obtain an instance initialized with provided params. */
- @NonNull
- public static ActivityConfigurationChangeItem obtain(@NonNull IBinder activityToken,
- @NonNull Configuration config, @NonNull ActivityWindowInfo activityWindowInfo) {
- ActivityConfigurationChangeItem instance =
- ObjectPool.obtain(ActivityConfigurationChangeItem.class);
- if (instance == null) {
- instance = new ActivityConfigurationChangeItem();
- }
- instance.setActivityToken(activityToken);
- instance.mConfiguration = new Configuration(config);
- instance.mActivityWindowInfo = new ActivityWindowInfo(activityWindowInfo);
-
- return instance;
- }
-
- @Override
- public void recycle() {
- super.recycle();
- mConfiguration = null;
- mActivityWindowInfo = null;
- ObjectPool.recycle(this);
- }
-
-
// Parcelable implementation
- /** Write to Parcel. */
+ /** Writes to Parcel. */
@Override
public void writeToParcel(@NonNull Parcel dest, int flags) {
super.writeToParcel(dest, flags);
@@ -98,11 +82,11 @@
dest.writeTypedObject(mActivityWindowInfo, flags);
}
- /** Read from Parcel. */
+ /** Reads from Parcel. */
private ActivityConfigurationChangeItem(@NonNull Parcel in) {
super(in);
- mConfiguration = in.readTypedObject(Configuration.CREATOR);
- mActivityWindowInfo = in.readTypedObject(ActivityWindowInfo.CREATOR);
+ mConfiguration = requireNonNull(in.readTypedObject(Configuration.CREATOR));
+ mActivityWindowInfo = requireNonNull(in.readTypedObject(ActivityWindowInfo.CREATOR));
}
public static final @NonNull Creator<ActivityConfigurationChangeItem> CREATOR =
diff --git a/core/tests/coretests/src/android/app/activity/ActivityThreadTest.java b/core/tests/coretests/src/android/app/activity/ActivityThreadTest.java
index 5ed0d1c..c51c3a5 100644
--- a/core/tests/coretests/src/android/app/activity/ActivityThreadTest.java
+++ b/core/tests/coretests/src/android/app/activity/ActivityThreadTest.java
@@ -271,7 +271,7 @@
newConfig.seq++;
newConfig.smallestScreenWidthDp++;
transaction = newTransaction(activityThread);
- transaction.addTransactionItem(ActivityConfigurationChangeItem.obtain(
+ transaction.addTransactionItem(new ActivityConfigurationChangeItem(
activity.getActivityToken(), newConfig, new ActivityWindowInfo()));
appThread.scheduleTransaction(transaction);
InstrumentationRegistry.getInstrumentation().waitForIdleSync();
@@ -479,11 +479,11 @@
appThread.scheduleTransaction(transaction);
transaction = newTransaction(activityThread);
- transaction.addTransactionItem(ActivityConfigurationChangeItem.obtain(
+ transaction.addTransactionItem(new ActivityConfigurationChangeItem(
activity.getActivityToken(), activityConfigLandscape, new ActivityWindowInfo()));
transaction.addTransactionItem(ConfigurationChangeItem.obtain(
processConfigPortrait, DEVICE_ID_INVALID));
- transaction.addTransactionItem(ActivityConfigurationChangeItem.obtain(
+ transaction.addTransactionItem(new ActivityConfigurationChangeItem(
activity.getActivityToken(), activityConfigPortrait, new ActivityWindowInfo()));
appThread.scheduleTransaction(transaction);
@@ -881,7 +881,7 @@
final ActivityWindowInfo activityWindowInfo = new ActivityWindowInfo();
activityWindowInfo.set(true /* isEmbedded */, taskBounds, taskFragmentBounds);
final ActivityConfigurationChangeItem activityConfigurationChangeItem =
- ActivityConfigurationChangeItem.obtain(
+ new ActivityConfigurationChangeItem(
activity.getActivityToken(), config, activityWindowInfo);
final ClientTransaction transaction = newTransaction(activity);
transaction.addTransactionItem(activityConfigurationChangeItem);
@@ -898,7 +898,7 @@
new ActivityWindowInfo(activityWindowInfo);
config.seq++;
final ActivityConfigurationChangeItem activityConfigurationChangeItem2 =
- ActivityConfigurationChangeItem.obtain(
+ new ActivityConfigurationChangeItem(
activity.getActivityToken(), config, activityWindowInfo2);
final ClientTransaction transaction2 = newTransaction(activity);
transaction2.addTransactionItem(activityConfigurationChangeItem2);
@@ -1018,7 +1018,7 @@
@NonNull
private static ClientTransaction newActivityConfigTransaction(@NonNull Activity activity,
@NonNull Configuration config) {
- final ActivityConfigurationChangeItem item = ActivityConfigurationChangeItem.obtain(
+ final ActivityConfigurationChangeItem item = new ActivityConfigurationChangeItem(
activity.getActivityToken(), config, new ActivityWindowInfo());
final ClientTransaction transaction = newTransaction(activity);
diff --git a/core/tests/coretests/src/android/app/servertransaction/ObjectPoolTests.java b/core/tests/coretests/src/android/app/servertransaction/ObjectPoolTests.java
index f0a2074..d389b78d 100644
--- a/core/tests/coretests/src/android/app/servertransaction/ObjectPoolTests.java
+++ b/core/tests/coretests/src/android/app/servertransaction/ObjectPoolTests.java
@@ -73,12 +73,6 @@
// 3. Check if the same object is obtained from pool after recycling.
@Test
- public void testRecycleActivityConfigurationChangeItem() {
- testRecycle(() -> ActivityConfigurationChangeItem.obtain(mActivityToken, config(),
- new ActivityWindowInfo()));
- }
-
- @Test
public void testRecycleActivityResultItem() {
testRecycle(() -> ActivityResultItem.obtain(mActivityToken, resultInfoList()));
}
diff --git a/core/tests/coretests/src/android/app/servertransaction/TransactionParcelTests.java b/core/tests/coretests/src/android/app/servertransaction/TransactionParcelTests.java
index 7ff91e7..1e434bd 100644
--- a/core/tests/coretests/src/android/app/servertransaction/TransactionParcelTests.java
+++ b/core/tests/coretests/src/android/app/servertransaction/TransactionParcelTests.java
@@ -90,7 +90,7 @@
final ActivityWindowInfo activityWindowInfo = new ActivityWindowInfo();
activityWindowInfo.set(true /* isEmbedded */, new Rect(0, 0, 500, 1000),
new Rect(0, 0, 500, 500));
- ActivityConfigurationChangeItem item = ActivityConfigurationChangeItem.obtain(
+ final ActivityConfigurationChangeItem item = new ActivityConfigurationChangeItem(
mActivityToken, config(), activityWindowInfo);
writeAndPrepareForReading(item);
@@ -290,8 +290,9 @@
@Test
public void testClientTransaction() {
// Write to parcel
- NewIntentItem callback1 = NewIntentItem.obtain(mActivityToken, new ArrayList<>(), true);
- ActivityConfigurationChangeItem callback2 = ActivityConfigurationChangeItem.obtain(
+ final NewIntentItem callback1 = NewIntentItem.obtain(
+ mActivityToken, new ArrayList<>(), true);
+ final ActivityConfigurationChangeItem callback2 = new ActivityConfigurationChangeItem(
mActivityToken, config(), new ActivityWindowInfo());
final StopActivityItem lifecycleRequest = new StopActivityItem(mActivityToken);
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index f36e381..072b1c7 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -1485,8 +1485,9 @@
ProtoLog.v(WM_DEBUG_CONFIGURATION, "Sending new config to %s, "
+ "config: %s", this, config);
- mAtmService.getLifecycleManager().scheduleTransactionItem(app.getThread(),
- ActivityConfigurationChangeItem.obtain(token, config, activityWindowInfo));
+ final ActivityConfigurationChangeItem item =
+ new ActivityConfigurationChangeItem(token, config, activityWindowInfo);
+ mAtmService.getLifecycleManager().scheduleTransactionItem(app.getThread(), item);
} catch (RemoteException e) {
// If process died, whatever.
}
diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java
index 24fc7ee..551efcd 100644
--- a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java
@@ -523,9 +523,8 @@
assertEquals(newConfig.uiMode, activityConfig.uiMode);
// The configuration change is still sent to the activity, even if it doesn't relaunch.
- final ActivityConfigurationChangeItem expected =
- ActivityConfigurationChangeItem.obtain(activity.token, activityConfig,
- activity.getActivityWindowInfo());
+ final ActivityConfigurationChangeItem expected = new ActivityConfigurationChangeItem(
+ activity.token, activityConfig, activity.getActivityWindowInfo());
verify(mClientLifecycleManager).scheduleTransactionItem(
eq(activity.app.getThread()), eq(expected));
}
@@ -596,9 +595,8 @@
final Configuration currentConfig = activity.getConfiguration();
assertEquals(expectedOrientation, currentConfig.orientation);
- final ActivityConfigurationChangeItem expected =
- ActivityConfigurationChangeItem.obtain(activity.token, currentConfig,
- activity.getActivityWindowInfo());
+ final ActivityConfigurationChangeItem expected = new ActivityConfigurationChangeItem(
+ activity.token, currentConfig, activity.getActivityWindowInfo());
verify(mClientLifecycleManager).scheduleTransactionItem(activity.app.getThread(), expected);
verify(displayRotation).onSetRequestedOrientation();
}
@@ -817,9 +815,8 @@
activity.ensureActivityConfiguration(true /* ignoreVisibility */);
- final ActivityConfigurationChangeItem expected =
- ActivityConfigurationChangeItem.obtain(activity.token,
- activity.getConfiguration(), activity.getActivityWindowInfo());
+ final ActivityConfigurationChangeItem expected = new ActivityConfigurationChangeItem(
+ activity.token, activity.getConfiguration(), activity.getActivityWindowInfo());
verify(mClientLifecycleManager).scheduleTransactionItem(
activity.app.getThread(), expected);
} finally {