Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ClipboardService device lock check for cross profile am: 6d79675e0c am: 095eda9307 am: a4f6ca3e77 am: 85439e9114

Browse Source 
am: 17735f183a

Change-Id: I71795f8f2f454956797ffaa78d22ca3573e5d626
This commit is contained in:
Siyamed Sinir
2017-09-30 00:51:02 +00:00
committed by android-build-merger
parent 3be1269c0a 17735f183a
commit d93f91a137
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/clipboard/ClipboardService.java
View File

@@ -315,8 +315,14 @@ public class ClipboardService extends IClipboard.Stub {
}
private boolean isDeviceLocked() {
final KeyguardManager keyguardManager = mContext.getSystemService(KeyguardManager.class);
return keyguardManager != null && keyguardManager.isDeviceLocked();
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) {