PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Makes call to MetricsLogger right away when taking bugreports." into nyc-dev am: 4c1cefcd3b

Browse Source 
am: 677d1c7e67

* commit '677d1c7e675159a14d2a483c9015140d7c55d6d1':
  Makes call to MetricsLogger right away when taking bugreports.
This commit is contained in:
Felipe Leme
2016-02-25 20:15:17 +00:00
committed by android-build-merger
parent 8ccfebff7e 677d1c7e67
commit f0cfd777e7
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/BugreportPreference.java
View File

@@ -87,9 +87,13 @@ public class BugreportPreference extends CustomDialogPreference {
if (mFullTitle.isChecked()) { if (mFullTitle.isChecked()) {
Log.v(TAG, "Taking full bugreport right away"); Log.v(TAG, "Taking full bugreport right away");
MetricsLogger.action(getDialog().getContext(),
MetricsEvent.ACTION_BUGREPORT_FROM_SETTINGS_FULL);
takeBugreport(ActivityManager.BUGREPORT_OPTION_FULL); takeBugreport(ActivityManager.BUGREPORT_OPTION_FULL);
} else { } else {
Log.v(TAG, "Taking interactive bugreport in " + BUGREPORT_DELAY_SECONDS + "s"); Log.v(TAG, "Taking interactive bugreport in " + BUGREPORT_DELAY_SECONDS + "s");
MetricsLogger.action(getDialog().getContext(),
MetricsEvent.ACTION_BUGREPORT_FROM_SETTINGS_INTERACTIVE);
// Add a little delay before executing, to give the user a chance to close // Add a little delay before executing, to give the user a chance to close
// the Settings activity before it takes a screenshot. // the Settings activity before it takes a screenshot.
final Context context = getContext(); final Context context = getContext();
@@ -110,18 +114,6 @@ public class BugreportPreference extends CustomDialogPreference {
private void takeBugreport(int bugreportType) { private void takeBugreport(int bugreportType) {
try { try {
switch (bugreportType) {
case ActivityManager.BUGREPORT_OPTION_FULL:
MetricsLogger.action(getDialog().getContext(),
MetricsEvent.ACTION_BUGREPORT_FROM_SETTINGS_FULL);
break;
case ActivityManager.BUGREPORT_OPTION_INTERACTIVE:
MetricsLogger.action(getDialog().getContext(),
MetricsEvent.ACTION_BUGREPORT_FROM_SETTINGS_INTERACTIVE);
break;
default:
Log.w(TAG, "Unknown bugreportType: " + bugreportType);
}
ActivityManagerNative.getDefault().requestBugReport(bugreportType); ActivityManagerNative.getDefault().requestBugReport(bugreportType);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "error taking bugreport (bugreportType=" + bugreportType + ")", e); Log.e(TAG, "error taking bugreport (bugreportType=" + bugreportType + ")", e);