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

Commit f20d10ef authored by Soonil Nagarkar's avatar Soonil Nagarkar
Browse files

Move GnssManagerService to gnss package 

Test: presubmits
Change-Id: Ibda2aab8427e6160fdd2f925532750f8ad34411e
parent 854d2ff9

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

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ import com.android.server.location.MockProvider; 
import com.android.server.location.MockableLocationProvider;

import com.android.server.location.PassiveProvider;

import com.android.server.location.UserInfoStore;

import com.android.server.location.gnss.GnssManagerService;

import com.android.server.pm.permission.PermissionManagerServiceInternal;



import java.io.ByteArrayOutputStream;

services/core/java/com/android/server/GnssManagerService.java→services/core/java/com/android/server/location/gnss/GnssManagerService.java

+13 −7
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,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server;

package com.android.server.location.gnss;



import android.Manifest;

import android.annotation.NonNull;
@@ -45,6 +45,9 @@ import com.android.internal.annotations.GuardedBy; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.DumpUtils;

import com.android.internal.util.IndentingPrintWriter;

import com.android.server.FgThread;

import com.android.server.LocationManagerService;

import com.android.server.LocationManagerServiceUtils;

import com.android.server.LocationManagerServiceUtils.LinkedListener;

import com.android.server.LocationManagerServiceUtils.LinkedListenerBase;

import com.android.server.location.CallerIdentity;
@@ -322,7 +325,7 @@ public class GnssManagerService { 
        synchronized (mGnssBatchingLock) {

            mGnssBatchingCallback = callback;

            mGnssBatchingDeathCallback =

                    new LocationManagerServiceUtils.LinkedListener<>(

                    new LinkedListener<>(

                            callback,

                            "BatchedLocationCallback",

                            callerIdentity,
@@ -757,7 +760,10 @@ public class GnssManagerService { 
        }

    }



    protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

    /**

     * Dump for debugging.

     */

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        if (!DumpUtils.checkDumpPermission(mContext, TAG, pw)) return;



        IndentingPrintWriter ipw = new IndentingPrintWriter(pw, "  ");
@@ -776,7 +782,7 @@ public class GnssManagerService { 
                    mGnssMeasurementsListeners

                            .values()) {

                ipw.println(listener + ": " + mLocationManagerService.isThrottlingExemptLocked(

                        listener.mCallerIdentity));

                        listener.getCallerIdentity()));

            }

        }

        ipw.decreaseIndent();
@@ -787,7 +793,7 @@ public class GnssManagerService { 
            for (LinkedListenerBase listener :

                    mGnssNavigationMessageListeners.values()) {

                ipw.println(listener + ": " + mLocationManagerService.isThrottlingExemptLocked(

                        listener.mCallerIdentity));

                        listener.getCallerIdentity()));

            }

        }

        ipw.decreaseIndent();
@@ -798,7 +804,7 @@ public class GnssManagerService { 
            for (LinkedListenerBase listener :

                    mGnssStatusListeners.values()) {

                ipw.println(listener + ": " + mLocationManagerService.isThrottlingExemptLocked(

                        listener.mCallerIdentity));

                        listener.getCallerIdentity()));

            }

        }

        ipw.decreaseIndent();

services/tests/servicestests/src/com/android/server/GnssManagerServiceTest.java→services/tests/servicestests/src/com/android/server/location/gnss/GnssManagerServiceTest.java

+11 −9
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,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server;

package com.android.server.location.gnss;



import static com.google.common.truth.Truth.assertThat;
@@ -52,6 +52,7 @@ import android.os.IInterface; 
import android.os.Message;

import android.os.RemoteException;



import com.android.server.LocationManagerService;

import com.android.server.location.GnssBatchingProvider;

import com.android.server.location.GnssCapabilitiesProvider;

import com.android.server.location.GnssLocationProvider;
@@ -71,11 +72,12 @@ import org.mockito.Mockito; 
import org.mockito.MockitoAnnotations;

import org.mockito.invocation.InvocationOnMock;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;



/**

 * Unit tests for {@link com.android.server.GnssManagerService}.

 * Unit tests for {@link com.android.server.location.gnss.GnssManagerService}.

 */

public class GnssManagerServiceTest {
@@ -111,7 +113,7 @@ public class GnssManagerServiceTest { 
    private Context mMockContext;



    // Class under test

    private GnssManagerService mGnssManagerService;

    private com.android.server.location.gnss.GnssManagerService mGnssManagerService;



    @Before

    public void setUp() {
@@ -371,7 +373,7 @@ public class GnssManagerServiceTest { 
    @Test

    public void addGnssBatchCallbackWithoutPermissionsTest() throws RemoteException {

        IBatchedLocationCallback mockBatchedLocationCallback = createMockBatchedLocationCallback();

        List<Location> mockLocationList = (List<Location>) mock(List.class);

        List<Location> mockLocationList = new ArrayList<>();



        disableLocationPermissions();
@@ -387,7 +389,7 @@ public class GnssManagerServiceTest { 
    @Test

    public void addGnssBatchCallbackWithPermissionsTest() throws RemoteException {

        IBatchedLocationCallback mockBatchedLocationCallback = createMockBatchedLocationCallback();

        List<Location> mockLocationList = (List<Location>) mock(List.class);

        List<Location> mockLocationList = new ArrayList<>();



        enableLocationPermissions();
@@ -404,7 +406,7 @@ public class GnssManagerServiceTest { 
    public void replaceGnssBatchCallbackTest() throws RemoteException {

        IBatchedLocationCallback mockBatchedLocationCallback1 = createMockBatchedLocationCallback();

        IBatchedLocationCallback mockBatchedLocationCallback2 = createMockBatchedLocationCallback();

        List<Location> mockLocationList = (List<Location>) mock(List.class);

        List<Location> mockLocationList = new ArrayList<>();



        enableLocationPermissions();
@@ -441,7 +443,7 @@ public class GnssManagerServiceTest { 
    @Test

    public void removeGnssBatchingCallbackWithoutPermissionsTest() throws RemoteException {

        IBatchedLocationCallback mockBatchedLocationCallback = createMockBatchedLocationCallback();

        List<Location> mockLocationList = (List<Location>) mock(List.class);

        List<Location> mockLocationList = new ArrayList<>();



        enableLocationPermissions();
@@ -461,7 +463,7 @@ public class GnssManagerServiceTest { 
    @Test

    public void removeGnssBatchingCallbackWithPermissionsTest() throws RemoteException {

        IBatchedLocationCallback mockBatchedLocationCallback = createMockBatchedLocationCallback();

        List<Location> mockLocationList = (List<Location>) mock(List.class);

        List<Location> mockLocationList = new ArrayList<>();



        enableLocationPermissions();