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/development/BugReportInPowerPreferenceController.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/development/BugReportInPowerPreferenceController.java')
-rw-r--r-- | src/com/android/settings/development/BugReportInPowerPreferenceController.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/settings/development/BugReportInPowerPreferenceController.java b/src/com/android/settings/development/BugReportInPowerPreferenceController.java index 22b9f2b86a..99ced77325 100644 --- a/src/com/android/settings/development/BugReportInPowerPreferenceController.java +++ b/src/com/android/settings/development/BugReportInPowerPreferenceController.java @@ -19,9 +19,10 @@ package com.android.settings.development; import android.content.Context; import android.os.UserManager; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; |