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

Commit 97cf09bb authored by Guojing Yuan's avatar Guojing Yuan Committed by Android (Google) Code Review
Browse files

Merge "[DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip... 

Merge "[DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt" into sc-dev
parents 649ff85e 71418ecf

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

+2 −4
Original line number Diff line number Diff line
@@ -429,10 +429,8 @@ public class CompanionDeviceManagerService extends SystemService implements Bind 
            mCallingPackage = callingPackage;

            request.setCallingPackage(callingPackage);



            if (mayAssociateWithoutPrompt(callingPackage, userId)) {

                Slog.i(LOG_TAG, "setSkipPrompt(true)");

                request.setSkipPrompt(true);

            }

            request.setSkipPrompt(mayAssociateWithoutPrompt(callingPackage, userId));



            callback.asBinder().linkToDeath(CompanionDeviceManagerService.this /* recipient */, 0);



            AndroidFuture<String> fetchProfileDescription =