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

Commit 8b19de94 authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Renamed a few methods in ActivityRecord (42/n). 

This is in preparation for having the ActivityRecord class
extend AppWindowToken where name distinction will be important.
There is no functional change in this CL.

ActivityRecord.realActivity -> mActivityComponent
ActivityRecord.userId -> mUserId
ActivityRecord.getTask() -> getTaskRecord()
ActivityRecord.getStack() -> getActivityStack()
ActivityRecord.service -> mAtmService
WindowContainer.mService -> mWmService

Bug: 80414790
Test: Existing tests pass.
Change-Id: Ie5788db7f2e823c7d5b64c7ce6eaade1c19c4dcd
parent ef60a058

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

+1 −1
Original line number Diff line number Diff line
@@ -1242,7 +1242,7 @@ class ActivityDisplay extends ConfigurationContainer<ActivityStack> 
            for (int activityNdx = activities.size() - 1; activityNdx >= 0; --activityNdx) {

                final ActivityRecord r = activities.get(activityNdx);

                if (r.isActivityTypeHome()

                        && ((userId == UserHandle.USER_ALL) || (r.userId == userId))) {

                        && ((userId == UserHandle.USER_ALL) || (r.mUserId == userId))) {

                    return r;

                }

            }

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

+3 −3
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ class ActivityMetricsLogger { 
            type = getTransitionType(info);

            processRecord = findProcessForActivity(launchedActivity);

            processName = launchedActivity.processName;

            userId = launchedActivity.userId;

            userId = launchedActivity.mUserId;

            launchedActivityShortComponentName = launchedActivity.shortComponentName;

            activityRecordIdHashCode = System.identityHashCode(launchedActivity);

            this.windowsFullyDrawnDelayMs = windowsFullyDrawnDelayMs;
@@ -520,7 +520,7 @@ class ActivityMetricsLogger { 
        if (info.launchedActivity != activityRecord) {

            return;

        }

        final TaskRecord t = activityRecord.getTask();

        final TaskRecord t = activityRecord.getTaskRecord();

        final SomeArgs args = SomeArgs.obtain();

        args.arg1 = t;

        args.arg2 = activityRecord;
@@ -893,7 +893,7 @@ class ActivityMetricsLogger { 
            builder.addTaggedData(FIELD_ACTIVITY_RECORD_TARGET_ACTIVITY, r.info.targetActivity);

            builder.addTaggedData(FIELD_ACTIVITY_RECORD_FLAGS, r.info.flags);

            builder.addTaggedData(FIELD_ACTIVITY_RECORD_REAL_ACTIVITY,

                    r.realActivity.toShortString());

                    r.mActivityComponent.toShortString());

            builder.addTaggedData(FIELD_ACTIVITY_RECORD_SHORT_COMPONENT_NAME, r.shortComponentName);

            builder.addTaggedData(FIELD_ACTIVITY_RECORD_PROCESS_NAME, r.processName);

            builder.addTaggedData(FIELD_ACTIVITY_RECORD_IS_FULLSCREEN, r.fullscreen ? 1 : 0);