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

Merge "Move gnss files to server/location/gnss" into rvc-dev

Browse Source
This commit is contained in:
Sasha Kuznetsov
2020-03-27 06:03:00 +00:00
committed by Android (Google) Code Review
parent 4cf90e8a83 94bb0098bc
commit 1caed5cd75
29 changed files with 316 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -273,7 +273,7 @@ public abstract class RemoteListenerHelper<TRequest, TListener extends IInterfac
}
@Nullable
protected TRequest getRequest() {
public TRequest getRequest() {
return mRequest;
}
}

18
services/core/java/com/android/server/location/ExponentialBackOff.java → services/core/java/com/android/server/location/gnss/ExponentialBackOff.java
View File

@@ -1,4 +1,20 @@
package com.android.server.location;
/*
* 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.server.location.gnss;
/**
* A simple implementation of exponential backoff.

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

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.server.location;
package com.android.server.location.gnss;
import android.content.Context;
import android.location.GnssAntennaInfo;
@@ -23,6 +23,8 @@ import android.os.Handler;
import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
import com.android.server.location.CallerIdentity;
import com.android.server.location.RemoteListenerHelper;
import java.util.List;

18
services/core/java/com/android/server/location/GnssBatchingProvider.java → services/core/java/com/android/server/location/gnss/GnssBatchingProvider.java
View File

@@ -1,4 +1,20 @@
package com.android.server.location;
/*
* 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.server.location.gnss;
import android.util.Log;

4
services/core/java/com/android/server/location/GnssCapabilitiesProvider.java → services/core/java/com/android/server/location/gnss/GnssCapabilitiesProvider.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");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.server.location;
package com.android.server.location.gnss;
import android.location.GnssCapabilities;
import android.util.Log;

4
services/core/java/com/android/server/location/GnssConfiguration.java → services/core/java/com/android/server/location/gnss/GnssConfiguration.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");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.server.location;
package com.android.server.location.gnss;
import android.content.Context;
import android.os.PersistableBundle;

18
services/core/java/com/android/server/location/GnssGeofenceProvider.java → services/core/java/com/android/server/location/gnss/GnssGeofenceProvider.java
View File

@@ -1,4 +1,20 @@
package com.android.server.location;
/*
* 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.server.location.gnss;
import android.location.IGpsGeofenceHardware;
import android.util.Log;

9
services/core/java/com/android/server/location/GnssLocationProvider.java → services/core/java/com/android/server/location/gnss/GnssLocationProvider.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008 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.location;
package com.android.server.location.gnss;
import android.app.AlarmManager;
import android.app.AppOpsManager;
@@ -78,8 +78,9 @@ import com.android.internal.util.FrameworkStatsLog;
import com.android.server.DeviceIdleInternal;
import com.android.server.FgThread;
import com.android.server.LocalServices;
import com.android.server.location.GnssSatelliteBlacklistHelper.GnssSatelliteBlacklistCallback;
import com.android.server.location.NtpTimeHelper.InjectNtpTimeCallback;
import com.android.server.location.AbstractLocationProvider;
import com.android.server.location.gnss.NtpTimeHelper.InjectNtpTimeCallback;
import com.android.server.location.gnss.GnssSatelliteBlacklistHelper.GnssSatelliteBlacklistCallback;
import java.io.FileDescriptor;
import java.io.PrintWriter;

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

@@ -55,14 +55,6 @@ import com.android.server.LocationManagerServiceUtils.LinkedListener;
import com.android.server.LocationManagerServiceUtils.LinkedListenerBase;
import com.android.server.location.AppForegroundHelper;
import com.android.server.location.CallerIdentity;
import com.android.server.location.GnssAntennaInfoProvider;
import com.android.server.location.GnssBatchingProvider;
import com.android.server.location.GnssCapabilitiesProvider;
import com.android.server.location.GnssLocationProvider;
import com.android.server.location.GnssMeasurementCorrectionsProvider;
import com.android.server.location.GnssMeasurementsProvider;
import com.android.server.location.GnssNavigationMessageProvider;
import com.android.server.location.GnssStatusListenerHelper;
import com.android.server.location.LocationUsageLogger;
import com.android.server.location.RemoteListenerHelper;
import com.android.server.location.SettingsHelper;

4
services/core/java/com/android/server/location/GnssMeasurementCorrectionsProvider.java → services/core/java/com/android/server/location/gnss/GnssMeasurementCorrectionsProvider.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");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.server.location;
package com.android.server.location.gnss;
import android.location.GnssMeasurementCorrections;
import android.os.Handler;

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

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2014 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.location;
package com.android.server.location.gnss;
import android.content.Context;
import android.location.GnssMeasurementsEvent;
@@ -26,6 +26,8 @@ import android.provider.Settings;
import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
import com.android.server.location.CallerIdentity;
import com.android.server.location.RemoteListenerHelper;
/**
* An base implementation for GPS measurements provider. It abstracts out the responsibility of

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

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2014 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.location;
package com.android.server.location.gnss;
import android.content.Context;
import android.location.GnssNavigationMessage;
@@ -24,6 +24,8 @@ import android.os.RemoteException;
import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
import com.android.server.location.CallerIdentity;
import com.android.server.location.RemoteListenerHelper;
/**
* An base implementation for GPS navigation messages provider.

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

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2018 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.location;
package com.android.server.location.gnss;
import android.content.Context;
import android.database.Cursor;

18
services/core/java/com/android/server/location/GnssPositionMode.java → services/core/java/com/android/server/location/gnss/GnssPositionMode.java
View File

@@ -1,4 +1,20 @@
package com.android.server.location;
/*
* 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.server.location.gnss;
import java.util.Arrays;

18
services/core/java/com/android/server/location/GnssSatelliteBlacklistHelper.java → services/core/java/com/android/server/location/gnss/GnssSatelliteBlacklistHelper.java
View File

@@ -1,4 +1,20 @@
package com.android.server.location;
/*
* 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.server.location.gnss;
import android.content.ContentResolver;
import android.content.Context;

9
services/core/java/com/android/server/location/GnssStatusListenerHelper.java → services/core/java/com/android/server/location/gnss/GnssStatusListenerHelper.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2014 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.
@@ -11,16 +11,19 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License
* limitations under the License.
*/
package com.android.server.location;
package com.android.server.location.gnss;
import android.content.Context;
import android.location.IGnssStatusListener;
import android.os.Handler;
import android.util.Log;
import com.android.server.location.CallerIdentity;
import com.android.server.location.RemoteListenerHelper;
/**
* Implementation of a handler for {@link IGnssStatusListener}.
*/

