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

Remove unnecessary if checks

Browse Source 
This is a cherrypick of commit 58fb7d617d.

Bug: 239926177
Test: atest mediaroutertest CtsMediaBetterTogetherTestCases
Change-Id: I8478669747ca291d92b825e205f58add76e9a2a2
Merged-In: I8478669747ca291d92b825e205f58add76e9a2a2
This commit is contained in:
Santiago Seifert
2022-07-22 13:44:58 +00:00
parent cbca646e97
commit 0952e0377e
1 changed files with 46 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -166,9 +166,8 @@ public final class MediaRouter2Manager {
*/ */
public void registerScanRequest() { public void registerScanRequest() {
if (mScanRequestCount.getAndIncrement() == 0) { if (mScanRequestCount.getAndIncrement() == 0) {
Client client = getOrCreateClient();
try { try {
mMediaRouterService.startScan(client); mMediaRouterService.startScan(getOrCreateClient());
} catch (RemoteException ex) { } catch (RemoteException ex) {
throw ex.rethrowFromSystemServer(); throw ex.rethrowFromSystemServer();
} }
@@ -194,9 +193,8 @@ public final class MediaRouter2Manager {
} }
}) })
== 0) { == 0) {
Client client = getOrCreateClient();
try { try {
mMediaRouterService.stopScan(client); mMediaRouterService.stopScan(getOrCreateClient());
} catch (RemoteException ex) { } catch (RemoteException ex) {
throw ex.rethrowFromSystemServer(); throw ex.rethrowFromSystemServer();
} }
@@ -425,15 +423,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(getOrCreateClient());
try { } catch (RemoteException ex) {
return mMediaRouterService.getRemoteSessions(client); throw ex.rethrowFromSystemServer();
} catch (RemoteException ex) {
throw ex.rethrowFromSystemServer();
}
} }
return Collections.emptyList();
} }
/** /**
@@ -516,14 +510,12 @@ public final class MediaRouter2Manager {
return; return;
} }
Client client = getOrCreateClient(); try {
if (client != null) { int requestId = mNextRequestId.getAndIncrement();
try { mMediaRouterService.setRouteVolumeWithManager(
int requestId = mNextRequestId.getAndIncrement(); getOrCreateClient(), requestId, route, volume);
mMediaRouterService.setRouteVolumeWithManager(client, requestId, route, volume); } catch (RemoteException ex) {
} catch (RemoteException ex) { throw ex.rethrowFromSystemServer();
throw ex.rethrowFromSystemServer();
}
} }
} }
@@ -545,15 +537,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(); getOrCreateClient(), requestId, sessionInfo.getId(), volume);
mMediaRouterService.setSessionVolumeWithManager( } catch (RemoteException ex) {
client, requestId, sessionInfo.getId(), volume); throw ex.rethrowFromSystemServer();
} catch (RemoteException ex) {
throw ex.rethrowFromSystemServer();
}
} }
} }
@@ -810,15 +799,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(); getOrCreateClient(), requestId, sessionInfo.getId(), route);
mMediaRouterService.selectRouteWithManager( } catch (RemoteException ex) {
client, requestId, sessionInfo.getId(), route); throw ex.rethrowFromSystemServer();
} catch (RemoteException ex) {
throw ex.rethrowFromSystemServer();
}
} }
} }
@@ -852,15 +838,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(); getOrCreateClient(), requestId, sessionInfo.getId(), route);
mMediaRouterService.deselectRouteWithManager( } catch (RemoteException ex) {
client, requestId, sessionInfo.getId(), route); throw ex.rethrowFromSystemServer();
} catch (RemoteException ex) {
throw ex.rethrowFromSystemServer();
}
} }
} }
@@ -877,15 +860,12 @@ 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(
int requestId = mNextRequestId.getAndIncrement(); getOrCreateClient(), requestId, sessionInfo.getId());
mMediaRouterService.releaseSessionWithManager( } catch (RemoteException ex) {
client, requestId, sessionInfo.getId()); throw ex.rethrowFromSystemServer();
} catch (RemoteException ex) {
throw ex.rethrowFromSystemServer();
}
} }
} }
@@ -898,14 +878,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 { getOrCreateClient(), requestId, session.getId(), route);
mMediaRouterService.transferToRouteWithManager( } catch (RemoteException ex) {
client, requestId, session.getId(), route); throw ex.rethrowFromSystemServer();
} catch (RemoteException ex) {
throw ex.rethrowFromSystemServer();
}
} }
} }
@@ -918,14 +895,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 { getOrCreateClient(), requestId, oldSession, route);
mMediaRouterService.requestCreateSessionWithManager( } catch (RemoteException ex) {
client, requestId, oldSession, route); throw ex.rethrowFromSystemServer();
} catch (RemoteException ex) {
throw ex.rethrowFromSystemServer();
}
} }
} }