From 39654063ede01af0fd81c62218830931edb0787a Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@gmail.com>
Date: Wed, 18 Jan 2023 20:31:08 +0200
Subject: [PATCH] BatteryStatsViewer: Fix initial activity after launch

Test: Open through Settings IA, observe it lands on the picker
      activity instead of opening a random consumer by default.
Change-Id: I2456422a38f6e1842c5c883e687b2d09d6779e39
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
---
 .../batterystatsviewer/BatteryConsumerPickerActivity.java | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerPickerActivity.java b/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerPickerActivity.java
index 3699690aca591..27163373854cc 100644
--- a/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerPickerActivity.java
+++ b/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerPickerActivity.java
@@ -79,14 +79,6 @@ public class BatteryConsumerPickerActivity extends AppCompatActivity {
         mBatteryConsumerListAdapter =
                 new BatteryConsumerListAdapter((this::setSelectedBatteryConsumer));
         mAppList.setAdapter(mBatteryConsumerListAdapter);
-
-        if (icicle == null) {
-            final String batteryConsumerId = getPreferences(Context.MODE_PRIVATE)
-                    .getString(PREF_SELECTED_BATTERY_CONSUMER, null);
-            if (batteryConsumerId != null) {
-                startBatteryStatsActivity(batteryConsumerId);
-            }
-        }
     }
 
     public void setSelectedBatteryConsumer(String batteryConsumerId) {