Ignore UserLifecyleEvent from non-current user.

Bug: 208833874
Test: switch user and change ClusterActivity.
Change-Id: Id806ef6e16e16afc5bde48ee35d0b6b65caf89c6

1 files changed, 5 insertions, 0 deletions

diff --git a/ClusterHomeSample/src/com/android/car/cluster/home/ClusterHomeApplication.java b/ClusterHomeSample/src/com/android/car/cluster/home/ClusterHomeApplication.java
index f37eb0e..528a0d4 100644
--- a/ClusterHomeSample/src/com/android/car/cluster/home/ClusterHomeApplication.java
+++ b/ClusterHomeSample/src/com/android/car/cluster/home/ClusterHomeApplication.java
@@ -253,6 +253,10 @@ public final class ClusterHomeApplication extends Application {
     }
 
     private final UserLifecycleListener mUserLifecycleListener = (event) -> {
+        if (DBG) Log.d(TAG, "UserLifecycleListener.onEvent: event=" + event);
+        if (event.getUserId() != ActivityManager.getCurrentUser()) {
+            return;
+        }
         mUserLifeCycleEvent = event.getEventType();
         if (mUserLifeCycleEvent == USER_LIFECYCLE_EVENT_TYPE_STARTING) {
             startClusterActivity(UI_TYPE_HOME);
@@ -271,6 +275,7 @@ public final class ClusterHomeApplication extends Application {
     };
 
     private void onKeyEvent(KeyEvent keyEvent) {
+        if (DBG) Log.d(TAG, "onKeyEvent: " + keyEvent);
         if (keyEvent.getKeyCode() == KeyEvent.KEYCODE_MENU) {
             if (keyEvent.getAction() != KeyEvent.ACTION_DOWN) return;
             int nextUiType = (mLastLaunchedUiType + 1) % mUiAvailability.length;