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

Commit 3bce0143 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Convert extensionTime to millis" into tm-dev am: 3f480fee 

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



Change-Id: Ifb30718e5271c19cddf98a4a29636510f38b8e10
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4b963040 3f480fee

services/core/java/com/android/server/location/gnss/hal/GnssNative.java

+3 −1
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import java.lang.annotation.RetentionPolicy; 
import java.lang.annotation.Target;

import java.util.List;

import java.util.Objects;

import java.util.concurrent.TimeUnit;



/**

 * Entry point for most GNSS HAL commands and callbacks.
@@ -1271,7 +1272,8 @@ public class GnssNative { 
    @NativeEntryPoint

    boolean isInEmergencySession() {

        return Binder.withCleanCallingIdentity(

                () -> mEmergencyHelper.isInEmergency(mConfiguration.getEsExtensionSec()));

                () -> mEmergencyHelper.isInEmergency(

                        TimeUnit.SECONDS.toMillis(mConfiguration.getEsExtensionSec())));

    }



    /**