Merge "Fix ANAPIC review comments (frameworks/base)" (97cad3ea) · Commits · e / os / android_frameworks_base

services/core/jni/com_android_server_location_GnssLocationProvider.cpp

+8 −5

Original line number	Diff line number	Diff line
		@@ -1504,11 +1504,14 @@ static jboolean android_location_gnss_hal_GnssNative_set_position_mode(
		JNIEnv* /* env */, jclass, jint mode, jint recurrence, jint min_interval,
		jint preferred_accuracy, jint preferred_time, jboolean low_power_mode) {
		if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) {
		auto status = gnssHalAidl->setPositionMode(static_cast<IGnssAidl::GnssPositionMode>(mode),
		static_cast<IGnssAidl::GnssPositionRecurrence>(
		recurrence),
		min_interval, preferred_accuracy, preferred_time,
		low_power_mode);
		IGnssAidl::PositionModeOptions options;
		options.mode = static_cast<IGnssAidl::GnssPositionMode>(mode);
		options.recurrence = static_cast<IGnssAidl::GnssPositionRecurrence>(recurrence);
		options.minIntervalMs = min_interval;
		options.preferredAccuracyMeters = preferred_accuracy;
		options.preferredTimeMs = preferred_time;
		options.lowPowerMode = low_power_mode;
		auto status = gnssHalAidl->setPositionMode(options);
		return checkAidlStatus(status, "IGnssAidl setPositionMode() failed.");
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ jboolean AGnssRil::setCallback(const std::unique_ptr<AGnssRilCallback>& callback
		jboolean AGnssRil::setSetId(jint type, const jstring& setid_string) {
		JNIEnv* env = getJniEnv();
		ScopedJniString jniSetId{env, setid_string};
		auto status = mIAGnssRil->setSetId((IAGnssRil::SetIDType)type, jniSetId.c_str());
		auto status = mIAGnssRil->setSetId((IAGnssRil::SetIdType)type, jniSetId.c_str());
		return checkAidlStatus(status, "IAGnssRilAidl setSetId() failed.");
		}

+4 −9

Original line number	Diff line number	Diff line
		@@ -359,9 +359,7 @@ void GnssMeasurementCallbackAidl::translateAndSetGnssData(const GnssData& data)
		jobjectArray measurementArray = translateAllGnssMeasurements(env, data.measurements);

		jobjectArray gnssAgcArray = nullptr;
		if (data.gnssAgcs.has_value()) {
		gnssAgcArray = translateAllGnssAgcs(env, data.gnssAgcs.value());
		}
		gnssAgcArray = translateAllGnssAgcs(env, data.gnssAgcs);
		setMeasurementData(env, mCallbacksObj, clock, measurementArray, gnssAgcArray);

		env->DeleteLocalRef(clock);
		@@ -508,8 +506,8 @@ jobjectArray GnssMeasurementCallbackAidl::translateAllGnssMeasurements(
		return gnssMeasurementArray;
		}

		jobjectArray GnssMeasurementCallbackAidl::translateAllGnssAgcs(
		JNIEnv* env, const std::vector<std::optional<GnssAgc>>& agcs) {
		jobjectArray GnssMeasurementCallbackAidl::translateAllGnssAgcs(JNIEnv* env,
		const std::vector<GnssAgc>& agcs) {
		if (agcs.size() == 0) {
		return nullptr;
		}
		@@ -518,10 +516,7 @@ jobjectArray GnssMeasurementCallbackAidl::translateAllGnssAgcs(
		env->NewObjectArray(agcs.size(), class_gnssAgc, nullptr /* initialElement */);

		for (uint16_t i = 0; i < agcs.size(); ++i) {
		if (!agcs[i].has_value()) {
		continue;
		}
		const GnssAgc& gnssAgc = agcs[i].value();
		const GnssAgc& gnssAgc = agcs[i];

		jobject agcBuilderObject = env->NewObject(class_gnssAgcBuilder, method_gnssAgcBuilderCtor);
		env->CallObjectMethod(agcBuilderObject, method_gnssAgcBuilderSetLevelDb,

+2 −2

Original line number	Diff line number	Diff line
		@@ -62,8 +62,8 @@ private:

		jobjectArray translateAllGnssMeasurements(
		JNIEnv* env, const std::vector<hardware::gnss::GnssMeasurement>& measurements);
		jobjectArray translateAllGnssAgcs(
		JNIEnv* env, const std::vector<std::optional<hardware::gnss::GnssData::GnssAgc>>& agcs);
		jobjectArray translateAllGnssAgcs(JNIEnv* env,
		const std::vector<hardware::gnss::GnssData::GnssAgc>& agcs);

		void translateAndSetGnssData(const hardware::gnss::GnssData& data);