commit 2878d14ae7a8599d25b8641367ff103c9cc26450
author Yuncheol Heo <ycheo@google.com> Mon Nov 11 19:08:50 2019 -0800
committer Yuncheol Heo <ycheo@google.com> Tue Dec 10 19:49:41 2019 -0800
tree 101b209004c47193dc7e8ccb5a9bd20dcc1f60ab
parent babd90f8ca69ef046301ed04adc8ad748d4a4a07

Fix the issue that Cluster-showing when switching a user.

Bug: 144214625
Test: check if Cluster shouldn't show when creating a new user.
Change-Id: I084cb5754e59caf47f3d853547353da521ac586d

src/android/car/cluster/ClusterRenderingService.java

diff --git a/src/android/car/cluster/ClusterRenderingService.java b/src/android/car/cluster/ClusterRenderingService.java
index 2d2987b..8d0cafa 100644
--- a/src/android/car/cluster/ClusterRenderingService.java
+++ b/src/android/car/cluster/ClusterRenderingService.java
@@ -395,8 +395,7 @@
     private class UserReceiver extends BroadcastReceiver {
         void register(Context context) {
             IntentFilter intentFilter = new IntentFilter(ACTION_USER_UNLOCKED);
-            intentFilter.addAction(ACTION_USER_SWITCHED);
-            context.registerReceiver(this, intentFilter);
+            context.registerReceiverAsUser(this, UserHandle.ALL, intentFilter, null, null);
         }
 
         void unregister(Context context) {
@@ -408,7 +407,11 @@
             if (Log.isLoggable(TAG, Log.DEBUG)) {
                 Log.d(TAG, "Broadcast received: " + intent);
             }
-            mHandler.post(mLaunchMainActivity);
+            int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_NULL);
+            if (userId == ActivityManager.getCurrentUser() &&
+                mInstrumentClusterHelperReady && mClusterDisplayId != INVALID_DISPLAY) {
+                mHandler.post(mLaunchMainActivity);
+            }
         }
     }
 }