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

Commit f3931a96 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Add event log when keyguard status changed."

parents 576f239f 30eca70b

services/core/java/com/android/server/am/EventLogTags.logtags

+4 −1
Original line number Diff line number Diff line
@@ -147,3 +147,6 @@ option java_package com.android.server.am 


# An activity been add into stopping list

30066 am_add_to_stopping (User|1|5),(Token|1|5),(Component Name|3),(Reason|3)



# Keyguard status changed

+30067 am_set_keyguard_shown (keyguardShowing|1),(aodShowing|1),(keyguardGoingAway|1),(Reason|3)
 
 No newline at end of file

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

+12 −0
Original line number Diff line number Diff line
@@ -43,11 +43,13 @@ import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_WITH_CLAS 
import android.os.IBinder;

import android.os.RemoteException;

import android.os.Trace;

import android.util.EventLog;

import android.util.Slog;

import android.util.SparseArray;

import android.util.proto.ProtoOutputStream;



import com.android.internal.policy.IKeyguardDismissCallback;

import com.android.server.am.EventLogTags;

import com.android.server.policy.WindowManagerPolicy;

import com.android.server.wm.ActivityTaskManagerInternal.SleepToken;
@@ -142,6 +144,11 @@ class KeyguardController { 
        if (!keyguardChanged && !aodChanged) {

            return;

        }

        EventLog.writeEvent(EventLogTags.AM_SET_KEYGUARD_SHOWN,

                keyguardShowing ? 1 : 0,

                aodShowing ? 1 : 0,

                mKeyguardGoingAway ? 1 : 0,

                "setKeyguardShown");

        mKeyguardShowing = keyguardShowing;

        mAodShowing = aodShowing;

        mWindowManager.setAodShowing(aodShowing);
@@ -178,6 +185,11 @@ class KeyguardController { 
        mWindowManager.deferSurfaceLayout();

        try {

            setKeyguardGoingAway(true);

            EventLog.writeEvent(EventLogTags.AM_SET_KEYGUARD_SHOWN,

                    1 /* keyguardShowing */,

                    mAodShowing ? 1 : 0,

                    1 /* keyguardGoingAway */,

                    "keyguardGoingAway");

            mRootActivityContainer.getDefaultDisplay().mDisplayContent

                    .prepareAppTransition(TRANSIT_KEYGUARD_GOING_AWAY,

                            false /* alwaysKeepCurrent */, convertTransitFlags(flags),