am 2646b3a4: Merge "Prevent overflow in LocationRequest.setExpireIn()" into jb-mr1-dev (b1cc90c5) · Commits · e / os / android_frameworks_base

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;
		}