Changed FallbackHome to finish itself more aggressively. am: 1138d78793
Change-Id: I14c194baaf3970807679e639971f5bd79783239d
diff --git a/src/com/android/car/settings/FallbackHome.java b/src/com/android/car/settings/FallbackHome.java
index 41ef281..61b0ac6 100644
--- a/src/com/android/car/settings/FallbackHome.java
+++ b/src/com/android/car/settings/FallbackHome.java
@@ -117,6 +117,7 @@
@Override
protected void onResume() {
super.onResume();
+ LOG.d("onResume() for user " + getUserId() + ". Provisioned: " + mProvisioned);
if (mProvisioned) {
mHandler.postDelayed(mProgressTimeoutRunnable, PROGRESS_TIMEOUT);
}
@@ -155,13 +156,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();
}
}
}