From 3065a31d35833815b8e0b6f2dbddfaa91045d3cf Mon Sep 17 00:00:00 2001 From: Shreshta Manu Date: Wed, 23 Oct 2024 16:38:39 +0000 Subject: [Ranging] Hnadle non-existence of service-ranging.jar gracefully Bug: 374910637 Test: Tested manually Change-Id: Icaffdedbef6981038130021392fa6249ef7be693 --- services/java/com/android/server/SystemServer.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'services/java') 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(); } } -- cgit v1.2.3-59-g8ed1b