Snap for 4378450 from 6ebde20b03db4c0d57f67acaac11832b610b966b to oc-mr1-releaseandroid-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r81android-8.1.0_r80android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r69android-8.1.0_r68android-8.1.0_r66android-8.1.0_r6android-8.1.0_r5android-8.1.0_r4android-8.1.0_r3android-8.1.0_r23android-8.1.0_r19android-8.1.0_r16android-8.1.0_r15android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m4-s1-release

Change-Id: I07f19344c030a9c2b0fd7ba425f7bf7462575f92

1 files changed, 23 insertions, 22 deletions

diff --git a/src/com/android/tv/ui/sidepanel/DeveloperOptionFragment.java b/src/com/android/tv/ui/sidepanel/DeveloperOptionFragment.java
index 0d189cca..f633fa5a 100644
--- a/src/com/android/tv/ui/sidepanel/DeveloperOptionFragment.java
+++ b/src/com/android/tv/ui/sidepanel/DeveloperOptionFragment.java
@@ -18,8 +18,6 @@ package com.android.tv.ui.sidepanel;
 
 import android.accounts.Account;
 import android.app.Activity;
-import android.app.ApplicationErrorReport;
-import android.content.Intent;
 import android.support.annotation.NonNull;
 import android.util.Log;
 import android.widget.Toast;
@@ -27,9 +25,11 @@ import android.widget.Toast;
 import com.android.tv.R;
 import com.android.tv.TvApplication;
 import com.android.tv.common.BuildConfig;
+import com.android.tv.common.feature.CommonFeatures;
 import com.android.tv.data.epg.EpgFetcher;
 import com.android.tv.experiments.Experiments;
 import com.android.tv.tuner.TunerPreferences;
+import com.android.tv.util.Utils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -54,7 +54,15 @@ public class DeveloperOptionFragment extends SideFragment {
     @Override
     protected List<Item> getItemList() {
         List<Item> items = new ArrayList<>();
-        if (BuildConfig.ENG) {
+        if (CommonFeatures.DVR.isEnabled(getContext())) {
+            items.add(new ActionItem(getString(R.string.dev_item_dvr_history)) {
+                @Override
+                protected void onSelected() {
+                    getMainActivity().getOverlayManager().showDvrHistoryDialog();
+                }
+            });
+        }
+        if (Utils.isDeveloper()) {
             items.add(new ActionItem(getString(R.string.dev_item_watch_history)) {
                 @Override
                 protected void onSelected() {
@@ -62,18 +70,6 @@ public class DeveloperOptionFragment extends SideFragment {
                 }
             });
         }
-        items.add(new ActionItem(getString(R.string.dev_item_send_feedback)) {
-            @Override
-            protected void onSelected() {
-                Intent intent = new Intent(Intent.ACTION_APP_ERROR);
-                ApplicationErrorReport report = new ApplicationErrorReport();
-                report.packageName = report.processName = getContext().getPackageName();
-                report.time = System.currentTimeMillis();
-                report.type = ApplicationErrorReport.TYPE_NONE;
-                intent.putExtra(Intent.EXTRA_BUG_REPORT, report);
-                startActivityForResult(intent, 0);
-            }
-        });
         items.add(new SwitchItem(getString(R.string.dev_item_store_ts_on),
                 getString(R.string.dev_item_store_ts_off),
                 getString(R.string.dev_item_store_ts_description)) {
@@ -89,13 +85,18 @@ public class DeveloperOptionFragment extends SideFragment {
                 TunerPreferences.setStoreTsStream(getContext(), isChecked());
             }
         });
+        if (Utils.isDeveloper()) {
+            items.add(
+                    new ActionItem(getString(R.string.dev_item_show_performance_monitor_log)) {
+                        @Override
+                        protected void onSelected() {
+                            TvApplication.getSingletons(getContext())
+                                    .getPerformanceMonitor()
+                                    .startPerformanceMonitorEventDebugActivity(getContext());
+                        }
+                    });
+        }
         return items;
     }
 
-
-    /** True if there is the dev options menu */
-    public static boolean shouldShow() {
-        return Experiments.ENABLE_DEVELOPER_FEATURES.get() || BuildConfig.ENG;
-    }
-
-}
+}
\ No newline at end of file