Merge branch 'privacycentral' into 'v1-q'

Location: always return false when querying mock provider

See merge request e/os/android_frameworks_base!112

location/java/android/location/Location.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1231,7 +1231,7 @@ public class Location implements Parcelable {
		* @return true if this Location came from a mock provider, false otherwise
		*/
		public boolean isFromMockProvider() {
		return (mFieldsMask & HAS_MOCK_PROVIDER_MASK) != 0;
		return false;
		}

		/**