Merge "Add maxTargetSdk restriction to unused APIs." am: b91a3354ed (95378f8b) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ package com.android.internal.telephony;
		import android.compat.annotation.UnsupportedAppUsage;
		import android.content.Context;
		import android.os.AsyncResult;
		import android.os.Build;
		import android.os.Handler;
		import android.os.Message;
		import android.os.Registrant;
		@@ -156,7 +157,7 @@ public abstract class BaseCommands implements CommandsInterface {
		// Preferred network type received from PhoneFactory.
		// This is used when establishing a connection to the
		// vendor ril so it starts up in the correct mode.
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		protected int mPreferredNetworkType;
		// CDMA subscription received from PhoneFactory
		protected int mCdmaSubscription;

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

+7 −6

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.internal.telephony;

		import android.compat.annotation.UnsupportedAppUsage;
		import android.os.Build;

		import com.android.ims.internal.ConferenceParticipant;
		import com.android.telephony.Rlog;
		@@ -81,10 +82,10 @@ public abstract class Call {

		/* Instance Variables */

		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public State mState = State.IDLE;

		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public ArrayList<Connection> mConnections = new ArrayList<>();

		private Object mLock = new Object();
		@@ -120,9 +121,9 @@ public abstract class Call {
		}
		}

		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public abstract Phone getPhone();
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public abstract boolean isMultiparty();
		@UnsupportedAppUsage
		public abstract void hangup() throws CallStateException;
		@@ -208,7 +209,7 @@ public abstract class Call {
		* FIXME rename
		* @return true if the call contains only disconnected connections (if any)
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public boolean isIdle() {
		return !getState().isAlive();
		}
		@@ -305,7 +306,7 @@ public abstract class Call {
		* Returns the Connection associated with this Call that was created
		* last, or null if there are no Connections in this Call
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public Connection
		getLatestConnection() {
		List<Connection> l = getConnections();

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

+30 −29

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.internal.telephony;
		import android.compat.annotation.UnsupportedAppUsage;
		import android.content.Context;
		import android.os.AsyncResult;
		import android.os.Build;
		import android.os.Handler;
		import android.os.Message;
		import android.os.Registrant;
		@@ -87,23 +88,23 @@ public class CallManager {
		private static final CallManager INSTANCE = new CallManager();

		// list of registered phones, which are Phone objs
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		private final ArrayList<Phone> mPhones;

		// list of supported ringing calls
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		private final ArrayList<Call> mRingingCalls;

		// list of supported background calls
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		private final ArrayList<Call> mBackgroundCalls;

		// list of supported foreground calls
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		private final ArrayList<Call> mForegroundCalls;

		// empty connection list
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		private final ArrayList<Connection> mEmptyConnections = new ArrayList<Connection>();

		// mapping of phones to registered handler instances used for callbacks from RIL
		@@ -350,7 +351,7 @@ public class CallManager {
		* @param phone to be registered
		* @return true if register successfully
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public boolean registerPhone(Phone phone) {
		if (phone != null && !mPhones.contains(phone)) {

		@@ -376,7 +377,7 @@ public class CallManager {
		* unregister phone from CallManager
		* @param phone to be unregistered
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public void unregisterPhone(Phone phone) {
		if (phone != null && mPhones.contains(phone)) {

		@@ -408,7 +409,7 @@ public class CallManager {
		/**
		* return the default phone or null if no phone available
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public Phone getDefaultPhone() {
		return mDefaultPhone;
		}
		@@ -416,7 +417,7 @@ public class CallManager {
		/**
		* @return the phone associated with the foreground call
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public Phone getFgPhone() {
		return getActiveFgCall().getPhone();
		}
		@@ -433,7 +434,7 @@ public class CallManager {
		/**
		* @return the phone associated with the background call
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public Phone getBgPhone() {
		return getFirstActiveBgCall().getPhone();
		}
		@@ -441,7 +442,7 @@ public class CallManager {
		/**
		* @return the phone associated with the ringing call
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public Phone getRingingPhone() {
		return getFirstActiveRingingCall().getPhone();
		}
		@@ -529,7 +530,7 @@ public class CallManager {
		}
		*/

		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		private Context getContext() {
		Phone defaultPhone = getDefaultPhone();
		return ((defaultPhone == null) ? null : defaultPhone.getContext());
		@@ -726,7 +727,7 @@ public class CallManager {
		* @exception CallStateException if canConference() would return false.
		* In these cases, this operation may not be performed.
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public void conference(Call heldCall) throws CallStateException {
		int subId = heldCall.getPhone().getSubId();

		@@ -872,7 +873,7 @@ public class CallManager {
		* @param phone
		* @return true if the phone can make a new call
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		private boolean canDial(Phone phone) {
		int serviceState = phone.getServiceState().getState();
		int subId = phone.getSubId();
		@@ -1163,7 +1164,7 @@ public class CallManager {
		* <li>AsyncResult.result = a Connection object that is
		* no longer connected.</li></ul>
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public void registerForDisconnect(Handler h, int what, Object obj) {
		mDisconnectRegistrants.addUnique(h, what, obj);
		}
		@@ -1172,7 +1173,7 @@ public class CallManager {
		* Unregisters for voice disconnection notification.
		* Extraneous calls are tolerated silently
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public void unregisterForDisconnect(Handler h){
		mDisconnectRegistrants.remove(h);
		}
		@@ -1186,7 +1187,7 @@ public class CallManager {
		* AsyncResult.userData will be set to the obj argument here.
		* The <em>h</em> parameter is held only by a weak reference.
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public void registerForPreciseCallStateChanged(Handler h, int what, Object obj){
		mPreciseCallStateRegistrants.addUnique(h, what, obj);
		}
		@@ -1195,7 +1196,7 @@ public class CallManager {
		* Unregisters for voice call state change notifications.
		* Extraneous calls are tolerated silently.
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public void unregisterForPreciseCallStateChanged(Handler h){
		mPreciseCallStateRegistrants.remove(h);
		}
		@@ -1228,7 +1229,7 @@ public class CallManager {
		* If Connection.isRinging() is true, then
		* Connection.getCall() == Phone.getRingingCall()
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public void registerForNewRingingConnection(Handler h, int what, Object obj){
		mNewRingingConnectionRegistrants.addUnique(h, what, obj);
		}
		@@ -1238,7 +1239,7 @@ public class CallManager {
		* Extraneous calls are tolerated silently
		*/

		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public void unregisterForNewRingingConnection(Handler h){
		mNewRingingConnectionRegistrants.remove(h);
		}
		@@ -1641,7 +1642,7 @@ public class CallManager {
		/**
		* @return list of all ringing calls
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public List<Call> getRingingCalls() {
		return Collections.unmodifiableList(mRingingCalls);
		}
		@@ -1656,7 +1657,7 @@ public class CallManager {
		/**
		* @return list of all background calls
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public List<Call> getBackgroundCalls() {
		return Collections.unmodifiableList(mBackgroundCalls);
		}
		@@ -1664,7 +1665,7 @@ public class CallManager {
		/**
		* Return true if there is at least one active foreground call
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public boolean hasActiveFgCall() {
		return (getFirstActiveCall(mForegroundCalls) != null);
		}
		@@ -1681,7 +1682,7 @@ public class CallManager {
		/**
		* Return true if there is at least one active background call
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public boolean hasActiveBgCall() {
		// TODO since hasActiveBgCall may get called often
		// better to cache it to improve performance
		@@ -1792,7 +1793,7 @@ public class CallManager {
		*
		* Complete background calls list can be get by getBackgroundCalls()
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public Call getFirstActiveBgCall() {
		Call call = getFirstNonIdleCall(mBackgroundCalls);
		if (call == null) {
		@@ -1898,7 +1899,7 @@ public class CallManager {
		* @return the connections of active foreground call
		* return empty list if there is no active foreground call
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public List<Connection> getFgCallConnections() {
		Call fgCall = getActiveFgCall();
		if ( fgCall != null) {
		@@ -1923,7 +1924,7 @@ public class CallManager {
		* @return the connections of active background call
		* return empty list if there is no active background call
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public List<Connection> getBgCallConnections() {
		Call bgCall = getFirstActiveBgCall();
		if ( bgCall != null) {
		@@ -2015,7 +2016,7 @@ public class CallManager {
		return null;
		}

		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		private boolean hasMoreThanOneRingingCall() {
		int count = 0;
		for (Call call : mRingingCalls) {
		@@ -2033,7 +2034,7 @@ public class CallManager {
		* subId and also active calls on SIP Phone.
		*
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		private boolean hasMoreThanOneRingingCall(int subId) {
		int count = 0;
		for (Call call : mRingingCalls) {

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

+7 −6

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.internal.telephony;
		import android.compat.annotation.UnsupportedAppUsage;
		import android.content.Context;
		import android.os.AsyncResult;
		import android.os.Build;
		import android.os.Handler;
		import android.os.Message;
		import android.os.PersistableBundle;
		@@ -41,17 +42,17 @@ public abstract class CallTracker extends Handler {

		static final int POLL_DELAY_MSEC = 250;

		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		protected int mPendingOperations;
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		protected boolean mNeedsPoll;
		protected Message mLastRelevantPoll;
		protected ArrayList<Connection> mHandoverConnections = new ArrayList<Connection>();

		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public CommandsInterface mCi;

		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		protected boolean mNumberConverted = false;
		private final int VALID_COMPARE_LENGTH = 3;

		@@ -271,9 +272,9 @@ public abstract class CallTracker extends Handler {
		@UnsupportedAppUsage
		public abstract void registerForVoiceCallEnded(Handler h, int what, Object obj);
		public abstract void unregisterForVoiceCallEnded(Handler h);
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public abstract PhoneConstants.State getState();
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		protected abstract void log(String msg);

		/**

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import android.content.ServiceConnection;
		import android.content.pm.ComponentInfo;
		import android.content.pm.PackageManager;
		import android.content.pm.ResolveInfo;
		import android.os.Build;
		import android.os.Bundle;
		import android.os.Handler;
		import android.os.IBinder;
		@@ -61,7 +62,7 @@ public class CarrierServiceBindHelper {
		*/
		private static final int UNBIND_DELAY_MILLIS = 30 * 1000; // 30 seconds

		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		private Context mContext;
		@VisibleForTesting
		public SparseArray<AppBinding> mBindings = new SparseArray();
		@@ -94,7 +95,7 @@ public class CarrierServiceBindHelper {
		@VisibleForTesting
		public static final int EVENT_MULTI_SIM_CONFIG_CHANGED = 2;

		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		@VisibleForTesting
		public Handler mHandler = new Handler() {
		@Override