Merge "Change subId to int from long" into lmp-mr1-dev (3b62312e) · Commits · e / os / android_packages_services_Telecomm

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

+4 −15

Original line number	Diff line number	Diff line
		@@ -116,26 +116,15 @@ public final class PhoneAccountRegistrar {
		read();
		}

		/**
		* Retrieves the phone account id for a given subscription id if it exists. Subscription ids
		* apply only to PSTN/SIM card phone accounts so all other accounts should not have a
		* subscription id.
		* @param subscriptionId The subscription id for which to construct the phone account id
		* @return The string representing the phone account id for the subscription id.
		*/
		public String getPhoneAccountIdForSubscriptionId(long subscriptionId) {
		return String.valueOf(subscriptionId);
		}

		/**
		* Retrieves the subscription id for a given phone account if it exists. Subscription ids
		* apply only to PSTN/SIM card phone accounts so all other accounts should not have a
		* subscription id.
		* @param accountHandle The handle for the phone account for which to retrieve the
		* subscription id.
		* @return The value of the subscription id (long) or -1 if it does not exist or is not valid.
		* @return The value of the subscription id or -1 if it does not exist or is not valid.
		*/
		public long getSubscriptionIdForPhoneAccount(PhoneAccountHandle accountHandle) {
		public int getSubscriptionIdForPhoneAccount(PhoneAccountHandle accountHandle) {
		PhoneAccount account = getPhoneAccount(accountHandle);
		if (account == null \|\| !account.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION) \|\|
		!TextUtils.isDigitsOnly(accountHandle.getId())) {
		@@ -143,7 +132,7 @@ public final class PhoneAccountRegistrar {
		// numbers can be subscription id
		return -1;
		}
		return Long.parseLong(accountHandle.getId());
		return Integer.parseInt(accountHandle.getId());
		}

		/**
		@@ -455,7 +444,7 @@ public final class PhoneAccountRegistrar {
		}

		public boolean isVoiceMailNumber(PhoneAccountHandle accountHandle, String number) {
		long subId = getSubscriptionIdForPhoneAccount(accountHandle);
		int subId = getSubscriptionIdForPhoneAccount(accountHandle);
		return PhoneNumberUtils.isVoiceMailNumber(subId, number);
		}