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

Commit 103cb7d5 authored by Mariia Sandrikova's avatar Mariia Sandrikova
Browse files

DO NOT MERGE Revert "Log the CameraCompatControlEventReported atom." 

This reverts commit 4e5bb886.

Reason for revert: Feature development is moving to T.

Bug: 206602997
Change-Id: Ia5da62807034a1657d65ac1bd15a2fff940d7160
parent 3a50e995

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

+0 −72
Original line number Original line Diff line number Diff line
@@ -61,11 +61,6 @@ import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.TYPE_T 
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.TYPE_TRANSITION_WARM_LAUNCH;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.TYPE_TRANSITION_WARM_LAUNCH;

import static com.android.internal.util.FrameworkStatsLog.APP_COMPAT_STATE_CHANGED__STATE__NOT_LETTERBOXED;

import static com.android.internal.util.FrameworkStatsLog.APP_COMPAT_STATE_CHANGED__STATE__NOT_LETTERBOXED;

import static com.android.internal.util.FrameworkStatsLog.APP_COMPAT_STATE_CHANGED__STATE__NOT_VISIBLE;

import static com.android.internal.util.FrameworkStatsLog.APP_COMPAT_STATE_CHANGED__STATE__NOT_VISIBLE;

import static com.android.internal.util.FrameworkStatsLog.CAMERA_COMPAT_CONTROL_EVENT_REPORTED__EVENT__APPEARED_APPLY_TREATMENT;

import static com.android.internal.util.FrameworkStatsLog.CAMERA_COMPAT_CONTROL_EVENT_REPORTED__EVENT__APPEARED_REVERT_TREATMENT;

import static com.android.internal.util.FrameworkStatsLog.CAMERA_COMPAT_CONTROL_EVENT_REPORTED__EVENT__CLICKED_APPLY_TREATMENT;

import static com.android.internal.util.FrameworkStatsLog.CAMERA_COMPAT_CONTROL_EVENT_REPORTED__EVENT__CLICKED_DISMISS;

import static com.android.internal.util.FrameworkStatsLog.CAMERA_COMPAT_CONTROL_EVENT_REPORTED__EVENT__CLICKED_REVERT_TREATMENT;

import static com.android.server.am.MemoryStatUtil.MemoryStat;

import static com.android.server.am.MemoryStatUtil.MemoryStat;

import static com.android.server.am.MemoryStatUtil.readMemoryStatFromFilesystem;

import static com.android.server.am.MemoryStatUtil.readMemoryStatFromFilesystem;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_METRICS;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_METRICS;
@@ -78,8 +73,6 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.Nullable;

import android.app.ActivityOptions;

import android.app.ActivityOptions;

import android.app.ActivityOptions.SourceInfo;

import android.app.ActivityOptions.SourceInfo;

import android.app.TaskInfo;

import android.app.TaskInfo.CameraCompatControlState;

import android.app.WaitResult;

import android.app.WaitResult;

import android.app.WindowConfiguration.WindowingMode;

import android.app.WindowConfiguration.WindowingMode;

import android.content.ComponentName;

import android.content.ComponentName;
@@ -1384,71 +1377,6 @@ class ActivityMetricsLogger { 
        }

        }

    }

    }





    /**

     * Logs the Camera Compat Control appeared event that corresponds to the given {@code state}

     * with the given {@code packageUid}.

     */

    void logCameraCompatControlAppearedEventReported(@CameraCompatControlState int state,

            int packageUid) {

        switch (state) {

            case TaskInfo.CAMERA_COMPAT_CONTROL_TREATMENT_SUGGESTED:

                logCameraCompatControlEventReported(

                        CAMERA_COMPAT_CONTROL_EVENT_REPORTED__EVENT__APPEARED_APPLY_TREATMENT,

                        packageUid);

                break;

            case TaskInfo.CAMERA_COMPAT_CONTROL_TREATMENT_APPLIED:

                logCameraCompatControlEventReported(

                        CAMERA_COMPAT_CONTROL_EVENT_REPORTED__EVENT__APPEARED_REVERT_TREATMENT,

                        packageUid);

                break;

            case TaskInfo.CAMERA_COMPAT_CONTROL_HIDDEN:

                // Nothing to log.

                break;

            default:

                Slog.w(TAG, "Unexpected state in logCameraCompatControlAppearedEventReported: "

                        + state);

                break;

        }

    }



    /**

     * Logs the Camera Compat Control clicked event that corresponds to the given {@code state}

     * with the given {@code packageUid}.

     */

    void logCameraCompatControlClickedEventReported(@CameraCompatControlState int state,

            int packageUid) {

        switch (state) {

            case TaskInfo.CAMERA_COMPAT_CONTROL_TREATMENT_APPLIED:

                logCameraCompatControlEventReported(

                        CAMERA_COMPAT_CONTROL_EVENT_REPORTED__EVENT__CLICKED_APPLY_TREATMENT,

                        packageUid);

                break;

            case TaskInfo.CAMERA_COMPAT_CONTROL_TREATMENT_SUGGESTED:

                logCameraCompatControlEventReported(

                        CAMERA_COMPAT_CONTROL_EVENT_REPORTED__EVENT__CLICKED_REVERT_TREATMENT,

                        packageUid);

                break;

            case TaskInfo.CAMERA_COMPAT_CONTROL_DISMISSED:

                logCameraCompatControlEventReported(

                        CAMERA_COMPAT_CONTROL_EVENT_REPORTED__EVENT__CLICKED_DISMISS,

                        packageUid);

                break;

            default:

                Slog.w(TAG, "Unexpected state in logCameraCompatControlAppearedEventReported: "

                        + state);

                break;

        }

    }



    private void logCameraCompatControlEventReported(int event, int packageUid) {

        FrameworkStatsLog.write(FrameworkStatsLog.CAMERA_COMPAT_CONTROL_EVENT_REPORTED, packageUid,

                event);

        if (DEBUG_METRICS) {

            Slog.i(TAG, String.format("CAMERA_COMPAT_CONTROL_EVENT_REPORTED(%s, %s)", packageUid,

                    event));

        }

    }



    private ArtManagerInternal getArtManagerInternal() {

    private ArtManagerInternal getArtManagerInternal() {

        if (mArtManagerInternal == null) {

        if (mArtManagerInternal == null) {

            // Note that this may be null.

            // Note that this may be null.

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

+0 −4
Original line number Original line Diff line number Diff line
@@ -1618,8 +1618,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        if (!changed) {

        if (!changed) {

            return;

            return;

        }

        }

        mTaskSupervisor.getActivityMetricsLogger().logCameraCompatControlAppearedEventReported(

                newCameraCompatControlState, info.applicationInfo.uid);

        if (newCameraCompatControlState == TaskInfo.CAMERA_COMPAT_CONTROL_HIDDEN) {

        if (newCameraCompatControlState == TaskInfo.CAMERA_COMPAT_CONTROL_HIDDEN) {

            mCameraCompatControlClickedByUser = false;

            mCameraCompatControlClickedByUser = false;

            mCompatCameraControlCallback = null;

            mCompatCameraControlCallback = null;
@@ -1642,8 +1640,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        if (!changed) {

        if (!changed) {

            return;

            return;

        }

        }

        mTaskSupervisor.getActivityMetricsLogger().logCameraCompatControlClickedEventReported(

                state, info.applicationInfo.uid);

        if (state == TaskInfo.CAMERA_COMPAT_CONTROL_DISMISSED) {

        if (state == TaskInfo.CAMERA_COMPAT_CONTROL_DISMISSED) {

            mCompatCameraControlCallback = null;

            mCompatCameraControlCallback = null;

            return;

            return;