Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1dbdff8 authored by Sasha Kuznetsov's avatar Sasha Kuznetsov
Browse files

Move LocationManagerService to server.location package 

Test: atest FrameworksMockingServicesTests
Bug: 151186626
Change-Id: I30206f45d01ef87c3a8d82128c16f48fe507080d
parent af029213

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

+2 −2
Original line number Original line 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_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;

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

+8 −20
Original line number Original line 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");

 * 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;
@@ -92,25 +92,13 @@ 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.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;
@@ -1627,8 +1615,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;

        }

        }

    }

    }

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

+2 −2
Original line number Original line 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");

 * 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 android.annotation.NonNull;

import android.annotation.NonNull;

import android.location.util.identity.CallerIdentity;

import android.location.util.identity.CallerIdentity;

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -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.location.Geofence;

import android.location.Geofence;

import android.location.LocationManager;

import android.location.LocationManager;

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -27,8 +27,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;