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

Merge changes I363dc391,I84786697,I8d80872d,I4d6aa4d7,I396d376a into tm-qpr-dev

Browse Source 
* changes:
  Simplify MediaRouter2Manager.Client's lifecycle
  Remove unnecessary if checks
  Manage scan requests in MediaRouter2Manager
  Merge tests calling onStart and onStop
  Fix MediaOutputController resource management
This commit is contained in:
TreeHugger Robot
2022-09-24 00:15:31 +00:00
committed by Android (Google) Code Review
parent 59178368ee ea4e722810
commit 5926e155a3
7 changed files with 107 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
media/java/android/media/MediaRouter2.java
View File

@@ -48,6 +48,7 @@ import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -118,6 +119,7 @@ public final class MediaRouter2 {
private final Map<String, RoutingController> mNonSystemRoutingControllers = new ArrayMap<>(); private final Map<String, RoutingController> mNonSystemRoutingControllers = new ArrayMap<>();
private final AtomicInteger mNextRequestId = new AtomicInteger(1); private final AtomicInteger mNextRequestId = new AtomicInteger(1);
private final AtomicBoolean mIsScanning = new AtomicBoolean(/* initialValue= */ false);
final Handler mHandler; final Handler mHandler;
@@ -234,7 +236,9 @@ public final class MediaRouter2 {
@RequiresPermission(Manifest.permission.MEDIA_CONTENT_CONTROL) @RequiresPermission(Manifest.permission.MEDIA_CONTENT_CONTROL)
public void startScan() { public void startScan() {
if (isSystemRouter()) { if (isSystemRouter()) {
sManager.startScan(); if (!mIsScanning.getAndSet(true)) {
sManager.registerScanRequest();
}
} }
} }
@@ -260,7 +264,9 @@ public final class MediaRouter2 {
@RequiresPermission(Manifest.permission.MEDIA_CONTENT_CONTROL) @RequiresPermission(Manifest.permission.MEDIA_CONTENT_CONTROL)
public void stopScan() { public void stopScan() {
if (isSystemRouter()) { if (isSystemRouter()) {
sManager.stopScan(); if (mIsScanning.getAndSet(false)) {
sManager.unregisterScanRequest();
}
} }
} }

197
media/java/android/media/MediaRouter2Manager.java
View File

@@ -79,9 +79,11 @@ public final class MediaRouter2Manager {
final String mPackageName; final String mPackageName;
private final Context mContext; private final Context mContext;
@GuardedBy("sLock")
private Client mClient; private final Client mClient;
private final IMediaRouterService mMediaRouterService; private final IMediaRouterService mMediaRouterService;
private final AtomicInteger mScanRequestCount = new AtomicInteger(/* initialValue= */ 0);
final Handler mHandler; final Handler mHandler;
final CopyOnWriteArrayList<CallbackRecord> mCallbackRecords = new CopyOnWriteArrayList<>(); final CopyOnWriteArrayList<CallbackRecord> mCallbackRecords = new CopyOnWriteArrayList<>();
@@ -119,7 +121,12 @@ public final class MediaRouter2Manager {
.getSystemService(Context.MEDIA_SESSION_SERVICE); .getSystemService(Context.MEDIA_SESSION_SERVICE);
mPackageName = mContext.getPackageName(); mPackageName = mContext.getPackageName();
mHandler = new Handler(context.getMainLooper()); mHandler = new Handler(context.getMainLooper());
mHandler.post(this::getOrCreateClient); mClient = new Client();
try {
mMediaRouterService.registerManager(mClient, mPackageName);
} catch (RemoteException ex) {
throw ex.rethrowFromSystemServer();
}
} }
/** /**
@@ -155,22 +162,18 @@ public final class MediaRouter2Manager {
} }
/** /**
* Starts scanning remote routes. * Registers a request to scan for remote routes.
* <p> *
* Route discovery can happen even when the {@link #startScan()} is not called. * <p>Increases the count of active scanning requests. When the count transitions from zero to
* This is because the scanning could be started before by other apps. * one, sends a request to the system server to start scanning.
* Therefore, calling this method after calling {@link #stopScan()} does not necessarily mean *
* that the routes found before are removed and added again. * <p>Clients must {@link #unregisterScanRequest() unregister their scan requests} when scanning
* <p> * is no longer needed, to avoid unnecessary resource usage.
* Use {@link Callback} to get the route related events.
* <p>
* @see #stopScan()
*/ */
public void startScan() { public void registerScanRequest() {
Client client = getOrCreateClient(); if (mScanRequestCount.getAndIncrement() == 0) {
if (client != null) {
try { try {
mMediaRouterService.startScan(client); mMediaRouterService.startScan(mClient);
} catch (RemoteException ex) { } catch (RemoteException ex) {
throw ex.rethrowFromSystemServer(); throw ex.rethrowFromSystemServer();
} }
@@ -178,23 +181,26 @@ public final class MediaRouter2Manager {
} }
/** /**
* Stops scanning remote routes to reduce resource consumption. * Unregisters a scan request made by {@link #registerScanRequest()}.
* <p>
* Route discovery can be continued even after this method is called.
* This is because the scanning is only turned off when all the apps stop scanning.
* Therefore, calling this method does not necessarily mean the routes are removed.
* Also, for the same reason it does not mean that {@link Callback#onRoutesAdded(List)}
* is not called afterwards.
* <p>
* Use {@link Callback} to get the route related events.
* *
* @see #startScan() * <p>Decreases the count of active scanning requests. When the count transitions from one to
* zero, sends a request to the system server to stop scanning.
*
* @throws IllegalStateException If called while there are no active scan requests.
*/ */
public void stopScan() { public void unregisterScanRequest() {
Client client = getOrCreateClient(); if (mScanRequestCount.updateAndGet(
if (client != null) { count -> {
if (count == 0) {
throw new IllegalStateException(
"No active scan requests to unregister.");
} else {
return --count;
}
})
== 0) {
try { try {
mMediaRouterService.stopScan(client); mMediaRouterService.stopScan(mClient);
} catch (RemoteException ex) { } catch (RemoteException ex) {
throw ex.rethrowFromSystemServer(); throw ex.rethrowFromSystemServer();
} }
@@ -358,8 +364,7 @@ public final class MediaRouter2Manager {
@Nullable @Nullable
public RoutingSessionInfo getSystemRoutingSession(@Nullable String packageName) { public RoutingSessionInfo getSystemRoutingSession(@Nullable String packageName) {
try { try {
return mMediaRouterService.getSystemSessionInfoForPackage( return mMediaRouterService.getSystemSessionInfoForPackage(mClient, packageName);
getOrCreateClient(), packageName);
} catch (RemoteException ex) { } catch (RemoteException ex) {
throw ex.rethrowFromSystemServer(); throw ex.rethrowFromSystemServer();
} }
@@ -423,15 +428,11 @@ public final class MediaRouter2Manager {
*/ */
@NonNull @NonNull
public List<RoutingSessionInfo> getRemoteSessions() { public List<RoutingSessionInfo> getRemoteSessions() {
Client client = getOrCreateClient(); try {
if (client != null) { return mMediaRouterService.getRemoteSessions(mClient);
try { } catch (RemoteException ex) {
return mMediaRouterService.getRemoteSessions(client); throw ex.rethrowFromSystemServer();
} catch (RemoteException ex) {
throw ex.rethrowFromSystemServer();
}
} }
return Collections.emptyList();
} }
/** /**
@@ -514,14 +515,11 @@ public final class MediaRouter2Manager {
return; return;
} }
Client client = getOrCreateClient(); try {
if (client != null) { int requestId = mNextRequestId.getAndIncrement();
try { mMediaRouterService.setRouteVolumeWithManager(mClient, requestId, route, volume);
int requestId = mNextRequestId.getAndIncrement(); } catch (RemoteException ex) {
mMediaRouterService.setRouteVolumeWithManager(client, requestId, route, volume); throw ex.rethrowFromSystemServer();
} catch (RemoteException ex) {
throw ex.rethrowFromSystemServer();
}
} }
} }
@@ -543,15 +541,12 @@ public final class MediaRouter2Manager {
return; return;
} }
Client client = getOrCreateClient(); try {
if (client != null) { int requestId = mNextRequestId.getAndIncrement();
try { mMediaRouterService.setSessionVolumeWithManager(
int requestId = mNextRequestId.getAndIncrement(); mClient, requestId, sessionInfo.getId(), volume);
mMediaRouterService.setSessionVolumeWithManager( } catch (RemoteException ex) {
client, requestId, sessionInfo.getId(), volume); throw ex.rethrowFromSystemServer();
} catch (RemoteException ex) {
throw ex.rethrowFromSystemServer();
}
} }
} }
@@ -808,15 +803,12 @@ public final class MediaRouter2Manager {
return; return;
} }
Client client = getOrCreateClient(); try {
if (client != null) { int requestId = mNextRequestId.getAndIncrement();
try { mMediaRouterService.selectRouteWithManager(
int requestId = mNextRequestId.getAndIncrement(); mClient, requestId, sessionInfo.getId(), route);
mMediaRouterService.selectRouteWithManager( } catch (RemoteException ex) {
client, requestId, sessionInfo.getId(), route); throw ex.rethrowFromSystemServer();
} catch (RemoteException ex) {
throw ex.rethrowFromSystemServer();
}
} }
} }
@@ -850,15 +842,12 @@ public final class MediaRouter2Manager {
return; return;
} }
Client client = getOrCreateClient(); try {
if (client != null) { int requestId = mNextRequestId.getAndIncrement();
try { mMediaRouterService.deselectRouteWithManager(
int requestId = mNextRequestId.getAndIncrement(); mClient, requestId, sessionInfo.getId(), route);
mMediaRouterService.deselectRouteWithManager( } catch (RemoteException ex) {
client, requestId, sessionInfo.getId(), route); throw ex.rethrowFromSystemServer();
} catch (RemoteException ex) {
throw ex.rethrowFromSystemServer();
}
} }
} }
@@ -875,15 +864,11 @@ public final class MediaRouter2Manager {
public void releaseSession(@NonNull RoutingSessionInfo sessionInfo) { public void releaseSession(@NonNull RoutingSessionInfo sessionInfo) {
Objects.requireNonNull(sessionInfo, "sessionInfo must not be null"); Objects.requireNonNull(sessionInfo, "sessionInfo must not be null");
Client client = getOrCreateClient(); try {
if (client != null) { int requestId = mNextRequestId.getAndIncrement();
try { mMediaRouterService.releaseSessionWithManager(mClient, requestId, sessionInfo.getId());
int requestId = mNextRequestId.getAndIncrement(); } catch (RemoteException ex) {
mMediaRouterService.releaseSessionWithManager( throw ex.rethrowFromSystemServer();
client, requestId, sessionInfo.getId());
} catch (RemoteException ex) {
throw ex.rethrowFromSystemServer();
}
} }
} }
@@ -896,14 +881,11 @@ public final class MediaRouter2Manager {
@NonNull MediaRoute2Info route) { @NonNull MediaRoute2Info route) {
int requestId = createTransferRequest(session, route); int requestId = createTransferRequest(session, route);
Client client = getOrCreateClient(); try {
if (client != null) { mMediaRouterService.transferToRouteWithManager(
try { mClient, requestId, session.getId(), route);
mMediaRouterService.transferToRouteWithManager( } catch (RemoteException ex) {
client, requestId, session.getId(), route); throw ex.rethrowFromSystemServer();
} catch (RemoteException ex) {
throw ex.rethrowFromSystemServer();
}
} }
} }
@@ -916,14 +898,11 @@ public final class MediaRouter2Manager {
int requestId = createTransferRequest(oldSession, route); int requestId = createTransferRequest(oldSession, route);
Client client = getOrCreateClient(); try {
if (client != null) { mMediaRouterService.requestCreateSessionWithManager(
try { mClient, requestId, oldSession, route);
mMediaRouterService.requestCreateSessionWithManager( } catch (RemoteException ex) {
client, requestId, oldSession, route); throw ex.rethrowFromSystemServer();
} catch (RemoteException ex) {
throw ex.rethrowFromSystemServer();
}
} }
} }
@@ -967,22 +946,6 @@ public final class MediaRouter2Manager {
sessionInfo.getOwnerPackageName()); sessionInfo.getOwnerPackageName());
} }
private Client getOrCreateClient() {
synchronized (sLock) {
if (mClient != null) {
return mClient;
}
Client client = new Client();
try {
mMediaRouterService.registerManager(client, mPackageName);
mClient = client;
return client;
} catch (RemoteException ex) {
throw ex.rethrowFromSystemServer();
}
}
}
/** /**
* Interface for receiving events about media routing changes. * Interface for receiving events about media routing changes.
*/ */

12
media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouter2ManagerTest.java
View File

@@ -39,6 +39,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import android.Manifest; import android.Manifest;
@@ -121,7 +122,7 @@ public class MediaRouter2ManagerTest {
MediaRouter2ManagerTestActivity.startActivity(mContext); MediaRouter2ManagerTestActivity.startActivity(mContext);
mManager = MediaRouter2Manager.getInstance(mContext); mManager = MediaRouter2Manager.getInstance(mContext);
mManager.startScan(); mManager.registerScanRequest();
mRouter2 = MediaRouter2.getInstance(mContext); mRouter2 = MediaRouter2.getInstance(mContext);
// If we need to support thread pool executors, change this to thread pool executor. // If we need to support thread pool executors, change this to thread pool executor.
@@ -152,7 +153,7 @@ public class MediaRouter2ManagerTest {
@After @After
public void tearDown() { public void tearDown() {
mManager.stopScan(); mManager.unregisterScanRequest();
// order matters (callbacks should be cleared at the last) // order matters (callbacks should be cleared at the last)
releaseAllSessions(); releaseAllSessions();
@@ -818,6 +819,13 @@ public class MediaRouter2ManagerTest {
assertFalse(failureLatch.await(WAIT_TIME_MS, TimeUnit.MILLISECONDS)); assertFalse(failureLatch.await(WAIT_TIME_MS, TimeUnit.MILLISECONDS));
} }
@Test
public void unregisterScanRequest_enforcesANonNegativeCount() {
mManager.unregisterScanRequest(); // One request was made in the test setup.
assertThrows(IllegalStateException.class, () -> mManager.unregisterScanRequest());
mManager.registerScanRequest(); // So that the cleanup doesn't fail.
}
/** /**
* Tests if getSelectableRoutes and getDeselectableRoutes filter routes based on * Tests if getSelectableRoutes and getDeselectableRoutes filter routes based on
* selected routes * selected routes

4
packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java
View File

@@ -96,14 +96,14 @@ public class InfoMediaManager extends MediaManager {
public void startScan() { public void startScan() {
mMediaDevices.clear(); mMediaDevices.clear();
mRouterManager.registerCallback(mExecutor, mMediaRouterCallback); mRouterManager.registerCallback(mExecutor, mMediaRouterCallback);
mRouterManager.startScan(); mRouterManager.registerScanRequest();
refreshDevices(); refreshDevices();
} }
@Override @Override
public void stopScan() { public void stopScan() {
mRouterManager.unregisterCallback(mMediaRouterCallback); mRouterManager.unregisterCallback(mMediaRouterCallback);
mRouterManager.stopScan(); mRouterManager.unregisterScanRequest();
} }
/** /**

22
packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java
View File

@@ -224,15 +224,7 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback,
Log.d(TAG, "No media controller for " + mPackageName); Log.d(TAG, "No media controller for " + mPackageName);
} }
} }
if (mLocalMediaManager == null) {
if (DEBUG) {
Log.d(TAG, "No local media manager " + mPackageName);
}
return;
}
mCallback = cb; mCallback = cb;
mLocalMediaManager.unregisterCallback(this);
mLocalMediaManager.stopScan();
mLocalMediaManager.registerCallback(this); mLocalMediaManager.registerCallback(this);
mLocalMediaManager.startScan(); mLocalMediaManager.startScan();
} }
@@ -254,10 +246,8 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback,
if (mMediaController != null) { if (mMediaController != null) {
mMediaController.unregisterCallback(mCb); mMediaController.unregisterCallback(mCb);
} }
if (mLocalMediaManager != null) { mLocalMediaManager.unregisterCallback(this);
mLocalMediaManager.unregisterCallback(this); mLocalMediaManager.stopScan();
mLocalMediaManager.stopScan();
}
synchronized (mMediaDevicesLock) { synchronized (mMediaDevicesLock) {
mCachedMediaDevices.clear(); mCachedMediaDevices.clear();
mMediaDevices.clear(); mMediaDevices.clear();
@@ -661,10 +651,6 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback,
return mLocalMediaManager.getCurrentConnectedDevice(); return mLocalMediaManager.getCurrentConnectedDevice();
} }
private MediaDevice getMediaDeviceById(String id) {
return mLocalMediaManager.getMediaDeviceById(new ArrayList<>(mMediaDevices), id);
}
boolean addDeviceToPlayMedia(MediaDevice device) { boolean addDeviceToPlayMedia(MediaDevice device) {
mMetricLogger.logInteractionExpansion(device); mMetricLogger.logInteractionExpansion(device);
return mLocalMediaManager.addDeviceToPlayMedia(device); return mLocalMediaManager.addDeviceToPlayMedia(device);
@@ -686,10 +672,6 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback,
return mLocalMediaManager.getDeselectableMediaDevice(); return mLocalMediaManager.getDeselectableMediaDevice();
} }
void adjustSessionVolume(String sessionId, int volume) {
mLocalMediaManager.adjustSessionVolume(sessionId, volume);
}
void adjustSessionVolume(int volume) { void adjustSessionVolume(int volume) {
mLocalMediaManager.adjustSessionVolume(volume); mLocalMediaManager.adjustSessionVolume(volume);
} }

27
packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputBaseDialogTest.java
View File

@@ -241,46 +241,29 @@ public class MediaOutputBaseDialogTest extends SysuiTestCase {
} }
@Test @Test
public void onStart_isBroadcasting_verifyRegisterLeBroadcastServiceCallBack() { public void whenBroadcasting_verifyLeBroadcastServiceCallBackIsRegisteredAndUnregistered() {
when(mLocalBluetoothProfileManager.getLeAudioBroadcastProfile()).thenReturn( when(mLocalBluetoothProfileManager.getLeAudioBroadcastProfile()).thenReturn(
mLocalBluetoothLeBroadcast); mLocalBluetoothLeBroadcast);
mIsBroadcasting = true; mIsBroadcasting = true;
mMediaOutputBaseDialogImpl.onStart(); mMediaOutputBaseDialogImpl.onStart();
verify(mLocalBluetoothLeBroadcast).registerServiceCallBack(any(), any()); verify(mLocalBluetoothLeBroadcast).registerServiceCallBack(any(), any());
}
@Test
public void onStart_notBroadcasting_noRegisterLeBroadcastServiceCallBack() {
when(mLocalBluetoothProfileManager.getLeAudioBroadcastProfile()).thenReturn(
mLocalBluetoothLeBroadcast);
mIsBroadcasting = false;
mMediaOutputBaseDialogImpl.onStart();
verify(mLocalBluetoothLeBroadcast, never()).registerServiceCallBack(any(), any());
}
@Test
public void onStart_isBroadcasting_verifyUnregisterLeBroadcastServiceCallBack() {
when(mLocalBluetoothProfileManager.getLeAudioBroadcastProfile()).thenReturn(
mLocalBluetoothLeBroadcast);
mIsBroadcasting = true;
mMediaOutputBaseDialogImpl.onStop(); mMediaOutputBaseDialogImpl.onStop();
verify(mLocalBluetoothLeBroadcast).unregisterServiceCallBack(any()); verify(mLocalBluetoothLeBroadcast).unregisterServiceCallBack(any());
} }
@Test @Test
public void onStop_notBroadcasting_noUnregisterLeBroadcastServiceCallBack() { public void
whenNotBroadcasting_verifyLeBroadcastServiceCallBackIsNotRegisteredOrUnregistered() {
when(mLocalBluetoothProfileManager.getLeAudioBroadcastProfile()).thenReturn( when(mLocalBluetoothProfileManager.getLeAudioBroadcastProfile()).thenReturn(
mLocalBluetoothLeBroadcast); mLocalBluetoothLeBroadcast);
mIsBroadcasting = false; mIsBroadcasting = false;
mMediaOutputBaseDialogImpl.onStart();
mMediaOutputBaseDialogImpl.onStop(); mMediaOutputBaseDialogImpl.onStop();
verify(mLocalBluetoothLeBroadcast, never()).registerServiceCallBack(any(), any());
verify(mLocalBluetoothLeBroadcast, never()).unregisterServiceCallBack(any()); verify(mLocalBluetoothLeBroadcast, never()).unregisterServiceCallBack(any());
} }

9
packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputControllerTest.java
View File

@@ -170,15 +170,6 @@ public class MediaOutputControllerTest extends SysuiTestCase {
verify(mLocalMediaManager).startScan(); verify(mLocalMediaManager).startScan();
} }
@Test
public void start_LocalMediaManagerIsNull_verifyNotStartScan() {
mMediaOutputController.mLocalMediaManager = null;
mMediaOutputController.start(mCb);
verify(mLocalMediaManager, never()).registerCallback(mMediaOutputController);
verify(mLocalMediaManager, never()).startScan();
}
@Test @Test
public void stop_verifyLocalMediaManagerDeinit() { public void stop_verifyLocalMediaManagerDeinit() {
mMediaOutputController.start(mCb); mMediaOutputController.start(mCb);