Remove the atrace/Perfetto toggle, so Traceur only uses Perfetto.

am: f38ca784fd

Change-Id: Iaa3ea7dea61d435e0c0195b670d19a593bf3fdcf

7 files changed, 29 insertions, 64 deletions

diff --git a/res/values/preference_keys.xml b/res/values/preference_keys.xml
index b23f3b9..a3daf86 100644
--- a/res/values/preference_keys.xml
+++ b/res/values/preference_keys.xml
@@ -9,5 +9,4 @@
     <string name="pref_key_max_long_trace_size">max_long_trace_size</string>
     <string name="pref_key_max_long_trace_duration">max_long_trace_duration</string>
     <string name="pref_key_quick_setting">quick_setting_enabled</string>
-    <string name="pref_key_use_perfetto">use_perfetto_2</string>
 </resources>
diff --git a/res/xml/main.xml b/res/xml/main.xml
index 0d47435..685e889 100644
--- a/res/xml/main.xml
+++ b/res/xml/main.xml
@@ -41,12 +41,12 @@
         android:persistent="false"
         android:title="@string/clear_saved_traces" />
     <androidx.preference.PreferenceCategory
+        android:key="long_trace_category"
         android:orderingFromXml="true" >
         <androidx.preference.SwitchPreference
             android:key="@string/pref_key_long_traces"
             android:title="@string/long_traces"
             android:summary="@string/long_traces_summary"
-            android:dependency="@string/pref_key_use_perfetto"
             android:defaultValue="false" />
         <androidx.preference.ListPreference
             android:key="@string/pref_key_max_long_trace_size"
@@ -69,9 +69,5 @@
             android:key="@string/pref_key_quick_setting"
             android:title="@string/show_quick_settings_tile"
             android:defaultValue="false" />
-        <androidx.preference.SwitchPreference
-            android:key="@string/pref_key_use_perfetto"
-            android:title="@string/use_perfetto_beta"
-            android:defaultValue="true" />
     </androidx.preference.PreferenceCategory>
 </androidx.preference.PreferenceScreen>
diff --git a/src/com/google/android/traceur/MainFragment.java b/src/com/google/android/traceur/MainFragment.java
index a3cd01f..e69b2b3 100644
--- a/src/com/google/android/traceur/MainFragment.java
+++ b/src/com/google/android/traceur/MainFragment.java
@@ -67,8 +67,6 @@ public class MainFragment extends PreferenceFragment {
 
     private MultiSelectListPreference mTags;
 
-    private SwitchPreference mUsePerfetto;
-
     private boolean mRefreshing;
 
     private BroadcastReceiver mRefreshReceiver;
@@ -166,21 +164,6 @@ public class MainFragment extends PreferenceFragment {
                     }
                 });
 
-        mUsePerfetto = (SwitchPreference) findPreference(getActivity().getString(R.string.pref_key_use_perfetto));
-        mUsePerfetto.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                boolean shouldUsePerfetto = (boolean)newValue;
-                boolean success = TraceUtils.switchTraceEngine(
-                    shouldUsePerfetto ? PerfettoUtils.NAME : AtraceUtils.NAME);
-
-                if (success) {
-                    mUsePerfetto.setChecked(shouldUsePerfetto);
-                }
-                return false;
-            }
-        });
-
         refreshUi();
 
         mRefreshReceiver = new BroadcastReceiver() {
@@ -247,9 +230,6 @@ public class MainFragment extends PreferenceFragment {
         mTracingOn.setChecked(mTracingOn.getPreferenceManager().getSharedPreferences().getBoolean(
                 mTracingOn.getKey(), false));
 
-        // Grey out the toggle to change the trace engine if a trace is in progress.
-        mUsePerfetto.setEnabled(!mTracingOn.isChecked());
-
         // Update category list to match the categories available on the system.
         Set<Entry<String, String>> availableTags = TraceUtils.listCategories().entrySet();
         ArrayList<String> entries = new ArrayList<String>(availableTags.size());
@@ -281,12 +261,21 @@ public class MainFragment extends PreferenceFragment {
                 context.getString(R.string.pref_key_buffer_size));
         bufferSize.setSummary(bufferSize.getEntry());
 
-        ListPreference maxLongTraceSize = (ListPreference)findPreference(
-                context.getString(R.string.pref_key_max_long_trace_size));
-        maxLongTraceSize.setSummary(maxLongTraceSize.getEntry());
-
-        ListPreference maxLongTraceDuration = (ListPreference)findPreference(
-                context.getString(R.string.pref_key_max_long_trace_duration));
-        maxLongTraceDuration.setSummary(maxLongTraceDuration.getEntry());
+        // If we are not using the Perfetto trace backend,
+        // hide the unsupported preferences.
+        if (TraceUtils.currentTraceEngine().equals(PerfettoUtils.NAME)) {
+            ListPreference maxLongTraceSize = (ListPreference)findPreference(
+                    context.getString(R.string.pref_key_max_long_trace_size));
+            maxLongTraceSize.setSummary(maxLongTraceSize.getEntry());
+
+            ListPreference maxLongTraceDuration = (ListPreference)findPreference(
+                    context.getString(R.string.pref_key_max_long_trace_duration));
+            maxLongTraceDuration.setSummary(maxLongTraceDuration.getEntry());
+        } else {
+            Preference longTraceCategory = findPreference("long_trace_category");
+            if (longTraceCategory != null) {
+                getPreferenceScreen().removePreference(longTraceCategory);
+            }
+        }
     }
 }
