Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0db3d4a6 authored by Shreshta Manu's avatar Shreshta Manu Committed by Automerger Merge Worker
Browse files

Merge "[Ranging] Hnadle non-existence of service-ranging.jar gracefully" into... 

Merge "[Ranging] Hnadle non-existence of service-ranging.jar gracefully" into main am: dba16422 am: 14ebab95

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



Change-Id: I9fd0747ed454c5be9aaa162c4638ded38d93ce3b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0935d999 14ebab95

services/java/com/android/server/SystemServer.java

+7 −2
Original line number Diff line number Diff line
@@ -3037,8 +3037,13 @@ public final class SystemServer implements Dumpable { 
                    || context.getPackageManager().hasSystemFeature(

                            PackageManager.FEATURE_WIFI_RTT)) {

                t.traceBegin("RangingService");

                // 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();

            }

        }