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

Commit e322940f authored by Siarhei Vishniakou's avatar Siarhei Vishniakou Committed by android-build-merger
Browse files

Merge "Move tag definitions into policy" 

am: 3200c0bc

Change-Id: I64c8ac2e104c025ee3f4aed88d03e6c9aa9bcabe
parents 6acb2106 3200c0bc

services/core/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ java_library_static { 
        ":mediaupdateservice_aidl",

        "java/com/android/server/EventLogTags.logtags",

        "java/com/android/server/am/EventLogTags.logtags",

        "java/com/android/server/policy/EventLogTags.logtags",

    ],



    libs: [

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

0 → 100644
+8 −0
Original line number Diff line number Diff line 
# See system/core/logcat/event.logtags for a description of the format of this file.



option java_package com.android.server.policy





# 0 for screen off, 1 for screen on

70000 screen_toggled (screen_state|1|5)

70001 intercept_power (action|3),(mPowerKeyHandled|1),(mPowerKeyPressCounter|1)

services/core/java/com/android/server/policy/PhoneWindowManager.java

+6 −5
Original line number Diff line number Diff line
@@ -225,7 +225,6 @@ import android.speech.RecognizerIntent; 
import android.telecom.TelecomManager;

import android.util.ArraySet;

import android.util.DisplayMetrics;

import android.util.EventLog;

import android.util.Log;

import android.util.LongSparseArray;

import android.util.MutableBoolean;
@@ -270,12 +269,11 @@ import com.android.internal.logging.MetricsLogger; 
import com.android.internal.logging.nano.MetricsProto;

import com.android.internal.policy.IKeyguardDismissCallback;

import com.android.internal.policy.IShortcutService;

import com.android.internal.policy.KeyguardDismissCallback;

import com.android.internal.policy.PhoneWindow;

import com.android.internal.statusbar.IStatusBarService;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.ScreenshotHelper;

import com.android.internal.util.ScreenShapeHelper;

import com.android.internal.util.ScreenshotHelper;

import com.android.internal.widget.PointerLocationView;

import com.android.server.GestureLauncherService;

import com.android.server.LocalServices;
@@ -6247,6 +6245,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            }



            case KeyEvent.KEYCODE_POWER: {

                EventLogTags.writeInterceptPower(

                        KeyEvent.actionToString(event.getAction()),

                        mPowerKeyHandled ? 1 : 0, mPowerKeyPressCounter);

                // Any activity on the power button stops the accessibility shortcut

                cancelPendingAccessibilityShortcutAction();

                result &= ~ACTION_PASS_TO_USER;
@@ -6785,7 +6786,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    // Called on the PowerManager's Notifier thread.

    @Override

    public void finishedGoingToSleep(int why) {

        EventLog.writeEvent(70000, 0);

        EventLogTags.writeScreenToggled(0);

        if (DEBUG_WAKEUP) Slog.i(TAG, "Finished going to sleep... (why=" + why + ")");

        MetricsLogger.histogram(mContext, "screen_timeout", mLockScreenTimeout / 1000);
@@ -6810,7 +6811,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    // Called on the PowerManager's Notifier thread.

    @Override

    public void startedWakingUp() {

        EventLog.writeEvent(70000, 1);

        EventLogTags.writeScreenToggled(1);

        if (DEBUG_WAKEUP) Slog.i(TAG, "Started waking up...");



        // Since goToSleep performs these functions synchronously, we must