am c9f1b3a0: Merge "Add new API to set voicemail number." into lmp-mr1-dev (2f74e913) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -28703,6 +28703,7 @@ package android.telephony {
		method public boolean setGlobalPreferredNetworkType();
		method public void setLine1NumberForDisplay(java.lang.String, java.lang.String);
		method public boolean setOperatorBrandOverride(java.lang.String);
		method public boolean setVoiceMailNumber(java.lang.String, java.lang.String);
		field public static final java.lang.String ACTION_PHONE_STATE_CHANGED = "android.intent.action.PHONE_STATE";
		field public static final java.lang.String ACTION_RESPOND_VIA_MESSAGE = "android.intent.action.RESPOND_VIA_MESSAGE";
		field public static final int CALL_STATE_IDLE = 0; // 0x0

+35 −0

Original line number	Diff line number	Diff line
		@@ -1972,6 +1972,41 @@ public class TelephonyManager {
		}
		}

		/**
		* Sets the voice mail number.
		* <p>
		* Requires Permission:
		* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}
		* Or the calling app has carrier privileges. @see #hasCarrierPrivileges
		*
		* @param alphaTag The alpha tag to display.
		* @param number The voicemail number.
		*/
		public boolean setVoiceMailNumber(String alphaTag, String number) {
		return setVoiceMailNumber(getDefaultSubscription(), alphaTag, number);
		}

		/**
		* Sets the voicemail number for the given subscriber.
		* <p>
		* Requires Permission:
		* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}
		* Or the calling app has carrier privileges. @see #hasCarrierPrivileges
		*
		* @param subId The subscriber id.
		* @param alphaTag The alpha tag to display.
		* @param number The voicemail number.
		*/
		/** {@hide} */
		public boolean setVoiceMailNumber(int subId, String alphaTag, String number) {
		try {
		return getITelephony().setVoiceMailNumber(subId, alphaTag, number);
		} catch (RemoteException ex) {
		} catch (NullPointerException ex) {
		}
		return false;
		}

		/**
		* Returns the voice mail count. Return 0 if unavailable.
		* <p>

+5 −0

Original line number	Diff line number	Diff line
		@@ -416,6 +416,11 @@ interface ITelephony {
		*/
		boolean needsOtaServiceProvisioning();

		/**
		* Sets the voicemail number for a particular subscriber.
		*/
		boolean setVoiceMailNumber(int subId, String alphaTag, String number);

		/**
		* Returns the unread count of voicemails
		*/