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

Browse Source 
am: 85439e9114

Change-Id: Ic616bde55a3a60eec10d9330907e6d8164b76c86
This commit is contained in:
Siyamed Sinir
2017-09-30 00:37:54 +00:00
committed by android-build-merger
parent 0bdb7902d8 85439e9114
commit 17735f183a
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

@@ -307,8 +307,14 @@ public class ClipboardService extends IClipboard.Stub {
} }
private boolean isDeviceLocked() { private boolean isDeviceLocked() {
final KeyguardManager keyguardManager = mContext.getSystemService(KeyguardManager.class); final long token = Binder.clearCallingIdentity();
return keyguardManager != null && keyguardManager.isDeviceLocked(); 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) { private final void checkUriOwnerLocked(Uri uri, int uid) {