diff options
| author | 2024-10-24 16:17:16 +0000 | |
|---|---|---|
| committer | 2024-10-24 16:17:16 +0000 | |
| commit | 14ebab9583e9c7cafc87218209ed99a248ca276d (patch) | |
| tree | 2c78dd0cc684b37d9a532c0a1969f24c3549ecae | |
| parent | 364e9eed968f7d3ecac98431e0e70451852c44ec (diff) | |
| parent | dba16422bb1204e66f300e246d1e1edcf7e3f34e (diff) | |
Merge "[Ranging] Hnadle non-existence of service-ranging.jar gracefully" into main am: dba16422bb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3317327
Change-Id: Ia51ea2c712eb0c4d1086e8d88be697541d7c37b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index cae941f98abf..52a2fd6e4955 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -2970,8 +2970,13 @@ public final class SystemServer implements Dumpable { || context.getPackageManager().hasSystemFeature( PackageManager.FEATURE_WIFI_RTT)) { t.traceBegin("RangingService"); - mSystemServiceManager.startServiceFromJar(RANGING_SERVICE_CLASS, - RANGING_APEX_SERVICE_JAR_PATH); + // TODO: b/375264320 - Remove after RELEASE_RANGING_STACK is ramped to next. + try { + mSystemServiceManager.startServiceFromJar(RANGING_SERVICE_CLASS, + RANGING_APEX_SERVICE_JAR_PATH); + } catch (Throwable e) { + Slog.d(TAG, "service-ranging.jar not found, not starting RangingService"); + } t.traceEnd(); } } |