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

Merge "Dont remove system role when disassociate" into udc-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-04-07 22:44:37 +00:00
committed by Android (Google) Code Review
parent 333bb7814f 078de47272
commit fd64019fcb
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@ package com.android.server.companion;
import static android.Manifest.permission.MANAGE_COMPANION_DEVICES;
import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_VISIBLE;
import static android.companion.AssociationRequest.DEVICE_PROFILE_AUTOMOTIVE_PROJECTION;
import static android.content.pm.PackageManager.CERT_INPUT_SHA256;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import static android.os.Process.SYSTEM_UID;
@@ -1066,6 +1067,10 @@ public class CompanionDeviceManagerService extends SystemService {
// No role was granted to for this association, there is nothing else we need to here.
return true;
}
// Do not need to remove the system role since it was pre-granted by the system.
if (deviceProfile.equals(DEVICE_PROFILE_AUTOMOTIVE_PROJECTION)) {
return true;
}
// Check if the applications is associated with another devices with the profile. If so,
// it should remain the role holder.