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 am: 5afc7541dd

Browse Source 
am: b724c4800f

Change-Id: I9a53ab85e3c22ac54c46d01dd7123aed48f5631b
This commit is contained in:
Brad Ebinger
2018-12-03 07:51:14 -08:00
committed by android-build-merger
parent 3a96f91ac5 b724c4800f
commit 9b2ec19f49
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

@@ -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

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

@@ -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) {

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

@@ -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