summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Christie <dnchrist@google.com>2013-08-16 22:45:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-08-16 22:45:34 +0000
commite3c754bb1c518c9166ff4275b5ee59f36c999f4c (patch)
tree2f0b5fd1119afc958f50f20de96a3b8f2ddfe66f
parent48570adfd927ac1d3bb2a2671a5f54bba573155e (diff)
parent6de10472786ee17106b096eddbb603ab735c11a7 (diff)
downloadframeworks_base-e3c754bb1c518c9166ff4275b5ee59f36c999f4c.zip
frameworks_base-e3c754bb1c518c9166ff4275b5ee59f36c999f4c.tar.gz
frameworks_base-e3c754bb1c518c9166ff4275b5ee59f36c999f4c.tar.bz2
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
-rw-r--r--location/java/android/location/LocationRequest.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/location/java/android/location/LocationRequest.java b/location/java/android/location/LocationRequest.java
index ee748d39..5af29ae 100644
--- a/location/java/android/location/LocationRequest.java
+++ b/location/java/android/location/LocationRequest.java
@@ -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