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

Commit b0fb9f42 authored by Anna Bauza's avatar Anna Bauza Committed by Automerger Merge Worker
Browse files

Merge "fix: Refactor User Lifecycle Event and Report metrics logging" into... 

Merge "fix: Refactor User Lifecycle Event and Report metrics logging" into udc-dev am: 03238a8a am: d1789ce4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21469411



Change-Id: Ifd91d8cd5303f21391b806690522e7d73baa0777
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 59229960 d1789ce4

core/java/android/os/UserManager.java

+0 −33
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ import android.util.Log; 
import android.view.WindowManager.LayoutParams;



import com.android.internal.R;

import com.android.internal.util.FrameworkStatsLog;



import java.io.IOException;

import java.lang.annotation.Retention;
@@ -2532,38 +2531,6 @@ public class UserManager { 
        return USER_TYPE_PROFILE_CLONE.equals(userType);

    }



    /**

     * Returns the enum defined in the statsd UserLifecycleJourneyReported atom corresponding to the

     * user type.

     * @hide

     */

    public static int getUserTypeForStatsd(@NonNull String userType) {

        switch (userType) {

            case USER_TYPE_FULL_SYSTEM:

                return FrameworkStatsLog.USER_LIFECYCLE_JOURNEY_REPORTED__USER_TYPE__FULL_SYSTEM;

            case USER_TYPE_FULL_SECONDARY:

                return FrameworkStatsLog.USER_LIFECYCLE_JOURNEY_REPORTED__USER_TYPE__FULL_SECONDARY;

            case USER_TYPE_FULL_GUEST:

                return FrameworkStatsLog.USER_LIFECYCLE_JOURNEY_REPORTED__USER_TYPE__FULL_GUEST;

            case USER_TYPE_FULL_DEMO:

                return FrameworkStatsLog.USER_LIFECYCLE_JOURNEY_REPORTED__USER_TYPE__FULL_DEMO;

            case USER_TYPE_FULL_RESTRICTED:

                return FrameworkStatsLog

                        .USER_LIFECYCLE_JOURNEY_REPORTED__USER_TYPE__FULL_RESTRICTED;

            case USER_TYPE_PROFILE_MANAGED:

                return FrameworkStatsLog

                        .USER_LIFECYCLE_JOURNEY_REPORTED__USER_TYPE__PROFILE_MANAGED;

            case USER_TYPE_SYSTEM_HEADLESS:

                return FrameworkStatsLog

                        .USER_LIFECYCLE_JOURNEY_REPORTED__USER_TYPE__SYSTEM_HEADLESS;

            case USER_TYPE_PROFILE_CLONE:

                return FrameworkStatsLog

                        .USER_LIFECYCLE_JOURNEY_REPORTED__USER_TYPE__PROFILE_CLONE;

            default:

                return FrameworkStatsLog.USER_LIFECYCLE_JOURNEY_REPORTED__USER_TYPE__TYPE_UNKNOWN;

        }

    }



    /**

     * @hide

     * @deprecated Use {@link #isRestrictedProfile()}

services/core/java/com/android/server/am/BroadcastQueueImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ import android.os.RemoteException; 
import android.os.SystemClock;

import android.os.Trace;

import android.os.UserHandle;

import android.os.UserManager;

import android.text.TextUtils;

import android.util.EventLog;

import android.util.IndentingPrintWriter;
@@ -78,6 +77,7 @@ import android.util.proto.ProtoOutputStream; 
import com.android.internal.os.TimeoutRecord;

import com.android.internal.util.FrameworkStatsLog;

import com.android.server.LocalServices;

import com.android.server.pm.UserJourneyLogger;

import com.android.server.pm.UserManagerInternal;



import dalvik.annotation.optimization.NeverCompile;
@@ -1518,7 +1518,7 @@ public class BroadcastQueueImpl extends BroadcastQueue { 
            final UserInfo userInfo =

                    (umInternal != null) ? umInternal.getUserInfo(r.userId) : null;

            if (userInfo != null) {

                userType = UserManager.getUserTypeForStatsd(userInfo.userType);

                userType = UserJourneyLogger.getUserTypeForStatsd(userInfo.userType);

            }

            Slog.i(TAG_BROADCAST,

                    "BOOT_COMPLETED_BROADCAST_COMPLETION_LATENCY_REPORTED action:"