Merge "Add new vendor prefix files" am: 3c8b42a5c3 am: 34510d0895 (01786440) · Commits · e / os / android_frameworks_opt_telephony

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -3670,7 +3670,7 @@ public class GsmCdmaPhone extends Phone {
		cdmaApplication.getType() == AppType.APPTYPE_RUIM);
		}

		private void phoneObjectUpdater(int newVoiceRadioTech) {
		protected void phoneObjectUpdater(int newVoiceRadioTech) {
		logd("phoneObjectUpdater: newVoiceRadioTech=" + newVoiceRadioTech);

		// Check for a voice over LTE/NR replacement

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

+9 −4

Original line number	Diff line number	Diff line
		@@ -169,8 +169,9 @@ public class PhoneFactory {
		sUiccController = UiccController.make(context);

		Rlog.i(LOG_TAG, "Creating SubscriptionController");
		SubscriptionController sc = SubscriptionController.init(context);
		MultiSimSettingController.init(context, sc);
		TelephonyComponentFactory.getInstance().inject(SubscriptionController.class.
		getName()).initSubscriptionController(context);
		MultiSimSettingController.init(context, SubscriptionController.getInstance());

		if (context.getPackageManager().hasSystemFeature(
		PackageManager.FEATURE_TELEPHONY_EUICC)) {
		@@ -228,7 +229,9 @@ public class PhoneFactory {
		int maxActivePhones = sPhoneConfigurationManager
		.getNumberOfModemsWithSimultaneousDataConnections();

		sPhoneSwitcher = PhoneSwitcher.make(maxActivePhones, sContext, Looper.myLooper());
		sPhoneSwitcher = TelephonyComponentFactory.getInstance().inject(
		PhoneSwitcher.class.getName()).
		makePhoneSwitcher(maxActivePhones, sContext, Looper.myLooper());

		sProxyController = ProxyController.getInstance(context);

		@@ -285,8 +288,10 @@ public class PhoneFactory {

		// We always use PHONE_TYPE_CDMA_LTE now.
		if (phoneType == PHONE_TYPE_CDMA) phoneType = PHONE_TYPE_CDMA_LTE;
		TelephonyComponentFactory injectedComponentFactory =
		TelephonyComponentFactory.getInstance().inject(GsmCdmaPhone.class.getName());

		return new GsmCdmaPhone(context,
		return injectedComponentFactory.makePhone(context,
		sCommandsInterfaces[phoneId], sPhoneNotifier, phoneId, phoneType,
		TelephonyComponentFactory.getInstance());
		}

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -446,7 +446,7 @@ public class ServiceStateTracker extends Handler {

		//Common
		@UnsupportedAppUsage
		private final GsmCdmaPhone mPhone;
		protected final GsmCdmaPhone mPhone;

		private CellIdentity mCellIdentity;
		private CellIdentity mNewCellIdentity;
		@@ -2076,7 +2076,7 @@ public class ServiceStateTracker extends Handler {
		}
		}

		void handlePollStateResultMessage(int what, AsyncResult ar) {
		protected void handlePollStateResultMessage(int what, AsyncResult ar) {
		int ints[];
		switch (what) {
		case EVENT_POLL_STATE_CS_CELLULAR_REGISTRATION: {

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -133,7 +133,7 @@ public class SubscriptionController extends ISub.Stub {
		protected final Object mLock = new Object();

		/** The singleton instance. */
		private static SubscriptionController sInstance = null;
		protected static SubscriptionController sInstance = null;
		@UnsupportedAppUsage
		protected Context mContext;
		protected TelephonyManager mTelephonyManager;
		@@ -143,7 +143,7 @@ public class SubscriptionController extends ISub.Stub {

		// Each slot can have multiple subs.
		private static Map<Integer, ArrayList<Integer>> sSlotIndexToSubIds = new ConcurrentHashMap<>();
		private static int mDefaultFallbackSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
		protected static int mDefaultFallbackSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
		@UnsupportedAppUsage
		private static int mDefaultPhoneId = SubscriptionManager.DEFAULT_PHONE_INDEX;

		@@ -247,7 +247,7 @@ public class SubscriptionController extends ISub.Stub {
		}

		@UnsupportedAppUsage
		private void enforceModifyPhoneState(String message) {
		protected void enforceModifyPhoneState(String message) {
		mContext.enforceCallingOrSelfPermission(
		android.Manifest.permission.MODIFY_PHONE_STATE, message);
		}
		@@ -2150,7 +2150,7 @@ public class SubscriptionController extends ISub.Stub {
		}

		@UnsupportedAppUsage
		private void logdl(String msg) {
		protected void logdl(String msg) {
		logd(msg);
		mLocalLog.log(msg);
		}
		@@ -2383,7 +2383,7 @@ public class SubscriptionController extends ISub.Stub {
		* the first sub is set as default subscription
		*/
		@UnsupportedAppUsage
		private void setDefaultFallbackSubId(int subId, int subscriptionType) {
		protected void setDefaultFallbackSubId(int subId, int subscriptionType) {
		if (subId == SubscriptionManager.DEFAULT_SUBSCRIPTION_ID) {
		throw new RuntimeException("setDefaultSubId called with DEFAULT_SUB_ID");
		}

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

+16 −0

Original line number	Diff line number	Diff line
		@@ -420,4 +420,20 @@ public class TelephonyComponentFactory {
		public DataEnabledSettings makeDataEnabledSettings(Phone phone) {
		return new DataEnabledSettings(phone);
		}

		public Phone makePhone(Context context, CommandsInterface ci, PhoneNotifier notifier,
		int phoneId, int precisePhoneType,
		TelephonyComponentFactory telephonyComponentFactory) {
		return new GsmCdmaPhone(context, ci, notifier, phoneId, precisePhoneType,
		telephonyComponentFactory);
		}

		public SubscriptionController initSubscriptionController(Context c) {
		return SubscriptionController.init(c);
		}

		public PhoneSwitcher makePhoneSwitcher(int maxDataAttachModemCount, Context context,
		Looper looper) {
		return PhoneSwitcher.make(maxDataAttachModemCount, context, looper);
		}
		}