Merge "Revert "[Telephony] Add Location Privacy HAL"" (7c9b1e92) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/NetworkIndication.java

+0 −15

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import static com.android.internal.telephony.RILConstants.RIL_UNSOL_EMERGENCY_NE
		import static com.android.internal.telephony.RILConstants.RIL_UNSOL_LCEDATA_RECV;
		import static com.android.internal.telephony.RILConstants.RIL_UNSOL_NETWORK_SCAN_RESULT;
		import static com.android.internal.telephony.RILConstants.RIL_UNSOL_NITZ_TIME_RECEIVED;
		import static com.android.internal.telephony.RILConstants.RIL_UNSOL_ON_NETWORK_INITIATED_LOCATION_RESULT;
		import static com.android.internal.telephony.RILConstants.RIL_UNSOL_PHYSICAL_CHANNEL_CONFIG;
		import static com.android.internal.telephony.RILConstants.RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED;
		import static com.android.internal.telephony.RILConstants.RIL_UNSOL_RESPONSE_NETWORK_STATE_CHANGED;
		@@ -403,20 +402,6 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub {
		new AsyncResult(null, response, null));
		}

		/**
		* Reports the result of the network initiated location request.
		*
		* @param locationResponseType result of the network initiated location request.
		* Define by LocationResponseType.
		*/
		public void onNetworkInitiatedLocationResult(int indicationType, int locationResponseType) {
		mRil.processIndication(HAL_SERVICE_NETWORK, indicationType);

		if (mRil.isLogOrTrace()) {
		mRil.unsljLogvRet(RIL_UNSOL_ON_NETWORK_INITIATED_LOCATION_RESULT, locationResponseType);
		}
		}

		@Override
		public String getInterfaceHash() {
		return IRadioNetworkIndication.HASH;

+0 −16

Original line number	Diff line number	Diff line
		@@ -523,22 +523,6 @@ public class NetworkResponse extends IRadioNetworkResponse.Stub {
		RadioResponse.responseVoid(HAL_SERVICE_NETWORK, mRil, responseInfo);
		}

		/**
		* @param responseInfo Response info struct containing response type, serial no. and error
		*/
		public void setLocationPrivacySettingResponse(RadioResponseInfo responseInfo) {
		RadioResponse.responseVoid(HAL_SERVICE_NETWORK, mRil, responseInfo);
		}

		/**
		* @param responseInfo Response info struct containing response type, serial no. and error.
		* @param shareLocation Indicates whether the location sharing is allowed or not.
		*/
		public void getLocationPrivacySettingResponse(
		RadioResponseInfo responseInfo, boolean shareLocation) {
		RadioResponse.responseInts(HAL_SERVICE_NETWORK, mRil, responseInfo, shareLocation ? 1 : 0);
		}

		@Override
		public String getInterfaceHash() {
		return IRadioNetworkResponse.HASH;