Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE Move LMS to ease merge conflicts" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-14 21:51:06 +00:00
committed by Android (Google) Code Review
parent b86e5a77a1 1716a62ac1
commit 539133b18a
8 changed files with 20 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/location/AppOpsHelper.java
View File

@@ -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_HIGH_POWER_LOCATION;
import static android.app.AppOpsManager.OP_MONITOR_LOCATION; import static android.app.AppOpsManager.OP_MONITOR_LOCATION;
import static com.android.server.LocationManagerService.D; import static com.android.server.location.LocationManagerService.D;
import static com.android.server.LocationManagerService.TAG; import static com.android.server.location.LocationManagerService.TAG;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.app.AppOpsManager; import android.app.AppOpsManager;

29
services/core/java/com/android/server/LocationManagerService.java → services/core/java/com/android/server/location/LocationManagerService.java
View File

@@ -1,5 +1,5 @@
/* /*
* 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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.server; package com.android.server.location;
import static android.Manifest.permission.ACCESS_FINE_LOCATION; import static android.Manifest.permission.ACCESS_FINE_LOCATION;
import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_AWARE; 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.DumpUtils;
import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.IndentingPrintWriter;
import com.android.internal.util.Preconditions; 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.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.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.PackageProviderKey;
import com.android.server.location.LocationRequestStatistics.PackageStatistics; 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.UserInfoHelper.UserListener;
import com.android.server.location.gnss.GnssManagerService; import com.android.server.location.gnss.GnssManagerService;
import com.android.server.pm.permission.PermissionManagerServiceInternal; 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 // For now, make sure callers have supplied an attribution tag for use with
// AppOpsManager. This might be relaxed in the future. // AppOpsManager. This might be relaxed in the future.
final List<WorkChain> workChains = workSource.getWorkChains(); final List<WorkChain> workChains = workSource.getWorkChains();
return workChains != null && !workChains.isEmpty() && return workChains != null && !workChains.isEmpty()
workChains.get(0).getAttributionTag() != null; && workChains.get(0).getAttributionTag() != null;
} }
} }

6
services/core/java/com/android/server/LocationManagerServiceUtils.java → services/core/java/com/android/server/location/LocationManagerServiceUtils.java
View File

@@ -1,5 +1,5 @@
/* /*
* 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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,15 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.server; package com.android.server.location;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.os.IBinder; import android.os.IBinder;
import android.os.RemoteException; import android.os.RemoteException;
import com.android.server.location.CallerIdentity;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.function.Consumer; import java.util.function.Consumer;

2
services/core/java/com/android/server/location/LocationUsageLogger.java
View File

@@ -16,7 +16,7 @@
package com.android.server.location; 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.app.ActivityManager;
import android.location.Geofence; import android.location.Geofence;

4
services/core/java/com/android/server/location/SettingsHelper.java
View File

@@ -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;
import static android.provider.Settings.Secure.LOCATION_MODE_OFF; import static android.provider.Settings.Secure.LOCATION_MODE_OFF;
import static com.android.server.LocationManagerService.D; import static com.android.server.location.LocationManagerService.D;
import static com.android.server.LocationManagerService.TAG; import static com.android.server.location.LocationManagerService.TAG;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.content.Context; import android.content.Context;

4
services/core/java/com/android/server/location/UserInfoHelper.java
View File

@@ -18,8 +18,8 @@ package com.android.server.location;
import static android.os.UserManager.DISALLOW_SHARE_LOCATION; import static android.os.UserManager.DISALLOW_SHARE_LOCATION;
import static com.android.server.LocationManagerService.D; import static com.android.server.location.LocationManagerService.D;
import static com.android.server.LocationManagerService.TAG; import static com.android.server.location.LocationManagerService.TAG;
import android.annotation.IntDef; import android.annotation.IntDef;
import android.annotation.Nullable; import android.annotation.Nullable;

4
services/core/java/com/android/server/location/gnss/GnssManagerService.java
View File

@@ -46,11 +46,11 @@ import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.IndentingPrintWriter;
import com.android.internal.util.Preconditions; import com.android.internal.util.Preconditions;
import com.android.server.LocalServices; import com.android.server.LocalServices;
import com.android.server.LocationManagerServiceUtils.LinkedListener;
import com.android.server.LocationManagerServiceUtils.LinkedListenerBase;
import com.android.server.location.AppForegroundHelper; import com.android.server.location.AppForegroundHelper;
import com.android.server.location.AppOpsHelper; import com.android.server.location.AppOpsHelper;
import com.android.server.location.CallerIdentity; import com.android.server.location.CallerIdentity;
import com.android.server.location.LocationManagerServiceUtils.LinkedListener;
import com.android.server.location.LocationManagerServiceUtils.LinkedListenerBase;
import com.android.server.location.LocationUsageLogger; import com.android.server.location.LocationUsageLogger;
import com.android.server.location.RemoteListenerHelper; import com.android.server.location.RemoteListenerHelper;
import com.android.server.location.SettingsHelper; import com.android.server.location.SettingsHelper;

1
services/java/com/android/server/SystemServer.java
View File

@@ -112,6 +112,7 @@ import com.android.server.inputmethod.InputMethodSystemProperty;
import com.android.server.inputmethod.MultiClientInputMethodManagerService; import com.android.server.inputmethod.MultiClientInputMethodManagerService;
import com.android.server.integrity.AppIntegrityManagerService; import com.android.server.integrity.AppIntegrityManagerService;
import com.android.server.lights.LightsService; import com.android.server.lights.LightsService;
import com.android.server.location.LocationManagerService;
import com.android.server.media.MediaResourceMonitorService; import com.android.server.media.MediaResourceMonitorService;
import com.android.server.media.MediaRouterService; import com.android.server.media.MediaRouterService;
import com.android.server.media.MediaSessionService; import com.android.server.media.MediaSessionService;