Merge changes from topic "revert-20513346-LocationPrivacy-HAL-XBLPIWUKWY" (9630c79b) · Commits · e / os / android_hardware_interfaces

radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/IRadioNetwork.aidl

+0 −2

Original line number	Diff line number	Diff line
		@@ -81,6 +81,4 @@ interface IRadioNetwork {
		oneway void isNullCipherAndIntegrityEnabled(in int serial);
		oneway void isN1ModeEnabled(in int serial);
		oneway void setN1ModeEnabled(in int serial, boolean enable);
		oneway void setLocationPrivacySetting(in int serial, in boolean shareLocation);
		oneway void getLocationPrivacySetting(in int serial);
		}

radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/IRadioNetworkIndication.aidl

+0 −1

Original line number	Diff line number	Diff line
		@@ -49,5 +49,4 @@ interface IRadioNetworkIndication {
		oneway void suppSvcNotify(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.network.SuppSvcNotification suppSvc);
		oneway void voiceRadioTechChanged(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.RadioTechnology rat);
		oneway void emergencyNetworkScanResult(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.network.EmergencyRegResult result);
		oneway void onNetworkInitiatedLocationResult(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.network.LocationResponseType locationResponseType);
		}

radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/IRadioNetworkResponse.aidl

+0 −2

Original line number	Diff line number	Diff line
		@@ -80,6 +80,4 @@ interface IRadioNetworkResponse {
		oneway void isNullCipherAndIntegrityEnabledResponse(in android.hardware.radio.RadioResponseInfo info, in boolean isEnabled);
		oneway void isN1ModeEnabledResponse(in android.hardware.radio.RadioResponseInfo info, boolean isEnabled);
		oneway void setN1ModeEnabledResponse(in android.hardware.radio.RadioResponseInfo info);
		oneway void setLocationPrivacySettingResponse(in android.hardware.radio.RadioResponseInfo info);
		oneway void getLocationPrivacySettingResponse(in android.hardware.radio.RadioResponseInfo info, boolean shareLocation);
		}

radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/LocationResponseType.aidl

deleted100644 → 0

+0 −40

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 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.
		*/
		///////////////////////////////////////////////////////////////////////////////
		// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
		///////////////////////////////////////////////////////////////////////////////

		// This file is a snapshot of an AIDL file. Do not edit it manually. There are
		// two cases:
		// 1). this is a frozen version file - do not edit this in any case.
		// 2). this is a 'current' file. If you make a backwards compatible change to
		// the interface (from the latest frozen version), the build system will
		// prompt you to update this file with `m <name>-update-api`.
		//
		// You must not make a backward incompatible change to any AIDL file built
		// with the aidl_interface module type with versions property set. The module
		// type is used to build AIDL files in a way that they can be used across
		// independently updatable components of the system. If a device is shipped
		// with such a backward incompatible change, it has a high risk of breaking
		// later when a module using the interface is updated, e.g., Mainline modules.

		package android.hardware.radio.network;
		@Backing(type="int") @JavaDerive(toString=true) @VintfStability
		enum LocationResponseType {
		REJECTED = 0,
		ACCEPTED_NO_LOCATION_PROVIDED = 1,
		ACCEPTED_LOCATION_PROVIDED = 2,
		}

radio/aidl/android/hardware/radio/network/IRadioNetwork.aidl

+0 −26

Original line number	Diff line number	Diff line
		@@ -555,30 +555,4 @@ oneway interface IRadioNetwork {
		* Response function is IRadioNetworkResponse.setN1ModeEnabledResponse()
		*/
		void setN1ModeEnabled(in int serial, boolean enable);

		/**
		* This API updates the current user setting of sharing the location data. This value must be
		* used by radio before honoring a network initiated location request for non emergency use
		* cases. The radio shall ignore this setting during emergency call, emergency SMS or emergency
		* call back modes and continue to provide the location information to the network initiated
		* location requests.
		*
		* @param serial Serial number of request.
		* @param shareLocation Whether to share location data to the network or not. true means the
		* radio is allowed to provide location data for any network initiated locations
		* request. false means the radio must not share location data for any network initiated
		* location requests for non-emergency use cases.
		*
		* Response function is IRadioNetworkResponse.setLocationPrivacySettingResponse()
		*/
		void setLocationPrivacySetting(in int serial, in boolean shareLocation);

		/**
		* Request the current setting of sharing the location data.
		*
		* @param serial Serial number of request.
		*
		* Response function is IRadioNetworkResponse.getLocationPrivacySettingResponse()
		*/
		void getLocationPrivacySetting(in int serial);
		}