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

Rethrow MediaRouter2Manager RemoteExceptions am: 0541c4e942

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

Change-Id: I6d54f53b7b2c3471adca472b8b2fe31145c29ed6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Santiago Seifert
2022-09-23 22:34:41 +00:00
committed by Automerger Merge Worker
parent 5091fea063 0541c4e942
commit 006c51319f
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -172,7 +172,7 @@ public final class MediaRouter2Manager {
try { try {
mMediaRouterService.startScan(client); mMediaRouterService.startScan(client);
} catch (RemoteException ex) { } catch (RemoteException ex) {
Log.e(TAG, "Unable to get sessions. Service probably died.", ex); throw ex.rethrowFromSystemServer();
} }
} }
} }
@@ -196,7 +196,7 @@ public final class MediaRouter2Manager {
try { try {
mMediaRouterService.stopScan(client); mMediaRouterService.stopScan(client);
} catch (RemoteException ex) { } catch (RemoteException ex) {
Log.e(TAG, "Unable to get sessions. Service probably died.", ex); throw ex.rethrowFromSystemServer();
} }
} }
} }
@@ -361,9 +361,8 @@ public final class MediaRouter2Manager {
return mMediaRouterService.getSystemSessionInfoForPackage( return mMediaRouterService.getSystemSessionInfoForPackage(
getOrCreateClient(), packageName); getOrCreateClient(), packageName);
} catch (RemoteException ex) { } catch (RemoteException ex) {
Log.e(TAG, "Unable to get current system session info", ex); throw ex.rethrowFromSystemServer();
} }
return null;
} }
/** /**
@@ -429,7 +428,7 @@ public final class MediaRouter2Manager {
try { try {
return mMediaRouterService.getRemoteSessions(client); return mMediaRouterService.getRemoteSessions(client);
} catch (RemoteException ex) { } catch (RemoteException ex) {
Log.e(TAG, "Unable to get sessions. Service probably died.", ex); throw ex.rethrowFromSystemServer();
} }
} }
return Collections.emptyList(); return Collections.emptyList();
@@ -521,7 +520,7 @@ public final class MediaRouter2Manager {
int requestId = mNextRequestId.getAndIncrement(); int requestId = mNextRequestId.getAndIncrement();
mMediaRouterService.setRouteVolumeWithManager(client, requestId, route, volume); mMediaRouterService.setRouteVolumeWithManager(client, requestId, route, volume);
} catch (RemoteException ex) { } catch (RemoteException ex) {
Log.e(TAG, "Unable to set route volume.", ex); throw ex.rethrowFromSystemServer();
} }
} }
} }
@@ -551,7 +550,7 @@ public final class MediaRouter2Manager {
mMediaRouterService.setSessionVolumeWithManager( mMediaRouterService.setSessionVolumeWithManager(
client, requestId, sessionInfo.getId(), volume); client, requestId, sessionInfo.getId(), volume);
} catch (RemoteException ex) { } catch (RemoteException ex) {
Log.e(TAG, "Unable to set session volume.", ex); throw ex.rethrowFromSystemServer();
} }
} }
} }
@@ -816,7 +815,7 @@ public final class MediaRouter2Manager {
mMediaRouterService.selectRouteWithManager( mMediaRouterService.selectRouteWithManager(
client, requestId, sessionInfo.getId(), route); client, requestId, sessionInfo.getId(), route);
} catch (RemoteException ex) { } catch (RemoteException ex) {
Log.e(TAG, "selectRoute: Failed to send a request.", ex); throw ex.rethrowFromSystemServer();
} }
} }
} }
@@ -858,7 +857,7 @@ public final class MediaRouter2Manager {
mMediaRouterService.deselectRouteWithManager( mMediaRouterService.deselectRouteWithManager(
client, requestId, sessionInfo.getId(), route); client, requestId, sessionInfo.getId(), route);
} catch (RemoteException ex) { } catch (RemoteException ex) {
Log.e(TAG, "deselectRoute: Failed to send a request.", ex); throw ex.rethrowFromSystemServer();
} }
} }
} }
@@ -883,7 +882,7 @@ public final class MediaRouter2Manager {
mMediaRouterService.releaseSessionWithManager( mMediaRouterService.releaseSessionWithManager(
client, requestId, sessionInfo.getId()); client, requestId, sessionInfo.getId());
} catch (RemoteException ex) { } catch (RemoteException ex) {
Log.e(TAG, "releaseSession: Failed to send a request", ex); throw ex.rethrowFromSystemServer();
} }
} }
} }
@@ -903,7 +902,7 @@ public final class MediaRouter2Manager {
mMediaRouterService.transferToRouteWithManager( mMediaRouterService.transferToRouteWithManager(
client, requestId, session.getId(), route); client, requestId, session.getId(), route);
} catch (RemoteException ex) { } catch (RemoteException ex) {
Log.e(TAG, "transferToRoute: Failed to send a request.", ex); throw ex.rethrowFromSystemServer();
} }
} }
} }
@@ -923,7 +922,7 @@ public final class MediaRouter2Manager {
mMediaRouterService.requestCreateSessionWithManager( mMediaRouterService.requestCreateSessionWithManager(
client, requestId, oldSession, route); client, requestId, oldSession, route);
} catch (RemoteException ex) { } catch (RemoteException ex) {
Log.e(TAG, "requestCreateSession: Failed to send a request", ex); throw ex.rethrowFromSystemServer();
} }
} }
} }
@@ -979,10 +978,9 @@ public final class MediaRouter2Manager {
mClient = client; mClient = client;
return client; return client;
} catch (RemoteException ex) { } catch (RemoteException ex) {
Log.e(TAG, "Unable to register media router manager.", ex); throw ex.rethrowFromSystemServer();
} }
} }
return null;
} }
/** /**