From c86d61fc2c7daf9d5bd2ee8ba0a2daca2184d4a6 Mon Sep 17 00:00:00 2001
From: Michael Wachenschwanz <mwachens@google.com>
Date: Fri, 20 Nov 2020 16:09:33 -0800
Subject: [PATCH] Fix PowerStatsView AppPicker activity start

Move registerForActivityResult to intialize.

Bug: n/a
Test: manual
Change-Id: I9b91ed272a83512f3aef1801d7a8d837cb1aebcd
---
 .../core/powerstatsviewer/PowerStatsViewerActivity.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/tests/powertests/PowerStatsViewer/src/com/android/frameworks/core/powerstatsviewer/PowerStatsViewerActivity.java b/core/tests/powertests/PowerStatsViewer/src/com/android/frameworks/core/powerstatsviewer/PowerStatsViewerActivity.java
index 78f2b9135d0c3..05679101f86a8 100644
--- a/core/tests/powertests/PowerStatsViewer/src/com/android/frameworks/core/powerstatsviewer/PowerStatsViewerActivity.java
+++ b/core/tests/powertests/PowerStatsViewer/src/com/android/frameworks/core/powerstatsviewer/PowerStatsViewerActivity.java
@@ -29,6 +29,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.activity.ComponentActivity;
+import androidx.activity.result.ActivityResultLauncher;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.loader.app.LoaderManager;
@@ -60,6 +61,8 @@ public class PowerStatsViewerActivity extends ComponentActivity {
     private RecyclerView mPowerStatsDataView;
     private View mLoadingView;
     private View mEmptyView;
+    private ActivityResultLauncher<Void> mStartAppPicker = registerForActivityResult(
+            PowerConsumerPickerActivity.CONTRACT, this::onApplicationSelected);
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -105,8 +108,7 @@ public class PowerStatsViewerActivity extends ComponentActivity {
     }
 
     private void startAppPicker() {
-        registerForActivityResult(PowerConsumerPickerActivity.CONTRACT, this::onApplicationSelected)
-                .launch(null);
+        mStartAppPicker.launch(null);
     }
 
     private void onApplicationSelected(String powerConsumerId) {