Snap for 8265895 from 13ddf517dccd5ef97530cf6892af53cc9619fe43 to pie-cts-release

Change-Id: Iae8d240c2d10987ff214e9d5859e5b8181a1ede8

1 files changed, 8 insertions, 3 deletions

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BleClientTestBaseActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BleClientTestBaseActivity.java
index b5220f8caf7..a843749dd76 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BleClientTestBaseActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BleClientTestBaseActivity.java
@@ -102,8 +102,8 @@ public class BleClientTestBaseActivity extends PassFailButtons.Activity {
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
+    public void onStart() {
+        super.onStart();
 
         IntentFilter filter = new IntentFilter();
         filter.addAction(BleClientService.BLE_BLUETOOTH_CONNECTED);
@@ -135,10 +135,15 @@ public class BleClientTestBaseActivity extends PassFailButtons.Activity {
     @Override
     public void onPause() {
         super.onPause();
-        unregisterReceiver(mBroadcast);
         closeDialog();
     }
 
+    @Override
+    public void onStop() {
+        super.onStop();
+        unregisterReceiver(mBroadcast);
+    }
+
     private synchronized void closeDialog() {
         if (mDialog != null) {
             mDialog.dismiss();