4
services/core/java/com/android/server/location/GnssVisibilityControl.java → services/core/java/com/android/server/location/gnss/GnssVisibilityControl.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");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.server.location;
package com.android.server.location.gnss;
import android.annotation.Nullable;
import android.annotation.SuppressLint;

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

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008 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.location;
package com.android.server.location.gnss;
import android.net.TrafficStats;
import android.text.TextUtils;

19
services/core/java/com/android/server/location/NtpTimeHelper.java → services/core/java/com/android/server/location/gnss/NtpTimeHelper.java
View File

@@ -1,4 +1,20 @@
package com.android.server.location;
/*
* 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.server.location.gnss;
import android.content.Context;
import android.net.ConnectivityManager;
@@ -12,6 +28,7 @@ import android.util.NtpTrustedTime;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
import com.android.server.location.gnss.ExponentialBackOff;
import java.util.Date;

126
services/core/jni/com_android_server_location_GnssLocationProvider.cpp
View File

@@ -2068,8 +2068,8 @@ static void android_location_GnssLocationProvider_class_init_native(JNIEnv* env,
class_gnssClock = (jclass) env->NewGlobalRef(gnssClockClass);
method_gnssClockCtor = env->GetMethodID(class_gnssClock, "<init>", "()V");
jclass gnssConfiguration_halInterfaceVersionClass =
env->FindClass("com/android/server/location/GnssConfiguration$HalInterfaceVersion");
jclass gnssConfiguration_halInterfaceVersionClass = env->FindClass(
"com/android/server/location/gnss/GnssConfiguration$HalInterfaceVersion");
class_gnssConfiguration_halInterfaceVersion =
(jclass) env->NewGlobalRef(gnssConfiguration_halInterfaceVersionClass);
method_halInterfaceVersionCtor =
@@ -3738,39 +3738,29 @@ static const JNINativeMethod sNetworkConnectivityMethods[] = {
};
static const JNINativeMethod sConfigurationMethods[] = {
/* name, signature, funcPtr */
{"native_get_gnss_configuration_version",
"()Lcom/android/server/location/GnssConfiguration$HalInterfaceVersion;",
reinterpret_cast<void *>(
android_location_GnssConfiguration_get_gnss_configuration_version)},
{"native_set_supl_es",
"(I)Z",
reinterpret_cast<void *>(android_location_GnssConfiguration_set_supl_es)},
{"native_set_supl_version",
"(I)Z",
reinterpret_cast<void *>(android_location_GnssConfiguration_set_supl_version)},
{"native_set_supl_mode",
"(I)Z",
reinterpret_cast<void *>(android_location_GnssConfiguration_set_supl_mode)},
{"native_set_lpp_profile",
"(I)Z",
reinterpret_cast<void *>(android_location_GnssConfiguration_set_lpp_profile)},
{"native_set_gnss_pos_protocol_select",
"(I)Z",
reinterpret_cast<void *>(
android_location_GnssConfiguration_set_gnss_pos_protocol_select)},
{"native_set_gps_lock",
"(I)Z",
reinterpret_cast<void *>(android_location_GnssConfiguration_set_gps_lock)},
{"native_set_emergency_supl_pdn",
"(I)Z",
reinterpret_cast<void *>(android_location_GnssConfiguration_set_emergency_supl_pdn)},
{"native_set_satellite_blacklist",
"([I[I)Z",
reinterpret_cast<void *>(android_location_GnssConfiguration_set_satellite_blacklist)},
{"native_set_es_extension_sec",
"(I)Z",
reinterpret_cast<void *>(android_location_GnssConfiguration_set_es_extension_sec)},
/* name, signature, funcPtr */
{"native_get_gnss_configuration_version",
"()Lcom/android/server/location/gnss/GnssConfiguration$HalInterfaceVersion;",
reinterpret_cast<void*>(
android_location_GnssConfiguration_get_gnss_configuration_version)},
{"native_set_supl_es", "(I)Z",
reinterpret_cast<void*>(android_location_GnssConfiguration_set_supl_es)},
{"native_set_supl_version", "(I)Z",
reinterpret_cast<void*>(android_location_GnssConfiguration_set_supl_version)},
{"native_set_supl_mode", "(I)Z",
reinterpret_cast<void*>(android_location_GnssConfiguration_set_supl_mode)},
{"native_set_lpp_profile", "(I)Z",
reinterpret_cast<void*>(android_location_GnssConfiguration_set_lpp_profile)},
{"native_set_gnss_pos_protocol_select", "(I)Z",
reinterpret_cast<void*>(android_location_GnssConfiguration_set_gnss_pos_protocol_select)},
{"native_set_gps_lock", "(I)Z",
reinterpret_cast<void*>(android_location_GnssConfiguration_set_gps_lock)},
{"native_set_emergency_supl_pdn", "(I)Z",
reinterpret_cast<void*>(android_location_GnssConfiguration_set_emergency_supl_pdn)},
{"native_set_satellite_blacklist", "([I[I)Z",
reinterpret_cast<void*>(android_location_GnssConfiguration_set_satellite_blacklist)},
{"native_set_es_extension_sec", "(I)Z",
reinterpret_cast<void*>(android_location_GnssConfiguration_set_es_extension_sec)},
};
static const JNINativeMethod sVisibilityControlMethods[] = {
@@ -3782,53 +3772,27 @@ static const JNINativeMethod sVisibilityControlMethods[] = {
};
int register_android_server_location_GnssLocationProvider(JNIEnv* env) {
jniRegisterNativeMethods(env, "com/android/server/location/GnssAntennaInfoProvider",
jniRegisterNativeMethods(env, "com/android/server/location/gnss/GnssAntennaInfoProvider",
sAntennaInfoMethods, NELEM(sAntennaInfoMethods));
jniRegisterNativeMethods(
env,
"com/android/server/location/GnssBatchingProvider",
sMethodsBatching,
NELEM(sMethodsBatching));
jniRegisterNativeMethods(
env,
"com/android/server/location/GnssGeofenceProvider",
sGeofenceMethods,
NELEM(sGeofenceMethods));
jniRegisterNativeMethods(
env,
"com/android/server/location/GnssMeasurementsProvider",
sMeasurementMethods,
NELEM(sMeasurementMethods));
jniRegisterNativeMethods(
env,
"com/android/server/location/GnssMeasurementCorrectionsProvider",
sMeasurementCorrectionsMethods,
NELEM(sMeasurementCorrectionsMethods));
jniRegisterNativeMethods(
env,
"com/android/server/location/GnssNavigationMessageProvider",
sNavigationMessageMethods,
NELEM(sNavigationMessageMethods));
jniRegisterNativeMethods(
env,
"com/android/server/location/GnssNetworkConnectivityHandler",
sNetworkConnectivityMethods,
NELEM(sNetworkConnectivityMethods));
jniRegisterNativeMethods(
env,
"com/android/server/location/GnssConfiguration",
sConfigurationMethods,
NELEM(sConfigurationMethods));
jniRegisterNativeMethods(
env,
"com/android/server/location/GnssVisibilityControl",
sVisibilityControlMethods,
NELEM(sVisibilityControlMethods));
return jniRegisterNativeMethods(
env,
"com/android/server/location/GnssLocationProvider",
sMethods,
NELEM(sMethods));
jniRegisterNativeMethods(env, "com/android/server/location/gnss/GnssBatchingProvider",
sMethodsBatching, NELEM(sMethodsBatching));
jniRegisterNativeMethods(env, "com/android/server/location/gnss/GnssGeofenceProvider",
sGeofenceMethods, NELEM(sGeofenceMethods));
jniRegisterNativeMethods(env, "com/android/server/location/gnss/GnssMeasurementsProvider",
sMeasurementMethods, NELEM(sMeasurementMethods));
jniRegisterNativeMethods(env,
"com/android/server/location/gnss/GnssMeasurementCorrectionsProvider",
sMeasurementCorrectionsMethods, NELEM(sMeasurementCorrectionsMethods));
jniRegisterNativeMethods(env, "com/android/server/location/gnss/GnssNavigationMessageProvider",
sNavigationMessageMethods, NELEM(sNavigationMessageMethods));
jniRegisterNativeMethods(env, "com/android/server/location/gnss/GnssNetworkConnectivityHandler",
sNetworkConnectivityMethods, NELEM(sNetworkConnectivityMethods));
jniRegisterNativeMethods(env, "com/android/server/location/gnss/GnssConfiguration",
sConfigurationMethods, NELEM(sConfigurationMethods));
jniRegisterNativeMethods(env, "com/android/server/location/gnss/GnssVisibilityControl",
sVisibilityControlMethods, NELEM(sVisibilityControlMethods));
return jniRegisterNativeMethods(env, "com/android/server/location/gnss/GnssLocationProvider",
sMethods, NELEM(sMethods));
}
} /* namespace android */

5
services/robotests/src/com/android/server/location/GnssAntennaInfoProviderTest.java → services/robotests/src/com/android/server/location/gnss/GnssAntennaInfoProviderTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.server.location;
package com.android.server.location.gnss;
import static com.google.common.truth.Truth.assertThat;
@@ -41,7 +41,8 @@ import org.robolectric.RuntimeEnvironment;
@Presubmit
public class GnssAntennaInfoProviderTest {
@Mock
private GnssAntennaInfoProvider.GnssAntennaInfoProviderNative mMockNative;
private GnssAntennaInfoProvider.GnssAntennaInfoProviderNative
mMockNative;
private GnssAntennaInfoProvider mTestProvider;
/** Setup. */

20
services/robotests/src/com/android/server/location/GnssBatchingProviderTest.java → services/robotests/src/com/android/server/location/gnss/GnssBatchingProviderTest.java
View File

@@ -1,4 +1,20 @@
package com.android.server.location;
/*
* 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.server.location.gnss;
import static com.google.common.truth.Truth.assertThat;
@@ -11,7 +27,7 @@ import static org.mockito.Mockito.when;
import android.platform.test.annotations.Presubmit;
import com.android.server.location.GnssBatchingProvider.GnssBatchingProviderNative;
import com.android.server.location.gnss.GnssBatchingProvider.GnssBatchingProviderNative;
import org.junit.Before;
import org.junit.Test;

18
services/robotests/src/com/android/server/location/GnssGeofenceProviderTest.java → services/robotests/src/com/android/server/location/gnss/GnssGeofenceProviderTest.java
View File

@@ -1,4 +1,20 @@
package com.android.server.location;
/*
* 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.server.location.gnss;
import static org.mockito.ArgumentMatchers.anyDouble;
import static org.mockito.ArgumentMatchers.anyInt;

21
services/robotests/src/com/android/server/location/GnssMeasurementsProviderTest.java → services/robotests/src/com/android/server/location/gnss/GnssMeasurementsProviderTest.java
View File

@@ -1,4 +1,20 @@
package com.android.server.location;
/*
* 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.server.location.gnss;
import static com.google.common.truth.Truth.assertThat;
@@ -26,7 +42,8 @@ import org.robolectric.RuntimeEnvironment;
@Presubmit
public class GnssMeasurementsProviderTest {
@Mock
private GnssMeasurementsProvider.GnssMeasurementProviderNative mMockNative;
private GnssMeasurementsProvider.GnssMeasurementProviderNative
mMockNative;
private GnssMeasurementsProvider mTestProvider;
@Before

21
services/robotests/src/com/android/server/location/GnssNavigationMessageProviderTest.java → services/robotests/src/com/android/server/location/gnss/GnssNavigationMessageProviderTest.java
View File

@@ -1,4 +1,20 @@
package com.android.server.location;
/*
* 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.server.location.gnss;
import static com.google.common.truth.Truth.assertThat;
@@ -25,7 +41,8 @@ import org.robolectric.RuntimeEnvironment;
@Presubmit
public class GnssNavigationMessageProviderTest {
@Mock
private GnssNavigationMessageProvider.GnssNavigationMessageProviderNative mMockNative;
private GnssNavigationMessageProvider.GnssNavigationMessageProviderNative
mMockNative;
private GnssNavigationMessageProvider mTestProvider;
@Before

18
services/robotests/src/com/android/server/location/GnssPositionModeTest.java → services/robotests/src/com/android/server/location/gnss/GnssPositionModeTest.java
View File

@@ -1,4 +1,20 @@
package com.android.server.location;
/*
* 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.server.location.gnss;
import static com.google.common.truth.Truth.assertThat;

21
services/robotests/src/com/android/server/location/GnssSatelliteBlacklistHelperTest.java → services/robotests/src/com/android/server/location/gnss/GnssSatelliteBlacklistHelperTest.java
View File

@@ -1,4 +1,20 @@
package com.android.server.location;
/*
* 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.server.location.gnss;
import static com.google.common.truth.Truth.assertThat;
@@ -35,7 +51,8 @@ public class GnssSatelliteBlacklistHelperTest {
private ContentResolver mContentResolver;
@Mock
private GnssSatelliteBlacklistHelper.GnssSatelliteBlacklistCallback mCallback;
private GnssSatelliteBlacklistHelper.GnssSatelliteBlacklistCallback
mCallback;
@Before
public void setUp() {

20
services/robotests/src/com/android/server/location/NtpTimeHelperTest.java → services/robotests/src/com/android/server/location/gnss/NtpTimeHelperTest.java
View File

@@ -1,4 +1,20 @@
package com.android.server.location;
/*
* 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.server.location.gnss;
import static com.google.common.truth.Truth.assertThat;
@@ -10,7 +26,7 @@ import android.os.SystemClock;
import android.platform.test.annotations.Presubmit;
import android.util.NtpTrustedTime;
import com.android.server.location.NtpTimeHelper.InjectNtpTimeCallback;
import com.android.server.location.gnss.NtpTimeHelper.InjectNtpTimeCallback;
import org.junit.Before;
import org.junit.Test;

14
services/tests/servicestests/src/com/android/server/location/gnss/GnssManagerServiceTest.java
View File

@@ -61,17 +61,9 @@ import android.os.RemoteException;
import com.android.server.LocalServices;
import com.android.server.location.AppForegroundHelper;
import com.android.server.location.GnssAntennaInfoProvider;
import com.android.server.location.GnssAntennaInfoProvider.GnssAntennaInfoProviderNative;
import com.android.server.location.GnssBatchingProvider;
import com.android.server.location.GnssCapabilitiesProvider;
import com.android.server.location.GnssLocationProvider;
import com.android.server.location.GnssMeasurementCorrectionsProvider;
import com.android.server.location.GnssMeasurementsProvider;
import com.android.server.location.GnssMeasurementsProvider.GnssMeasurementProviderNative;
import com.android.server.location.GnssNavigationMessageProvider;
import com.android.server.location.GnssNavigationMessageProvider.GnssNavigationMessageProviderNative;
import com.android.server.location.GnssStatusListenerHelper;
import com.android.server.location.gnss.GnssAntennaInfoProvider.GnssAntennaInfoProviderNative;
import com.android.server.location.gnss.GnssMeasurementsProvider.GnssMeasurementProviderNative;
import com.android.server.location.gnss.GnssNavigationMessageProvider.GnssNavigationMessageProviderNative;
import com.android.server.location.LocationUsageLogger;
import com.android.server.location.SettingsHelper;