Remove unused class PhoneSubInfoController (65360f2e) · Commits · e / os / android_frameworks_opt_telephony

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

deleted100644 → 0

+0 −291

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2006 The Android Open Source Project
		* Copyright (c) 2011-2013, The Linux Foundation. All rights reserved.
		* Not a Contribution.
		*
		* 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.
		*/

		package com.android.internal.telephony;

		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.telephony.SubscriptionManager;
		import android.telephony.Rlog;
		import android.telephony.TelephonyManager;

		import java.lang.NullPointerException;

		public class PhoneSubInfoController extends IPhoneSubInfo.Stub {
		private static final String TAG = "PhoneSubInfoController";
		private Phone[] mPhone;

		public PhoneSubInfoController(Phone[] phone) {
		mPhone = phone;
		if (ServiceManager.getService("iphonesubinfo") == null) {
		ServiceManager.addService("iphonesubinfo", this);
		}
		}

		public String getDeviceId(String callingPackage) {
		return getDeviceIdForPhone(SubscriptionManager.getPhoneId(getDefaultSubscription()));
		}

		public String getDeviceIdForPhone(int phoneId) {
		Phone phone = getPhone(phoneId);
		if (phone != null) {
		return phone.getDeviceId();
		} else {
		Rlog.e(TAG,"getDeviceIdForPhone phone " + phoneId + " is null");
		return null;
		}
		}

		public String getNaiForSubscriber(int subId, String callingPackage) {
		PhoneSubInfoProxy phoneSubInfoProxy = getPhoneSubInfoProxy(subId);
		if (phoneSubInfoProxy != null) {
		return phoneSubInfoProxy.getNai(callingPackage);
		} else {
		Rlog.e(TAG,"getNai phoneSubInfoProxy is null" +
		" for Subscription:" + subId);
		return null;
		}
		}

		public String getImeiForSubscriber(int subId, String callingPackage) {
		PhoneSubInfoProxy phoneSubInfoProxy = getPhoneSubInfoProxy(subId);
		if (phoneSubInfoProxy != null) {
		return phoneSubInfoProxy.getImei(callingPackage);
		} else {
		Rlog.e(TAG,"getDeviceId phoneSubInfoProxy is null" +
		" for Subscription:" + subId);
		return null;
		}
		}

		public String getDeviceSvn(String callingPackage) {
		return getDeviceSvnUsingSubId(getDefaultSubscription(), callingPackage);
		}

		public String getDeviceSvnUsingSubId(int subId, String callingPackage) {
		PhoneSubInfoProxy phoneSubInfoProxy = getPhoneSubInfoProxy(subId);
		if (phoneSubInfoProxy != null) {
		return phoneSubInfoProxy.getDeviceSvn(callingPackage);
		} else {
		Rlog.e(TAG,"getDeviceSvn phoneSubInfoProxy is null");
		return null;
		}
		}

		public String getSubscriberId(String callingPackage) {
		return getSubscriberIdForSubscriber(getDefaultSubscription(), callingPackage);
		}

		public String getSubscriberIdForSubscriber(int subId, String callingPackage) {
		PhoneSubInfoProxy phoneSubInfoProxy = getPhoneSubInfoProxy(subId);
		if (phoneSubInfoProxy != null) {
		return phoneSubInfoProxy.getSubscriberId(callingPackage);
		} else {
		Rlog.e(TAG,"getSubscriberId phoneSubInfoProxy is" +
		" null for Subscription:" + subId);
		return null;
		}
		}

		/**
		* Retrieves the serial number of the ICC, if applicable.
		*/
		public String getIccSerialNumber(String callingPackage) {
		return getIccSerialNumberForSubscriber(getDefaultSubscription(), callingPackage);
		}

		public String getIccSerialNumberForSubscriber(int subId, String callingPackage) {
		PhoneSubInfoProxy phoneSubInfoProxy = getPhoneSubInfoProxy(subId);
		if (phoneSubInfoProxy != null) {
		return phoneSubInfoProxy.getIccSerialNumber(callingPackage);
		} else {
		Rlog.e(TAG,"getIccSerialNumber phoneSubInfoProxy is" +
		" null for Subscription:" + subId);
		return null;
		}
		}

		public String getLine1Number(String callingPackage) {
		return getLine1NumberForSubscriber(getDefaultSubscription(), callingPackage);
		}

		public String getLine1NumberForSubscriber(int subId, String callingPackage) {
		PhoneSubInfoProxy phoneSubInfoProxy = getPhoneSubInfoProxy(subId);
		if (phoneSubInfoProxy != null) {
		return phoneSubInfoProxy.getLine1Number(callingPackage);
		} else {
		Rlog.e(TAG,"getLine1Number phoneSubInfoProxy is" +
		" null for Subscription:" + subId);
		return null;
		}
		}

		public String getLine1AlphaTag(String callingPackage) {
		return getLine1AlphaTagForSubscriber(getDefaultSubscription(), callingPackage);
		}

		public String getLine1AlphaTagForSubscriber(int subId, String callingPackage) {
		PhoneSubInfoProxy phoneSubInfoProxy = getPhoneSubInfoProxy(subId);
		if (phoneSubInfoProxy != null) {
		return phoneSubInfoProxy.getLine1AlphaTag(callingPackage);
		} else {
		Rlog.e(TAG,"getLine1AlphaTag phoneSubInfoProxy is" +
		" null for Subscription:" + subId);
		return null;
		}
		}

		public String getMsisdn(String callingPackage) {
		return getMsisdnForSubscriber(getDefaultSubscription(), callingPackage);
		}

		public String getMsisdnForSubscriber(int subId, String callingPackage) {
		PhoneSubInfoProxy phoneSubInfoProxy = getPhoneSubInfoProxy(subId);
		if (phoneSubInfoProxy != null) {
		return phoneSubInfoProxy.getMsisdn(callingPackage);
		} else {
		Rlog.e(TAG,"getMsisdn phoneSubInfoProxy is" +
		" null for Subscription:" + subId);
		return null;
		}
		}

		public String getVoiceMailNumber(String callingPackage) {
		return getVoiceMailNumberForSubscriber(getDefaultSubscription(), callingPackage);
		}

		public String getVoiceMailNumberForSubscriber(int subId, String callingPackage) {
		PhoneSubInfoProxy phoneSubInfoProxy = getPhoneSubInfoProxy(subId);
		if (phoneSubInfoProxy != null) {
		return phoneSubInfoProxy.getVoiceMailNumber(callingPackage);
		} else {
		Rlog.e(TAG,"getVoiceMailNumber phoneSubInfoProxy is" +
		" null for Subscription:" + subId);
		return null;
		}
		}

		public String getCompleteVoiceMailNumber() {
		return getCompleteVoiceMailNumberForSubscriber(getDefaultSubscription());
		}

		public String getCompleteVoiceMailNumberForSubscriber(int subId) {
		PhoneSubInfoProxy phoneSubInfoProxy = getPhoneSubInfoProxy(subId);
		if (phoneSubInfoProxy != null) {
		return phoneSubInfoProxy.getCompleteVoiceMailNumber();
		} else {
		Rlog.e(TAG,"getCompleteVoiceMailNumber phoneSubInfoProxy" +
		" is null for Subscription:" + subId);
		return null;
		}
		}

		public String getVoiceMailAlphaTag(String callingPackage) {
		return getVoiceMailAlphaTagForSubscriber(getDefaultSubscription(), callingPackage);
		}

		public String getVoiceMailAlphaTagForSubscriber(int subId, String callingPackage) {
		PhoneSubInfoProxy phoneSubInfoProxy = getPhoneSubInfoProxy(subId);
		if (phoneSubInfoProxy != null) {
		return phoneSubInfoProxy.getVoiceMailAlphaTag(callingPackage);
		} else {
		Rlog.e(TAG,"getVoiceMailAlphaTag phoneSubInfoProxy is" +
		" null for Subscription:" + subId);
		return null;
		}
		}

		/**
		* get Phone sub info proxy object based on subId.
		**/
		private PhoneSubInfoProxy getPhoneSubInfoProxy(int subId) {

		int phoneId = SubscriptionManager.getPhoneId(subId);

		try {
		return getPhone(phoneId).getPhoneSubInfoProxy();
		} catch (NullPointerException e) {
		Rlog.e(TAG, "Exception is :" + e.toString() + " For subId :" + subId);
		e.printStackTrace();
		return null;
		}
		}

		private PhoneProxy getPhone(int phoneId) {
		if (phoneId < 0 \|\| phoneId >= TelephonyManager.getDefault().getPhoneCount()) {
		phoneId = 0;
		}
		return (PhoneProxy) mPhone[phoneId];
		}

		private int getDefaultSubscription() {
		return PhoneFactory.getDefaultSubscription();
		}


		public String getIsimImpi() {
		PhoneSubInfoProxy phoneSubInfoProxy = getPhoneSubInfoProxy(getDefaultSubscription());
		return phoneSubInfoProxy.getIsimImpi();
		}

		public String getIsimDomain() {
		PhoneSubInfoProxy phoneSubInfoProxy = getPhoneSubInfoProxy(getDefaultSubscription());
		return phoneSubInfoProxy.getIsimDomain();
		}

		public String[] getIsimImpu() {
		PhoneSubInfoProxy phoneSubInfoProxy = getPhoneSubInfoProxy(getDefaultSubscription());
		return phoneSubInfoProxy.getIsimImpu();
		}

		public String getIsimIst() throws RemoteException {
		PhoneSubInfoProxy phoneSubInfoProxy = getPhoneSubInfoProxy(getDefaultSubscription());
		return phoneSubInfoProxy.getIsimIst();
		}

		public String[] getIsimPcscf() throws RemoteException {
		PhoneSubInfoProxy phoneSubInfoProxy = getPhoneSubInfoProxy(getDefaultSubscription());
		return phoneSubInfoProxy.getIsimPcscf();
		}

		public String getIsimChallengeResponse(String nonce) throws RemoteException {
		PhoneSubInfoProxy phoneSubInfoProxy = getPhoneSubInfoProxy(getDefaultSubscription());
		return phoneSubInfoProxy.getIsimChallengeResponse(nonce);
		}

		public String getIccSimChallengeResponse(int subId, int appType, String data)
		throws RemoteException {
		PhoneSubInfoProxy phoneSubInfoProxy = getPhoneSubInfoProxy(subId);
		return phoneSubInfoProxy.getIccSimChallengeResponse(subId, appType, data);
		}

		public String getGroupIdLevel1(String callingPackage) {
		return getGroupIdLevel1ForSubscriber(getDefaultSubscription(), callingPackage);
		}

		public String getGroupIdLevel1ForSubscriber(int subId, String callingPackage) {
		PhoneSubInfoProxy phoneSubInfoProxy = getPhoneSubInfoProxy(subId);
		if (phoneSubInfoProxy != null) {
		return phoneSubInfoProxy.getGroupIdLevel1(callingPackage);
		} else {
		Rlog.e(TAG,"getGroupIdLevel1 phoneSubInfoProxy is" +
		" null for Subscription:" + subId);
		return null;
		}
		}
		}

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

+0 −4

Original line number	Diff line number	Diff line
		@@ -82,9 +82,6 @@ public class ProxyController {
		//UiccPhoneBookController to use proper IccPhoneBookInterfaceManagerProxy object
		private UiccPhoneBookController mUiccPhoneBookController;

		//PhoneSubInfoController to use proper PhoneSubInfoProxy object
		private PhoneSubInfoController mPhoneSubInfoController;

		//UiccSmsController to use proper IccSmsInterfaceManager object
		private UiccSmsController mUiccSmsController;

		@@ -135,7 +132,6 @@ public class ProxyController {

		mDctController = DctController.makeDctController(phoneProxy);
		mUiccPhoneBookController = new UiccPhoneBookController(mProxyPhones);
		mPhoneSubInfoController = new PhoneSubInfoController(mProxyPhones);
		mUiccSmsController = new UiccSmsController(mProxyPhones);
		mSetRadioAccessFamilyStatus = new int[mProxyPhones.length];
		mNewRadioAccessFamily = new int[mProxyPhones.length];