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