commit c0c3bce16e3a4551a1fc18c505b44c209653943d
author Alex Johnston <acjohnston@google.com> Tue Feb 16 20:47:15 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 16 20:47:15 2021 +0000
tree 7281ffffbc21805ecd53545e465359391f4dadfe
parent 3deffe9f04b61cb0160d197aa9dac9defa41e81c
parent 7d4db750e6f6acaeacc52114a8d91256b79d4957

Merge "Disallow modifying USB in Settings" into sc-dev

src/com/android/settings/Settings.java

diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index acf1848..1008888 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -231,7 +231,7 @@
     public static class MobileNetworkListActivity extends SettingsActivity {}
     public static class GlobalActionsPanelSettingsActivity extends SettingsActivity {}
     public static class PowerMenuSettingsActivity extends SettingsActivity {}
-    public static class QuickControlsSettingsActivity extends SettingsActivity {}
+    public static class DeviceControlsSettingsActivity extends SettingsActivity {}
     /**
      * Activity for BugReportHandlerPicker.
      */