Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1a0024a authored by Chris Li's avatar Chris Li Committed by Android (Google) Code Review
Browse files

Merge "Cleanup ClientTransaction#getContextToUpdate" into main

parents afcac0ad e5bb3575

core/java/android/app/ActivityThread.java

+0 −6
Original line number Diff line number Diff line
@@ -3727,12 +3727,6 @@ public final class ActivityThread extends ClientTransactionHandler 
        return mActivities.get(token);

    }



    @Nullable

    @Override

    public Context getWindowContext(@NonNull IBinder clientToken) {

        return WindowTokenClientController.getInstance().getWindowContext(clientToken);

    }



    @VisibleForTesting(visibility = PACKAGE)

    public Configuration getConfiguration() {

        return mConfigurationController.getConfiguration();

core/java/android/app/ClientTransactionHandler.java

+0 −6
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.app.servertransaction.ClientTransaction; 
import android.app.servertransaction.DestroyActivityItem;

import android.app.servertransaction.PendingTransactionActions;

import android.app.servertransaction.TransactionExecutor;

import android.content.Context;

import android.content.Intent;

import android.content.pm.ApplicationInfo;

import android.content.res.Configuration;
@@ -32,7 +31,6 @@ import android.util.MergedConfiguration; 
import android.view.SurfaceControl;

import android.window.ActivityWindowInfo;

import android.window.SplashScreenView.SplashScreenViewParcelable;

import android.window.WindowContext;

import android.window.WindowContextInfo;



import com.android.internal.annotations.VisibleForTesting;
@@ -90,10 +88,6 @@ public abstract class ClientTransactionHandler { 
    /** Get activity instance for the token. */

    public abstract Activity getActivity(IBinder token);



    /** Gets the {@link WindowContext} instance for the token. */

    @Nullable

    public abstract Context getWindowContext(@NonNull IBinder clientToken);



    // Prepare phase related logic and handlers. Methods that inform about about pending changes or

    // do other internal bookkeeping.

core/java/android/app/servertransaction/ActivityConfigurationChangeItem.java

+0 −7
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.app.ActivityThread.ActivityClientRecord;

import android.app.ClientTransactionHandler;

import android.content.Context;

import android.content.res.CompatibilityInfo;

import android.content.res.Configuration;

import android.os.IBinder;
@@ -60,12 +59,6 @@ public class ActivityConfigurationChangeItem extends ActivityTransactionItem { 
        Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER);

    }



    @Nullable

    @Override

    public Context getContextToUpdate(@NonNull ClientTransactionHandler client) {

        return client.getActivity(getActivityToken());

    }



    // ObjectPoolItem implementation



    private ActivityConfigurationChangeItem() {}

core/java/android/app/servertransaction/ActivityRelaunchItem.java

+0 −7
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.annotation.Nullable; 
import android.app.ActivityThread.ActivityClientRecord;

import android.app.ClientTransactionHandler;

import android.app.ResultInfo;

import android.content.Context;

import android.content.res.CompatibilityInfo;

import android.os.IBinder;

import android.os.Parcel;
@@ -88,12 +87,6 @@ public class ActivityRelaunchItem extends ActivityTransactionItem { 
        client.reportRelaunch(r);

    }



    @Nullable

    @Override

    public Context getContextToUpdate(@NonNull ClientTransactionHandler client) {

        return client.getActivity(getActivityToken());

    }



    // ObjectPoolItem implementation



    private ActivityRelaunchItem() {}

core/java/android/app/servertransaction/ClientTransactionItem.java

+0 −11
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import static com.android.internal.annotations.VisibleForTesting.Visibility.PACK 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.ClientTransactionHandler;

import android.content.Context;

import android.os.IBinder;

import android.os.Parcelable;
@@ -53,16 +52,6 @@ public abstract class ClientTransactionItem implements BaseClientRequest, Parcel 
        return true;

    }



    // TODO(b/260873529): cleanup

    /**

     * If this {@link ClientTransactionItem} is updating configuration, returns the {@link Context}

     * it is updating; otherwise, returns {@code null}.

     */

    @Nullable

    public Context getContextToUpdate(@NonNull ClientTransactionHandler client) {

        return null;

    }



    /**

     * Returns the activity token if this transaction item is activity-targeting. Otherwise,

     * returns {@code null}.