diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-06 18:29:49 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-06 18:29:49 +0000 |
commit | a03f25d5d97c201bee3688c2f3ff22928885b119 (patch) | |
tree | 80123766f9a483db7d9187601b5e64b3d0c7ac30 | |
parent | cafad803284c9bed8bc1ef95cdbde3138e7ed291 (diff) | |
parent | 1ff2f6541e76dcd31cce4463c7ca4d84eda6a7da (diff) | |
download | base-a03f25d5d97c201bee3688c2f3ff22928885b119.tar.gz |
Merge cherrypicks of [3026768, 3026929, 3026930, 3026931, 3026932, 3026933, 3026934, 3026935, 3026936, 3026937, 3026938, 3026939, 3026734] into nyc-mr2-release
Change-Id: I2059608bfea23e1f8b2e3de4a19e1884d9fde8f2
-rw-r--r-- | services/core/java/com/android/server/clipboard/ClipboardService.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/clipboard/ClipboardService.java b/services/core/java/com/android/server/clipboard/ClipboardService.java index bdd2d2bc7059..6f59e845219e 100644 --- a/services/core/java/com/android/server/clipboard/ClipboardService.java +++ b/services/core/java/com/android/server/clipboard/ClipboardService.java @@ -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) { |