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

Commit 6d79675e authored by Siyamed Sinir's avatar Siyamed Sinir
Browse files

Fix ClipboardService device lock check for cross profile 

ClipboardService.isDeviceLocked should clear callingIdentity before
accessing KeyguardManager.

Test: bit CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.ManagedProfileTest

Bug: 64934810
Change-Id: I81a7adac8c9d56ed801ffc1380fcbc987d5df3e6
Merged-In: I712abfe8d542cd1be9c1816f407c8912321ac480
parent 89a94b70

services/core/java/com/android/server/clipboard/ClipboardService.java

+8 −2
Original line number Diff line number Diff line
@@ -307,8 +307,14 @@ public class ClipboardService extends IClipboard.Stub { 
    }



    private boolean isDeviceLocked() {

        final KeyguardManager keyguardManager = mContext.getSystemService(KeyguardManager.class);

        final long token = Binder.clearCallingIdentity();

        try {

            final KeyguardManager keyguardManager = mContext.getSystemService(

                    KeyguardManager.class);

            return keyguardManager != null && keyguardManager.isDeviceLocked();

        } finally {

            Binder.restoreCallingIdentity(token);

        }

    }



    private final void checkUriOwnerLocked(Uri uri, int uid) {