Changed FallbackHome to finish itself more aggressively. am: 1138d78793 am: 4f03198d0a
am: 0b83fc1a4d

Change-Id: I9474a86adfbe2ed5f793b85b5f90159073ee675d
diff --git a/src/com/android/car/settings/FallbackHome.java b/src/com/android/car/settings/FallbackHome.java
index af54378..6f4b455 100644
--- a/src/com/android/car/settings/FallbackHome.java
+++ b/src/com/android/car/settings/FallbackHome.java
@@ -87,6 +87,7 @@
     @Override
     protected void onResume() {
         super.onResume();
+        LOG.d("onResume() for user " + getUserId() + ". Provisioned: " + mProvisioned);
         if (mProvisioned) {
             mHandler.postDelayed(mProgressTimeoutRunnable, PROGRESS_TIMEOUT);
         }
@@ -122,13 +123,15 @@
                     // SUW and this activity continues to throw out warnings. See b/28870689.
                     return;
                 }
-                LOG.d("User unlocked but no home; let's hope someone enables one soon?");
+                LOG.d("User " + getUserId() + " unlocked but no home; let's hope someone enables "
+                        + "one soon?");
                 mHandler.sendEmptyMessageDelayed(0, 500);
             } else {
-                LOG.d("User unlocked and real home found; let's go!");
+                LOG.d("User " + getUserId() + " unlocked and real home ("
+                        + homeInfo.activityInfo.packageName + ") found; let's go!");
                 getSystemService(PowerManager.class).userActivity(
                         SystemClock.uptimeMillis(), false);
-                finish();
+                finishAndRemoveTask();
             }
         }
     }