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

Check callingpackage for calling UID consistency with phoneAccountHandle.

Browse Source 
Test: manual
Bug: 192663798
Bug: 192663553
Change-Id: Idd2ea20cd17933f86011b8ddc1037903725c2461
This commit is contained in:
Shuo Qian
2021-07-13 17:39:12 -07:00
committed by Tyler Gunn
parent 4ce929278f
commit 911d4646f3
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
telecomm/java/android/telecom/TelecomManager.java
View File

@@ -2430,7 +2430,8 @@ public class TelecomManager {
ITelecomService service = getTelecomService();
if (service != null) {
try {
return service.isIncomingCallPermitted(phoneAccountHandle);
return service.isIncomingCallPermitted(phoneAccountHandle,
mContext.getOpPackageName());
} catch (RemoteException e) {
Log.e(TAG, "Error isIncomingCallPermitted", e);
}
@@ -2463,7 +2464,8 @@ public class TelecomManager {
ITelecomService service = getTelecomService();
if (service != null) {
try {
return service.isOutgoingCallPermitted(phoneAccountHandle);
return service.isOutgoingCallPermitted(phoneAccountHandle,
mContext.getOpPackageName());
} catch (RemoteException e) {
Log.e(TAG, "Error isOutgoingCallPermitted", e);
}

6
telecomm/java/com/android/internal/telecom/ITelecomService.aidl
View File

@@ -306,12 +306,14 @@ interface ITelecomService {
/**
* @see TelecomServiceImpl#isIncomingCallPermitted
*/
boolean isIncomingCallPermitted(in PhoneAccountHandle phoneAccountHandle);
boolean isIncomingCallPermitted(in PhoneAccountHandle phoneAccountHandle,
String callingPackage);
/**
* @see TelecomServiceImpl#isOutgoingCallPermitted
*/
boolean isOutgoingCallPermitted(in PhoneAccountHandle phoneAccountHandle);
boolean isOutgoingCallPermitted(in PhoneAccountHandle phoneAccountHandle,
String callingPackage);
/**
* @see TelecomServiceImpl#waitOnHandler