diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-29 22:25:19 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-29 22:25:19 +0000 |
commit | af31c741176975c05cd019d747ee21783f0586e1 (patch) | |
tree | a1ab86447a10b6572c7a67d86a5406ce564c128f | |
parent | d7cd941bffb9558562d9e55c26e49c7c86ace8a3 (diff) | |
parent | a494aea5f9ee574316297ac3fd69abe9501ac8c8 (diff) | |
download | base-android-8.0.0_r25.tar.gz |
Merge cherrypicks of [2984450] into oc-dr1-releaseandroid-8.0.0_r25
Change-Id: Ic6c554d51098d23d8511edeb62e55ca87eee96d3
-rw-r--r-- | services/core/java/com/android/server/clipboard/ClipboardService.java | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/services/core/java/com/android/server/clipboard/ClipboardService.java b/services/core/java/com/android/server/clipboard/ClipboardService.java index efc930ebf8ea..db72c5e4cbab 100644 --- a/services/core/java/com/android/server/clipboard/ClipboardService.java +++ b/services/core/java/com/android/server/clipboard/ClipboardService.java @@ -20,7 +20,6 @@ import android.app.ActivityManager; import android.app.AppGlobals; import android.app.AppOpsManager; import android.app.IActivityManager; -import android.app.KeyguardManager; import android.content.ClipData; import android.content.ClipDescription; import android.content.ContentProvider; @@ -305,7 +304,7 @@ public class ClipboardService extends SystemService { public ClipData getPrimaryClip(String pkg) { synchronized (this) { if (!clipboardAccessAllowed(AppOpsManager.OP_READ_CLIPBOARD, pkg, - Binder.getCallingUid()) || isDeviceLocked()) { + Binder.getCallingUid())) { return null; } addActiveOwnerLocked(Binder.getCallingUid(), pkg); @@ -317,7 +316,7 @@ public class ClipboardService extends SystemService { public ClipDescription getPrimaryClipDescription(String callingPackage) { synchronized (this) { if (!clipboardAccessAllowed(AppOpsManager.OP_READ_CLIPBOARD, callingPackage, - Binder.getCallingUid()) || isDeviceLocked()) { + Binder.getCallingUid())) { return null; } PerUserClipboard clipboard = getClipboard(); @@ -329,7 +328,7 @@ public class ClipboardService extends SystemService { public boolean hasPrimaryClip(String callingPackage) { synchronized (this) { if (!clipboardAccessAllowed(AppOpsManager.OP_READ_CLIPBOARD, callingPackage, - Binder.getCallingUid()) || isDeviceLocked()) { + Binder.getCallingUid())) { return false; } return getClipboard().primaryClip != null; @@ -356,7 +355,7 @@ public class ClipboardService extends SystemService { public boolean hasClipboardText(String callingPackage) { synchronized (this) { if (!clipboardAccessAllowed(AppOpsManager.OP_READ_CLIPBOARD, callingPackage, - Binder.getCallingUid()) || isDeviceLocked()) { + Binder.getCallingUid())) { return false; } PerUserClipboard clipboard = getClipboard(); @@ -434,12 +433,6 @@ public class ClipboardService extends SystemService { } } - private boolean isDeviceLocked() { - final KeyguardManager keyguardManager = getContext().getSystemService( - KeyguardManager.class); - return keyguardManager != null && keyguardManager.isDeviceLocked(); - } - private final void checkUriOwnerLocked(Uri uri, int uid) { if (!"content".equals(uri.getScheme())) { return; |