Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use UserSwitchObserver to detect switches in the running user am: 2be074c097

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20467945

Change-Id: I02b78af031ad09b43739dc8d60268c9452f9769c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Santiago Seifert
2022-11-16 03:14:34 +00:00
committed by Automerger Merge Worker
parent 197dab443e 2be074c097
commit 812b9f6e3f
2 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java
View File

@@ -601,10 +601,9 @@ class MediaRouter2ServiceImpl {
} }
} }
//TODO(b/136703681): Review this is handling multi-user properly. // TODO(b/136703681): Review this is handling multi-user properly.
void switchUser() { void switchUser(int userId) {
synchronized (mLock) { synchronized (mLock) {
int userId = ActivityManager.getCurrentUser();
if (mCurrentUserId != userId) { if (mCurrentUserId != userId) {
final int oldUserId = mCurrentUserId; final int oldUserId = mCurrentUserId;
mCurrentUserId = userId; // do this first mCurrentUserId = userId; // do this first

40
services/core/java/com/android/server/media/MediaRouterService.java
View File

@@ -17,7 +17,9 @@
package com.android.server.media; package com.android.server.media;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.RequiresPermission;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.UserSwitchObserver;
import android.bluetooth.BluetoothA2dp; import android.bluetooth.BluetoothA2dp;
import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothDevice;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
@@ -217,18 +219,27 @@ public final class MediaRouterService extends IMediaRouterService.Stub
context.registerReceiverAsUser(mReceiver, UserHandle.ALL, intentFilter, null, null); context.registerReceiverAsUser(mReceiver, UserHandle.ALL, intentFilter, null, null);
} }
public void systemRunning() { /**
IntentFilter filter = new IntentFilter(Intent.ACTION_USER_SWITCHED); * Initializes the MediaRouter service.
mContext.registerReceiver(new BroadcastReceiver() { *
@Override * @throws RemoteException If an error occurs while registering the {@link UserSwitchObserver}.
public void onReceive(Context context, Intent intent) { */
if (intent.getAction().equals(Intent.ACTION_USER_SWITCHED)) { @RequiresPermission(
switchUser(); anyOf = {
} "android.permission.INTERACT_ACROSS_USERS",
} "android.permission.INTERACT_ACROSS_USERS_FULL"
}, filter); })
public void systemRunning() throws RemoteException {
switchUser(); ActivityManager.getService()
.registerUserSwitchObserver(
new UserSwitchObserver() {
@Override
public void onUserSwitchComplete(int newUserId) {
switchUser(newUserId);
}
},
TAG);
switchUser(ActivityManager.getCurrentUser());
} }
@Override @Override
@@ -702,9 +713,8 @@ public final class MediaRouterService extends IMediaRouterService.Stub
} }
} }
void switchUser() { void switchUser(int userId) {
synchronized (mLock) { synchronized (mLock) {
int userId = ActivityManager.getCurrentUser();
if (mCurrentUserId != userId) { if (mCurrentUserId != userId) {
final int oldUserId = mCurrentUserId; final int oldUserId = mCurrentUserId;
mCurrentUserId = userId; // do this first mCurrentUserId = userId; // do this first
@@ -721,7 +731,7 @@ public final class MediaRouterService extends IMediaRouterService.Stub
} }
} }
} }
mService2.switchUser(); mService2.switchUser(userId);
} }
void clientDied(ClientRecord clientRecord) { void clientDied(ClientRecord clientRecord) {