Merge "PhoneAccount -> SubId for use in TelephonyManager#line1Number" into lmp-mr1-dev (989947fc) · Commits · e / os / android_packages_services_Telecomm

src/com/android/server/telecom/TelecomService.java

+20 −4

Original line number	Diff line number	Diff line
		@@ -448,10 +448,7 @@ public class TelecomService extends Service {
		return false;
		}

		int subId = SubscriptionManager.getDefaultVoiceSubId();
		if (accountHandle != null) {
		subId = mPhoneAccountRegistrar.getSubscriptionIdForPhoneAccount(accountHandle);
		}
		int subId = mPhoneAccountRegistrar.getSubscriptionIdForPhoneAccount(accountHandle);
		return !TextUtils.isEmpty(getTelephonyManager().getVoiceMailNumber(subId));
		} catch (Exception e) {
		Log.e(this, e, "getSubscriptionIdForPhoneAccount");
		@@ -459,6 +456,25 @@ public class TelecomService extends Service {
		}
		}

		/**
		* @see android.telecom.TelecomManager#getLine1Number
		*/
		@Override
		public String getLine1Number(PhoneAccountHandle accountHandle) {
		enforceReadPermissionOrDefaultDialer();
		try {
		if (!isVisibleToCaller(accountHandle)) {
		Log.w(this, "%s is not visible for the calling user", accountHandle);
		return null;
		}
		int subId = mPhoneAccountRegistrar.getSubscriptionIdForPhoneAccount(accountHandle);
		return getTelephonyManager().getLine1NumberForSubscriber(subId);
		} catch (Exception e) {
		Log.e(this, e, "getSubscriptionIdForPhoneAccount");
		throw e;
		}
		}

		/**
		* @see android.telecom.TelecomManager#silenceRinger
		*/