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

Commit f781a43d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22533769



Change-Id: I8308b86f76b2ad26e5250f09ff5620dd3645438d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 211f0e05 fd64019f

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.