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

Change SharedConnectivityService's permission check to use checkCallingOrSelfPermission

Browse Source 
Bug: 270611789
Test: "atest android.net.wifi.sharedconnectivity.cts.SharedConnectivityTest"
Change-Id: Ieed967b35a7de4d73190a849796853e18d0c0cb1
This commit is contained in:
Matt Walliser
2023-02-23 22:50:07 +00:00
parent e69874b0f0
commit 8d0547c39a
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wifi/java/src/android/net/wifi/sharedconnectivity/service/SharedConnectivityService.java
View File

@@ -130,10 +130,17 @@ public abstract class SharedConnectivityService extends Service {
@RequiresPermission(anyOf = {android.Manifest.permission.NETWORK_SETTINGS,
android.Manifest.permission.NETWORK_SETUP_WIZARD})
/**
* checkPermissions is using checkCallingOrSelfPermission to support CTS testing of this
* service. This does allow a process to bind to itself if it holds the proper
* permission. We do not consider this to be an issue given that the process can already
* access the service data since they are in the same process.
*/
private void checkPermissions() {
if (checkCallingPermission(NETWORK_SETTINGS) != PackageManager.PERMISSION_GRANTED
&& checkCallingPermission(NETWORK_SETUP_WIZARD)
!= PackageManager.PERMISSION_GRANTED) {
if (checkCallingOrSelfPermission(NETWORK_SETTINGS)
!= PackageManager.PERMISSION_GRANTED
&& checkCallingOrSelfPermission(NETWORK_SETUP_WIZARD)
!= PackageManager.PERMISSION_GRANTED) {
throw new SecurityException("Calling process must have NETWORK_SETTINGS or"
+ " NETWORK_SETUP_WIZARD permission");
}