diff options
| author | Xin Li <delphij@google.com> | 2019-09-05 16:53:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-09-05 16:53:18 +0000 |
| commit | d7a8e234e9b94ff36cd271555a0bbf8a01a10932 (patch) | |
| tree | b6c98b0e3e76f797dbc57e77a8aac776ca1d1324 /src/com/android/settings/applications/RunningServiceDetails.java | |
| parent | 1e53efc4c48ec80421bb0542b770332ab8efdab5 (diff) | |
| parent | 7195e05dfaf1c848a7af9b844cd8bd05e9c220fe (diff) | |
| download | packages_apps_Settings-d7a8e234e9b94ff36cd271555a0bbf8a01a10932.tar.gz packages_apps_Settings-d7a8e234e9b94ff36cd271555a0bbf8a01a10932.tar.bz2 packages_apps_Settings-d7a8e234e9b94ff36cd271555a0bbf8a01a10932.zip | |
Merge "DO NOT MERGE - Merge Android 10 into master"
Diffstat (limited to 'src/com/android/settings/applications/RunningServiceDetails.java')
| -rw-r--r-- | src/com/android/settings/applications/RunningServiceDetails.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/com/android/settings/applications/RunningServiceDetails.java b/src/com/android/settings/applications/RunningServiceDetails.java index 770b1d6e4a..6165fb43b8 100644 --- a/src/com/android/settings/applications/RunningServiceDetails.java +++ b/src/com/android/settings/applications/RunningServiceDetails.java @@ -2,11 +2,10 @@ package com.android.settings.applications; import android.app.Activity; import android.app.ActivityManager; -import android.app.AlertDialog; import android.app.ApplicationErrorReport; import android.app.Dialog; -import android.app.DialogFragment; import android.app.PendingIntent; +import android.app.settings.SettingsEnums; import android.content.ActivityNotFoundException; import android.content.ComponentName; import android.content.Context; @@ -31,7 +30,9 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.DialogFragment; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.InstrumentedFragment; @@ -534,7 +535,7 @@ public class RunningServiceDetails extends InstrumentedFragment @Override public int getMetricsCategory() { - return MetricsEvent.RUNNING_SERVICE_DETAILS; + return SettingsEnums.RUNNING_SERVICE_DETAILS; } @Override @@ -607,7 +608,7 @@ public class RunningServiceDetails extends InstrumentedFragment @Override public int getMetricsCategory() { - return MetricsEvent.DIALOG_RUNNIGN_SERVICE; + return SettingsEnums.DIALOG_RUNNIGN_SERVICE; } } |