summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2022-02-01 01:43:24 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2022-02-01 01:43:24 +0000
commitb4e18f830495727034bb27c47704eac6ff3a0ea2 (patch)
tree289c033e686cbacbd5ac06cfc8a345733f5ff0ab
parent1c7826e338ffb2c4ead749ec53bcd1924693ff08 (diff)
parentde3d1ca142dfc5090e8a44780831c1283dcf06d2 (diff)
downloadCluster-b4e18f830495727034bb27c47704eac6ff3a0ea2.tar.gz
Merge "Ignore UserLifecyleEvent from non-current user." into sc-v2-dev
-rw-r--r--ClusterHomeSample/src/com/android/car/cluster/home/ClusterHomeApplication.java5
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 3f0b924..86b8d30 100644
--- a/ClusterHomeSample/src/com/android/car/cluster/home/ClusterHomeApplication.java
+++ b/ClusterHomeSample/src/com/android/car/cluster/home/ClusterHomeApplication.java
@@ -251,6 +251,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);
@@ -266,6 +270,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;