Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I533c8e8f08e7a2e2c0e703f6be31683519e49e9a
This commit is contained in:
Eva Chen
2021-01-29 17:05:15 +00:00
committed by Automerger Merge Worker
parent a9b9d39bff 2d6992e44f
commit a4eb89f7bc
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/location/LocationManagerService.java
View File

@@ -74,7 +74,6 @@ import android.os.ICancellationSignal;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
import android.os.Process; import android.os.Process;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.SystemClock;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.WorkSource; import android.os.WorkSource;
import android.os.WorkSource.WorkChain; import android.os.WorkSource.WorkChain;
@@ -1297,10 +1296,7 @@ public class LocationManagerService extends ILocationManager.Stub {
return null; return null;
} }
long currentNanos = SystemClock.elapsedRealtimeNanos(); return new LocationTime(location.getTime(), location.getElapsedRealtimeNanos());
long deltaMs = NANOSECONDS.toMillis(
location.getElapsedRealtimeAgeNanos(currentNanos));
return new LocationTime(location.getTime() + deltaMs, currentNanos);
} }
} }