Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 078de472 authored by Evan Chen's avatar Evan Chen
Browse files

Dont remove system role when disassociate 

Dont not need to remove the system role when disassociate
since it was pregranted by system but not from CDM

Test: cts
Bug: 273686630
Change-Id: I8ebaaedf41fe91fad376c37654800017c76a54aa
parent 5be8ccc6

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+5 −0
Original line number Diff line number Diff line
@@ -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.