Merge "Remvoe getCompleteVoiceMailNumber* from PhoneSubInfoController.java" (547ae613) · Commits · e / os / android_frameworks_opt_telephony

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

+0 −19

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@

		package com.android.internal.telephony;

		import static android.Manifest.permission.CALL_PRIVILEGED;
		import static android.Manifest.permission.MODIFY_PHONE_STATE;
		import static android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE;

		@@ -284,24 +283,6 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub {
		}
		}

		// TODO: change getCompleteVoiceMailNumber() to require READ_PRIVILEGED_PHONE_STATE
		public String getCompleteVoiceMailNumber() {
		return getCompleteVoiceMailNumberForSubscriber(getDefaultSubscription());
		}

		public String getCompleteVoiceMailNumberForSubscriber(int subId) {
		Phone phone = getPhone(subId);
		if (phone != null) {
		mContext.enforceCallingOrSelfPermission(CALL_PRIVILEGED, "Requires CALL_PRIVILEGED");
		String number = phone.getVoiceMailNumber();
		if (VDBG) log("VM: getCompleteVoiceMailNUmber: " + number);
		return number;
		} else {
		loge("getCompleteVoiceMailNumber phone is null for Subscription:" + subId);
		return null;
		}
		}

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