DO NOT MERGE Move LMS to ease merge conflicts am: 1716a62ac1 am: 9f1238068f am: cdb6939eee (d842669a) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/location/AppOpsHelper.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -19,8 +19,8 @@ package com.android.server.location;
		import static android.app.AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION;
		import static android.app.AppOpsManager.OP_MONITOR_LOCATION;

		import static com.android.server.LocationManagerService.D;
		import static com.android.server.LocationManagerService.TAG;
		import static com.android.server.location.LocationManagerService.D;
		import static com.android.server.location.LocationManagerService.TAG;

		import android.annotation.Nullable;
		import android.app.AppOpsManager;

services/core/java/com/android/server/LocationManagerService.java→services/core/java/com/android/server/location/LocationManagerService.java

+8 −21

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2007 The Android Open Source Project
		* Copyright (C) 2020 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		package com.android.server;
		package com.android.server.location;

		import static android.Manifest.permission.ACCESS_FINE_LOCATION;
		import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_AWARE;
		@@ -91,27 +91,14 @@ import com.android.internal.location.ProviderRequest;
		import com.android.internal.util.DumpUtils;
		import com.android.internal.util.IndentingPrintWriter;
		import com.android.internal.util.Preconditions;
		import com.android.server.location.AbstractLocationProvider;
		import com.android.server.FgThread;
		import com.android.server.LocalServices;
		import com.android.server.PendingIntentUtils;
		import com.android.server.SystemService;
		import com.android.server.location.AbstractLocationProvider.State;
		import com.android.server.location.AppForegroundHelper;
		import com.android.server.location.AppOpsHelper;
		import com.android.server.location.CallerIdentity;
		import com.android.server.location.CallerIdentity.PermissionLevel;
		import com.android.server.location.GeocoderProxy;
		import com.android.server.location.GeofenceManager;
		import com.android.server.location.GeofenceProxy;
		import com.android.server.location.HardwareActivityRecognitionProxy;
		import com.android.server.location.LocationFudger;
		import com.android.server.location.LocationProviderProxy;
		import com.android.server.location.LocationRequestStatistics;
		import com.android.server.location.LocationRequestStatistics.PackageProviderKey;
		import com.android.server.location.LocationRequestStatistics.PackageStatistics;
		import com.android.server.location.LocationUsageLogger;
		import com.android.server.location.MockProvider;
		import com.android.server.location.MockableLocationProvider;
		import com.android.server.location.PassiveProvider;
		import com.android.server.location.SettingsHelper;
		import com.android.server.location.UserInfoHelper;
		import com.android.server.location.UserInfoHelper.UserListener;
		import com.android.server.location.gnss.GnssManagerService;
		import com.android.server.pm.permission.PermissionManagerServiceInternal;
		@@ -1620,8 +1607,8 @@ public class LocationManagerService extends ILocationManager.Stub {
		// For now, make sure callers have supplied an attribution tag for use with
		// AppOpsManager. This might be relaxed in the future.
		final List<WorkChain> workChains = workSource.getWorkChains();
		return workChains != null && !workChains.isEmpty() &&
		workChains.get(0).getAttributionTag() != null;
		return workChains != null && !workChains.isEmpty()
		&& workChains.get(0).getAttributionTag() != null;
		}
		}

services/core/java/com/android/server/LocationManagerServiceUtils.java→services/core/java/com/android/server/location/LocationManagerServiceUtils.java

+2 −4

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		* Copyright (C) 2020 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		@@ -14,15 +14,13 @@
		* limitations under the License.
		*/

		package com.android.server;
		package com.android.server.location;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.os.IBinder;
		import android.os.RemoteException;

		import com.android.server.location.CallerIdentity;

		import java.util.NoSuchElementException;
		import java.util.function.Consumer;

services/core/java/com/android/server/location/LocationUsageLogger.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@

		package com.android.server.location;

		import static com.android.server.LocationManagerService.TAG;
		import static com.android.server.location.LocationManagerService.TAG;

		import android.app.ActivityManager;
		import android.location.Geofence;

services/core/java/com/android/server/location/SettingsHelper.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -26,8 +26,8 @@ import static android.provider.Settings.Secure.LOCATION_COARSE_ACCURACY_M;
		import static android.provider.Settings.Secure.LOCATION_MODE;
		import static android.provider.Settings.Secure.LOCATION_MODE_OFF;

		import static com.android.server.LocationManagerService.D;
		import static com.android.server.LocationManagerService.TAG;
		import static com.android.server.location.LocationManagerService.D;
		import static com.android.server.location.LocationManagerService.TAG;

		import android.app.ActivityManager;
		import android.content.Context;