Merge "Re-throw system server exception." am: 112cd8df86 am: c76d1a4c26

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608233

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25dc972b3303e1950eb8a7192852876e2e1fad5b
This commit is contained in:
Almaz Mingaleev
2021-02-26 10:05:16 +00:00
committed by Automerger Merge Worker

View File

@@ -329,8 +329,7 @@ public final class SystemClock {
try { try {
time = mMgr.getGnssTimeMillis(); time = mMgr.getGnssTimeMillis();
} catch (RemoteException e) { } catch (RemoteException e) {
e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
return 0;
} }
if (time == null) { if (time == null) {
throw new DateTimeException("Gnss based time is not available."); throw new DateTimeException("Gnss based time is not available.");