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

Commit 48180dfe authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix the new keyguard check in CDM on HSUM builds" into main

parents fd7f4f6b 2b7292b6

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

+3 −1
Original line number Diff line number Diff line
@@ -695,8 +695,10 @@ public class CompanionDeviceManagerService extends SystemService { 
        }



        private void checkCallerCanSkipRoleGrant() {

            final Context context =

                    getContext().createContextAsUser(Binder.getCallingUserHandle(), 0);

            final KeyguardManager keyguardManager =

                    getContext().getSystemService(KeyguardManager.class);

                    context.getSystemService(KeyguardManager.class);

            if (keyguardManager != null && keyguardManager.isKeyguardSecure()) {

                throw new SecurityException("Skipping CDM role grant requires insecure keyguard.");

            }