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

Commit 9c2ce5a6 authored by Victoria Lease's avatar Victoria Lease Committed by Android Git Automerger
Browse files

am b1cc90c5: am 2646b3a4: Merge "Prevent overflow in... 

am b1cc90c5: am 2646b3a4: Merge "Prevent  overflow in LocationRequest.setExpireIn()" into jb-mr1-dev

* commit 'b1cc90c5':
  Prevent  overflow in LocationRequest.setExpireIn()
parents 6d5cd6cb b1cc90c5

location/java/android/location/LocationRequest.java

+9 −1
Original line number Diff line number Diff line
@@ -369,7 +369,15 @@ public final class LocationRequest implements Parcelable { 
     * @return the same object, so that setters can be chained

     */

    public LocationRequest setExpireIn(long millis) {

        mExpireAt = millis + SystemClock.elapsedRealtime();

        long elapsedRealtime = SystemClock.elapsedRealtime();



        // Check for > Long.MAX_VALUE overflow (elapsedRealtime > 0):

        if (millis > Long.MAX_VALUE - elapsedRealtime) {

          mExpireAt = Long.MAX_VALUE;

        } else {

          mExpireAt = millis + elapsedRealtime;

        }



        if (mExpireAt < 0) mExpireAt = 0;

        return this;

    }