Fixed stopMonitor() for when it's not called.

That happens when the user is managed.

Test: manual verification
Bug: 170143095

Change-Id: Ic4a160e9d0331acced324547ccaddb4a4c88b255

1 files changed, 13 insertions, 3 deletions

diff --git a/src/com/android/car/provision/DefaultActivity.java b/src/com/android/car/provision/DefaultActivity.java
index a0534cc..24d3b46 100644
--- a/src/com/android/car/provision/DefaultActivity.java
+++ b/src/com/android/car/provision/DefaultActivity.java
@@ -177,6 +177,7 @@ public final class DefaultActivity extends Activity {
     }
 
     private void startMonitor() {
+        Log.d(TAG, "startMonitor()");
         registerReceiver(mDrivingStateExitReceiver,
                 new IntentFilter(CarDrivingStateMonitor.EXIT_BROADCAST_ACTION));
 
@@ -270,13 +271,20 @@ public final class DefaultActivity extends Activity {
     }
 
     private void stopMonitor() {
+        Log.d(TAG, "stopMonitor()");
+
+        if (mCarDrivingStateMonitor == null) {
+            // Happens when device is managed (and startMonitor() is skipped)
+            Log.d(TAG, "Already stopped (or never stopped)");
+            return;
+        }
+
         if (mDrivingStateExitReceiver != null) {
             unregisterReceiver(mDrivingStateExitReceiver);
         }
 
-        if (mCarDrivingStateMonitor != null) {
-            mCarDrivingStateMonitor.stopMonitor();
-        }
+        mCarDrivingStateMonitor.stopMonitor();
+        mCarDrivingStateMonitor = null;
     }
 
     private void updateUi() {
@@ -475,6 +483,8 @@ public final class DefaultActivity extends Activity {
     }
 
     private void disableSelfAndFinish() {
+        Log.d(TAG, "disableSelfAndFinish()");
+
         // Remove this activity from the package manager.
         PackageManager pm = getPackageManager();
         ComponentName name = new ComponentName(this, DefaultActivity.class);