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

Commit 6c7db9aa authored by Louis Chang's avatar Louis Chang
Browse files

Removes the warning log 

The log is no longer needed as it is a valid use case to
have direct child activities on a non-leaf TaskFragment.
An example is like the Activity#2 in below case.

Task
   - Activity#2
   - TaskFragment
      - Activity#1

Bug: 163976519
Test: wm presubmit
Change-Id: Ief62751802bb329e838dd2f4943afb9c38906a5b
parent ca8c8e6e

services/core/java/com/android/server/wm/TaskFragment.java

+0 −12
Original line number Diff line number Diff line
@@ -564,7 +564,6 @@ class TaskFragment extends WindowContainer<WindowContainer> { 
    }



    void setResumedActivity(ActivityRecord r, String reason) {

        warnForNonLeafTaskFragment("setResumedActivity");

        if (mResumedActivity == r) {

            return;

        }
@@ -850,15 +849,6 @@ class TaskFragment extends WindowContainer<WindowContainer> { 
        return parentTaskFragment != null ? parentTaskFragment.getOrganizedTaskFragment() : null;

    }



    /**

     * Simply check and give warning logs if this is not operated on leaf {@link TaskFragment}.

     */

    private void warnForNonLeafTaskFragment(String func) {

        if (!isLeafTaskFragment()) {

            Slog.w(TAG, func + " on non-leaf task fragment " + this);

        }

    }



    boolean hasDirectChildActivities() {

        for (int i = mChildren.size() - 1; i >= 0; --i) {

            if (mChildren.get(i).asActivityRecord() != null) {
@@ -935,7 +925,6 @@ class TaskFragment extends WindowContainer<WindowContainer> { 
     */

    void onActivityStateChanged(ActivityRecord record, ActivityRecord.State state,

            String reason) {

        warnForNonLeafTaskFragment("onActivityStateChanged");

        if (record == mResumedActivity && state != RESUMED) {

            setResumedActivity(null, reason + " - onActivityStateChanged");

        }
@@ -965,7 +954,6 @@ class TaskFragment extends WindowContainer<WindowContainer> { 
     * @return {@code true} if the process of the pausing activity is died.

     */

    boolean handleAppDied(WindowProcessController app) {

        warnForNonLeafTaskFragment("handleAppDied");

        boolean isPausingDied = false;

        if (mPausingActivity != null && mPausingActivity.app == app) {

            ProtoLog.v(WM_DEBUG_STATES, "App died while pausing: %s",