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

Commit 635fcc21 authored by Charles Chen's avatar Charles Chen
Browse files

Add max target sdk for LocalActivityManager 

Test: build and presubmit
Bug: 137825207
Change-Id: I30ca8a966e26bd8394e4f9bb0374b360d064673c
parent e1025e82

core/java/android/app/LocalActivityManager.java

+19 −6
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.app.servertransaction.PendingTransactionActions; 
import android.content.Intent;

import android.content.pm.ActivityInfo;

import android.os.Binder;

import android.os.Build;

import android.os.Bundle;

import android.util.Log;

import android.view.Window;
@@ -74,23 +75,33 @@ public class LocalActivityManager { 
    /** Thread our activities are running in. */

    private final ActivityThread mActivityThread;

    /** The containing activity that owns the activities we create. */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(trackingBug = 137825207, maxTargetSdk = Build.VERSION_CODES.Q,

            publicAlternatives = "Use {@code androidx.fragment.app.Fragment} and "

                    + "{@code androidx.fragment.app.FragmentManager} instead")

    private final Activity mParent;



    /** The activity that is currently resumed. */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(trackingBug = 137825207, maxTargetSdk = Build.VERSION_CODES.Q,

            publicAlternatives = "Use {@code androidx.fragment.app.Fragment} and "

                    + "{@code androidx.fragment.app.FragmentManager} instead")

    private LocalActivityRecord mResumed;

    /** id -> record of all known activities. */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(trackingBug = 137825207, maxTargetSdk = Build.VERSION_CODES.Q,

            publicAlternatives = "Use {@code androidx.fragment.app.Fragment} and "

                    + "{@code androidx.fragment.app.FragmentManager} instead")

    private final Map<String, LocalActivityRecord> mActivities

            = new HashMap<String, LocalActivityRecord>();

    /** array of all known activities for easy iterating. */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(trackingBug = 137825207, maxTargetSdk = Build.VERSION_CODES.Q,

            publicAlternatives = "Use {@code androidx.fragment.app.Fragment} and "

                    + "{@code androidx.fragment.app.FragmentManager} instead")

    private final ArrayList<LocalActivityRecord> mActivityArray

            = new ArrayList<LocalActivityRecord>();



    /** True if only one activity can be resumed at a time */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(trackingBug = 137825207, maxTargetSdk = Build.VERSION_CODES.Q,

            publicAlternatives = "Use {@code androidx.fragment.app.Fragment} and "

                    + "{@code androidx.fragment.app.FragmentManager} instead")

    private boolean mSingleMode;

    

    /** Set to true once we find out the container is finishing. */
@@ -117,7 +128,9 @@ public class LocalActivityManager { 
        mSingleMode = singleMode;

    }



    @UnsupportedAppUsage

    @UnsupportedAppUsage(trackingBug = 137825207, maxTargetSdk = Build.VERSION_CODES.Q,

            publicAlternatives = "Use {@code androidx.fragment.app.Fragment} and "

                    + "{@code androidx.fragment.app.FragmentManager} instead")

    private void moveToState(LocalActivityRecord r, int desiredState) {

        if (r.curState == RESTORED || r.curState == DESTROYED) {

            // startActivity() has not yet been called, so nothing to do.