am e3c754bb: Merge "Ensure LocationRequest\'s worksource defaults to null Helps to make sure the service doesn\'t throw a SecurityException for not having the UPDATE_DEVICE_STATS permission." into klp-dev

* commit 'e3c754bb1c518c9166ff4275b5ee59f36c999f4c':
  Ensure LocationRequest's worksource defaults to null Helps to make sure the service doesn't throw a SecurityException for not having the UPDATE_DEVICE_STATS permission.
This commit is contained in:
David Christie
2013-08-16 15:50:38 -07:00
committed by Android Git Automerger

View File

@@ -146,7 +146,7 @@ public final class LocationRequest implements Parcelable {
private long mExpireAt = Long.MAX_VALUE; // no expiry
private int mNumUpdates = Integer.MAX_VALUE; // no expiry
private float mSmallestDisplacement = 0.0f; // meters
private WorkSource mWorkSource = new WorkSource();
private WorkSource mWorkSource = null;
private boolean mHideFromAppOps = false; // True if this request shouldn't be counted by AppOps
private String mProvider = LocationManager.FUSED_PROVIDER; // for deprecated APIs that explicitly request a provider