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

Commit ad64dc97 authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

Merge "Fixed MetricsLogger usage." into nyc-dev 

am: 978b4d0e

* commit '978b4d0e':
  Fixed MetricsLogger usage.
parents 0852bdf4 978b4d0e

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

+4 −3
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package com.android.server.policy; 


import com.android.internal.app.AlertController;

import com.android.internal.app.AlertController.AlertParams;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.MetricsProto.MetricsEvent;

import com.android.internal.telephony.TelephonyIntents;

import com.android.internal.telephony.TelephonyProperties;

import com.android.internal.R;
@@ -388,7 +390,7 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac 
                public void run() {

                    try {

                        // Take an "interactive" bugreport.

                        MetricsLogger.visible(this,

                        MetricsLogger.action(mContext,

                                MetricsEvent.ACTION_BUGREPORT_FROM_POWER_MENU_INTERACTIVE);

                        ActivityManagerNative.getDefault().requestBugReport(

                                ActivityManager.BUGREPORT_OPTION_INTERACTIVE);
@@ -407,8 +409,7 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac 
            }

            try {

                // Take a "full" bugreport.

                MetricsLogger.visible(this,

                        MetricsEvent.ACTION_BUGREPORT_FROM_POWER_MENU_FULL);

                MetricsLogger.action(mContext, MetricsEvent.ACTION_BUGREPORT_FROM_POWER_MENU_FULL);

                ActivityManagerNative.getDefault().requestBugReport(

                        ActivityManager.BUGREPORT_OPTION_FULL);

            } catch (RemoteException e) {