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

Merge "@EnforcePermission migrations - services.companion"

Browse Source
This commit is contained in:
TreeHugger Robot
2023-04-04 13:41:06 +00:00
committed by Android (Google) Code Review
parent 38fc9ebb5c aa21535e85
commit 96b461d9f1
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/companion/ICompanionDeviceManager.aidl
View File

@@ -49,6 +49,7 @@ interface ICompanionDeviceManager {
PendingIntent requestNotificationAccess(in ComponentName component, int userId);
/** @deprecated */
@EnforcePermission("MANAGE_COMPANION_DEVICES")
boolean isDeviceAssociatedForWifiConnection(in String packageName, in String macAddress,
int userId);

1
core/java/android/companion/virtual/IVirtualDeviceManager.aidl
View File

@@ -44,6 +44,7 @@ interface IVirtualDeviceManager {
* @param activityListener The listener to listen for activity changes in a virtual device.
* @param soundEffectListener The listener to listen for sound effect playback requests.
*/
@EnforcePermission("CREATE_VIRTUAL_DEVICE")
IVirtualDevice createVirtualDevice(
in IBinder token, String packageName, int associationId,
in VirtualDeviceParams params, in IVirtualDeviceActivityListener activityListener,

5
services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
View File

@@ -17,7 +17,6 @@
package com.android.server.companion;
import static android.Manifest.permission.MANAGE_COMPANION_DEVICES;
import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_VISIBLE;
import static android.content.pm.PackageManager.CERT_INPUT_SHA256;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
@@ -688,11 +687,11 @@ public class CompanionDeviceManagerService extends SystemService {
return nm.isNotificationListenerAccessGranted(component);
}
@android.annotation.EnforcePermission(android.Manifest.permission.MANAGE_COMPANION_DEVICES)
@Override
public boolean isDeviceAssociatedForWifiConnection(String packageName, String macAddress,
int userId) {
getContext().enforceCallingOrSelfPermission(
MANAGE_COMPANION_DEVICES, "isDeviceAssociated");
isDeviceAssociatedForWifiConnection_enforcePermission();
boolean bypassMacPermission = getContext().getPackageManager().checkPermission(
android.Manifest.permission.COMPANION_APPROVE_WIFI_CONNECTIONS, packageName)

5
services/companion/java/com/android/server/companion/virtual/VirtualDeviceManagerService.java
View File

@@ -233,6 +233,7 @@ public class VirtualDeviceManagerService extends SystemService {
}
};
@android.annotation.EnforcePermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)
@Override // Binder call
public IVirtualDevice createVirtualDevice(
IBinder token,
@@ -241,9 +242,7 @@ public class VirtualDeviceManagerService extends SystemService {
@NonNull VirtualDeviceParams params,
@NonNull IVirtualDeviceActivityListener activityListener,
@NonNull IVirtualDeviceSoundEffectListener soundEffectListener) {
getContext().enforceCallingOrSelfPermission(
android.Manifest.permission.CREATE_VIRTUAL_DEVICE,
"createVirtualDevice");
createVirtualDevice_enforcePermission();
final int callingUid = getCallingUid();
if (!PermissionUtils.validateCallingPackageName(getContext(), packageName)) {
throw new SecurityException(