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

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

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

Merge "Revert "[Ranging] Hnadle non-existence of service-ranging.jar gracefully"" into main am: 5124d584

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



Change-Id: I06b075f85bf6a04389b919fe7efd2db0104e7477
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5dda0556 5124d584

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

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

                                    PackageManager.FEATURE_BLUETOOTH_LE))) {

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

            }

        }