Merge "Use Parcelable CellIdentity instead of CellLocation in AIDL." am: 4f42d17a51 am: 87b6d7b2c8 (df51f1fd) · Commits · e / os / android_frameworks_opt_telephony

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

+3 −6

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1538,7 +1538,7 @@ public class GsmCdmaCallTracker extends CallTracker {
	causeCode == CallFailCause.BEARER_NOT_AVAIL \|\|		causeCode == CallFailCause.BEARER_NOT_AVAIL \|\|
	causeCode == CallFailCause.ERROR_UNSPECIFIED) {		causeCode == CallFailCause.ERROR_UNSPECIFIED) {

	CellLocation loc = mPhone.getCellLocation();		CellLocation loc = mPhone.getCellIdentity().asCellLocation();
	int cid = -1;		int cid = -1;
	if (loc != null) {		if (loc != null) {
	if (loc instanceof GsmCellLocation) {		if (loc instanceof GsmCellLocation) {

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

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -60,7 +60,7 @@ import android.telecom.TelecomManager;
	import android.telecom.VideoProfile;		import android.telecom.VideoProfile;
	import android.telephony.AccessNetworkConstants;		import android.telephony.AccessNetworkConstants;
	import android.telephony.CarrierConfigManager;		import android.telephony.CarrierConfigManager;
	import android.telephony.CellLocation;		import android.telephony.CellIdentity;
	import android.telephony.DataFailCause;		import android.telephony.DataFailCause;
	import android.telephony.ImsiEncryptionInfo;		import android.telephony.ImsiEncryptionInfo;
	import android.telephony.NetworkScanRequest;		import android.telephony.NetworkScanRequest;
	@@ -522,8 +522,8 @@ public class GsmCdmaPhone extends Phone {
	}		}

	@Override		@Override
	public void getCellLocation(WorkSource workSource, Message rspMsg) {		public void getCellIdentity(WorkSource workSource, Message rspMsg) {
	mSST.requestCellLocation(workSource, rspMsg);		mSST.requestCellIdentity(workSource, rspMsg);
	}		}

	@UnsupportedAppUsage		@UnsupportedAppUsage
	@@ -811,12 +811,12 @@ public class GsmCdmaPhone extends Phone {
	}		}

	/**		/**
	* Notify that the CellLocation has changed.		* Notify that the cell location has changed.
	*		*
	* @param cl the new CellLocation		* @param cellIdentity the new CellIdentity
	*/		*/
	public void notifyLocationChanged(CellLocation cl) {		public void notifyLocationChanged(CellIdentity cellIdentity) {
	mNotifier.notifyCellLocation(this, cl);		mNotifier.notifyCellLocation(this, cellIdentity);
	}		}

	@Override		@Override

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

+5 −6

Original line number	Original line	Diff line number	Diff line
	@@ -45,8 +45,8 @@ import android.telephony.Annotation.ApnType;
	import android.telephony.Annotation.DataFailureCause;		import android.telephony.Annotation.DataFailureCause;
	import android.telephony.CarrierConfigManager;		import android.telephony.CarrierConfigManager;
	import android.telephony.CarrierRestrictionRules;		import android.telephony.CarrierRestrictionRules;
			import android.telephony.CellIdentity;
	import android.telephony.CellInfo;		import android.telephony.CellInfo;
	import android.telephony.CellLocation;
	import android.telephony.ClientRequestStats;		import android.telephony.ClientRequestStats;
	import android.telephony.ImsiEncryptionInfo;		import android.telephony.ImsiEncryptionInfo;
	import android.telephony.PhoneStateListener;		import android.telephony.PhoneStateListener;
	@@ -1864,17 +1864,16 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
	/**		/**
	* @return the current cell location if known		* @return the current cell location if known
	*/		*/
	@UnsupportedAppUsage		public CellIdentity getCellIdentity() {
	public CellLocation getCellLocation() {		return getServiceStateTracker().getCellIdentity();
	return getServiceStateTracker().getCellLocation();
	}		}

	/**		/**
	* @param workSource calling WorkSource		* @param workSource calling WorkSource
	* @param rspMsg the response message containing the cell location		* @param rspMsg the response message containing the cell location
	*/		*/
	public void getCellLocation(WorkSource workSource, Message rspMsg) {		public void getCellIdentity(WorkSource workSource, Message rspMsg) {
	getServiceStateTracker().requestCellLocation(workSource, rspMsg);		getServiceStateTracker().requestCellIdentity(workSource, rspMsg);
	}		}

	/**		/**

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

+7 −3

Original line number	Original line	Diff line number	Diff line
	@@ -21,8 +21,8 @@ import android.telephony.Annotation.DataFailureCause;
	import android.telephony.Annotation.RadioPowerState;		import android.telephony.Annotation.RadioPowerState;
	import android.telephony.Annotation.SrvccState;		import android.telephony.Annotation.SrvccState;
	import android.telephony.CallQuality;		import android.telephony.CallQuality;
			import android.telephony.CellIdentity;
	import android.telephony.CellInfo;		import android.telephony.CellInfo;
	import android.telephony.CellLocation;
	import android.telephony.PhoneCapability;		import android.telephony.PhoneCapability;
	import android.telephony.PreciseDataConnectionState;		import android.telephony.PreciseDataConnectionState;
	import android.telephony.emergency.EmergencyNumber;		import android.telephony.emergency.EmergencyNumber;
	@@ -39,8 +39,12 @@ public interface PhoneNotifier {

	void notifyServiceState(Phone sender);		void notifyServiceState(Phone sender);

	/** Notify registrants of the current CellLocation */		/**
	void notifyCellLocation(Phone sender, CellLocation cl);		* Notify registrants of the current CellLocation.
			*
			* <p>Use CellIdentity that is Parcellable to pass AIDL; convert to CellLocation in client code.
			*/
			void notifyCellLocation(Phone sender, CellIdentity cellIdentity);

	@UnsupportedAppUsage		@UnsupportedAppUsage
	void notifySignalStrength(Phone sender);		void notifySignalStrength(Phone sender);