diff --git a/src/com/google/android/traceur/StopTraceService.java b/src/com/google/android/traceur/StopTraceService.java
index fcdb470..a8dd636 100644
--- a/src/com/google/android/traceur/StopTraceService.java
+++ b/src/com/google/android/traceur/StopTraceService.java
@@ -37,7 +37,6 @@ public class StopTraceService extends TraceService {
     */
     @Override
     public void onHandleIntent(Intent intent) {
-        setupTraceEngine();
         Context context = getApplicationContext();
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         boolean prefsTracingOn =
diff --git a/src/com/google/android/traceur/TraceService.java b/src/com/google/android/traceur/TraceService.java
index 0a242cb..dc567b6 100644
--- a/src/com/google/android/traceur/TraceService.java
+++ b/src/com/google/android/traceur/TraceService.java
@@ -80,7 +80,6 @@ public class TraceService extends IntentService {
 
     @Override
     public void onHandleIntent(Intent intent) {
-        setupTraceEngine();
         Context context = getApplicationContext();
 
         if (intent.getAction().equals(INTENT_ACTION_START_TRACING)) {
@@ -184,12 +183,4 @@ public class TraceService extends IntentService {
         stopForeground(Service.STOP_FOREGROUND_REMOVE);
     }
 
-    protected void setupTraceEngine() {
-        Context context = getApplicationContext();
-        boolean usePerfetto =
-            PreferenceManager.getDefaultSharedPreferences(context)
-                .getBoolean(context.getString(R.string.pref_key_use_perfetto), true);
-        TraceUtils.switchTraceEngine(
-            usePerfetto ? PerfettoUtils.NAME : AtraceUtils.NAME);
-    }
 }
diff --git a/src/com/google/android/traceur/TraceUtils.java b/src/com/google/android/traceur/TraceUtils.java
index 6350795..924d193 100644
--- a/src/com/google/android/traceur/TraceUtils.java
+++ b/src/com/google/android/traceur/TraceUtils.java
@@ -41,7 +41,9 @@ public class TraceUtils {
 
     public static final String TRACE_DIRECTORY = "/data/local/traces/";
 
-    private static TraceEngine mTraceEngine = new AtraceUtils();
+    // To change Traceur to use atrace to collect traces,
+    // change mTraceEngine to point to AtraceUtils().
+    private static TraceEngine mTraceEngine = new PerfettoUtils();
 
     private static final Runtime RUNTIME = Runtime.getRuntime();
 
@@ -55,26 +57,6 @@ public class TraceUtils {
         public boolean isTracingOn();
     }
 
-    public static boolean switchTraceEngine(String newTraceEngine) {
-        if (mTraceEngine.getName().equals(newTraceEngine)) {
-            Log.e(TAG, "Tried to switch to use " + newTraceEngine
-                + " for tracing, but you already were!");
-            return true;
-        }
-
-        if (PerfettoUtils.NAME.equals(newTraceEngine)) {
-            mTraceEngine = new PerfettoUtils();
-        } else if (AtraceUtils.NAME.equals(newTraceEngine)) {
-            mTraceEngine = new AtraceUtils();
-        } else {
-            throw new AssertionError("Tried to switch to use " + newTraceEngine
-                + " for tracing, but I don't know what that is!");
-        }
-
-        Log.v(TAG, "Switched to using " + newTraceEngine + " for tracing!");
-        return true;
-    }
-
     public static String currentTraceEngine() {
         return mTraceEngine.getName();
     }
diff --git a/uitests/src/com/android/settings/ui/TraceurAppTests.java b/uitests/src/com/android/settings/ui/TraceurAppTests.java
index 18717d4..aa3dfa8 100644
--- a/uitests/src/com/android/settings/ui/TraceurAppTests.java
+++ b/uitests/src/com/android/settings/ui/TraceurAppTests.java
@@ -103,6 +103,15 @@ public class TraceurAppTests {
         assertNotNull("Clear saved traces element not found.",
                 mDevice.wait(Until.findObject(By.text("Clear saved traces")),
                 TIMEOUT));
+        assertNotNull("Long traces element not found.",
+                mDevice.wait(Until.findObject(By.text("Long traces")),
+                TIMEOUT));
+        assertNotNull("Maximum long trace size element not found.",
+                mDevice.wait(Until.findObject(By.text("Maximum long trace size")),
+                TIMEOUT));
+        assertNotNull("Maximum long trace duration element not found.",
+                mDevice.wait(Until.findObject(By.text("Maximum long trace duration")),
+                TIMEOUT));
         assertNotNull("Show Quick Settings tile switch not found.",
                 mDevice.wait(Until.findObject(By.text("Show Quick Settings tile")),
                 TIMEOUT));