summaryrefslogtreecommitdiff
path: root/services/java
diff options
context:
space:
mode:
author Shreshta Manu <shreshtabm@google.com> 2024-10-23 16:38:39 +0000
committer Shreshta Manu <shreshtabm@google.com> 2024-10-23 23:02:33 +0000
commit3065a31d35833815b8e0b6f2dbddfaa91045d3cf (patch)
treea2534e87f1eae7bf833a82dd84f981a189366be7 /services/java
parent991063f6e22e9f8cb86268eed16bfa2921e22701 (diff)
[Ranging] Hnadle non-existence of service-ranging.jar gracefully
Bug: 374910637 Test: Tested manually Change-Id: Icaffdedbef6981038130021392fa6249ef7be693
Diffstat (limited to 'services/java')
-rw-r--r--services/java/com/android/server/SystemServer.java9
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 b676fa2455b1..ebd44f4e0d25 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();
}
}