Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Actually check for READ_PHONE_STATE permission for Voicemail query" am: 539f4f44c1

Browse Source 
am: 5afc7541dd

Change-Id: I854846a6033dd17228563c7801060f1faabf761e
This commit is contained in:
Brad Ebinger
2018-11-30 11:18:26 -08:00
committed by android-build-merger
parent 83735846d4 5afc7541dd
commit b724c4800f
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/hiddenapi-light-greylist.txt
View File

@@ -3209,7 +3209,6 @@ Lcom/android/internal/telephony/ITelephony;->getCallState()I
Lcom/android/internal/telephony/ITelephony;->getDataActivity()I Lcom/android/internal/telephony/ITelephony;->getDataActivity()I
Lcom/android/internal/telephony/ITelephony;->getDataState()I Lcom/android/internal/telephony/ITelephony;->getDataState()I
Lcom/android/internal/telephony/ITelephony;->getNetworkType()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;->handlePinMmi(Ljava/lang/String;)Z
Lcom/android/internal/telephony/ITelephony;->handlePinMmiForSubscriber(ILjava/lang/String;)Z Lcom/android/internal/telephony/ITelephony;->handlePinMmiForSubscriber(ILjava/lang/String;)Z
Lcom/android/internal/telephony/ITelephony;->hasIccCard()Z Lcom/android/internal/telephony/ITelephony;->hasIccCard()Z

5
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -4192,7 +4192,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 * @param subId whose voice message count is returned
* @hide * @hide
*/ */
@@ -4203,7 +4204,7 @@ public class TelephonyManager {
ITelephony telephony = getITelephony(); ITelephony telephony = getITelephony();
if (telephony == null) if (telephony == null)
return 0; return 0;
return telephony.getVoiceMessageCountForSubscriber(subId); return telephony.getVoiceMessageCountForSubscriber(subId, getOpPackageName());
} catch (RemoteException ex) { } catch (RemoteException ex) {
return 0; return 0;
} catch (NullPointerException ex) { } catch (NullPointerException ex) {

7
telephony/java/com/android/internal/telephony/ITelephony.aidl
View File

@@ -392,17 +392,12 @@ interface ITelephony {
*/ */
int getDataActivationState(int subId, String callingPackage); int getDataActivationState(int subId, String callingPackage);
/**
* Returns the unread count of voicemails
*/
int getVoiceMessageCount();
/** /**
* Returns the unread count of voicemails for a subId. * Returns the unread count of voicemails for a subId.
* @param subId user preferred subId. * @param subId user preferred subId.
* Returns the unread count of voicemails * 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 * Returns true if current state supports both voice and data