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

Commit 2892d49a authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Adding logs for starting activity failure" into main

parents 3d305f0c ad2ddf6a

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

+2 −0
Original line number Diff line number Diff line
@@ -1548,6 +1548,8 @@ class ActivityStarter { 
                result = startActivityInner(r, sourceRecord, voiceSession, voiceInteractor,

                        startFlags, options, inTask, inTaskFragment, balVerdict,

                        intentGrants, realCallingUid);

            } catch (Exception ex) {

                Slog.e(TAG, "Exception on startActivityInner", ex);

            } finally {

                Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);

                startedActivityRootTask = handleStartResult(r, options, result, newTransition,

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

+1 −1
Original line number Diff line number Diff line
@@ -1893,7 +1893,7 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { 
        // Check that we aren't reparenting to the same root task that the task is already in

        if (prevRootTask != null && prevRootTask.mTaskId == rootTaskId) {

            Slog.w(TAG, "Can not reparent to same root task, task=" + task

                    + " already in rootTaskId=" + rootTaskId);

                    + " already in rootTaskId=" + rootTaskId + " by " + Debug.getCallers(8));

            return prevRootTask;

        }