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