Merge "Merge "Actually check for READ_PHONE_STATE permission for Voicemail... (a025ce48) · Commits · e / os / android_frameworks_base

config/hiddenapi-light-greylist.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -3128,7 +3128,6 @@ Lcom/android/internal/telephony/ITelephony;->getCallState()I
		Lcom/android/internal/telephony/ITelephony;->getDataActivity()I
		Lcom/android/internal/telephony/ITelephony;->getDataState()I
		Lcom/android/internal/telephony/ITelephony;->getNetworkType()I
		Lcom/android/internal/telephony/ITelephony;->getVoiceMessageCount()I
		Lcom/android/internal/telephony/ITelephony;->handlePinMmi(Ljava/lang/String;)Z
		Lcom/android/internal/telephony/ITelephony;->handlePinMmiForSubscriber(ILjava/lang/String;)Z
		Lcom/android/internal/telephony/ITelephony;->hasIccCard()Z

+3 −2

Original line number	Diff line number	Diff line
		@@ -4217,7 +4217,8 @@ public class TelephonyManager {
		}

		/**
		* Returns the voice mail count for a subscription. Return 0 if unavailable.
		* Returns the voice mail count for a subscription. Return 0 if unavailable or the caller does
		* not have the READ_PHONE_STATE permission.
		* @param subId whose voice message count is returned
		* @hide
		*/
		@@ -4228,7 +4229,7 @@ public class TelephonyManager {
		ITelephony telephony = getITelephony();
		if (telephony == null)
		return 0;
		return telephony.getVoiceMessageCountForSubscriber(subId);
		return telephony.getVoiceMessageCountForSubscriber(subId, getOpPackageName());
		} catch (RemoteException ex) {
		return 0;
		} catch (NullPointerException ex) {

+1 −6

Original line number	Diff line number	Diff line
		@@ -392,17 +392,12 @@ interface ITelephony {
		*/
		int getDataActivationState(int subId, String callingPackage);

		/**
		* Returns the unread count of voicemails
		*/
		int getVoiceMessageCount();

		/**
		* Returns the unread count of voicemails for a subId.
		* @param subId user preferred subId.
		* Returns the unread count of voicemails
		*/
		int getVoiceMessageCountForSubscriber(int subId);
		int getVoiceMessageCountForSubscriber(int subId, String callingPackage);

		/**
		* Returns true if current state supports both voice and data