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

Commit a4eb89f7 authored by Eva Chen's avatar Eva Chen Committed by Automerger Merge Worker
Browse files

Merge "Change getGnssTimeMillis to use location.getElapsedRealtimeNanos()."... 

Merge "Change getGnssTimeMillis to use location.getElapsedRealtimeNanos()." into sc-dev am: 2d6992e4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I533c8e8f08e7a2e2c0e703f6be31683519e49e9a
parents a9b9d39b 2d6992e4

services/core/java/com/android/server/location/LocationManagerService.java

+1 −5
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ import android.os.ICancellationSignal; 
import android.os.ParcelFileDescriptor;

import android.os.Process;

import android.os.RemoteException;

import android.os.SystemClock;

import android.os.UserHandle;

import android.os.WorkSource;

import android.os.WorkSource.WorkChain;
@@ -1297,10 +1296,7 @@ public class LocationManagerService extends ILocationManager.Stub { 
                return null;

            }



            long currentNanos = SystemClock.elapsedRealtimeNanos();

            long deltaMs = NANOSECONDS.toMillis(

                    location.getElapsedRealtimeAgeNanos(currentNanos));

            return new LocationTime(location.getTime() + deltaMs, currentNanos);

            return new LocationTime(location.getTime(), location.getElapsedRealtimeNanos());

        }

    }