commit a49f121fda433e838fcae356fc2098f95ee25420
author Adam Seaton <aseaton@google.com> Fri Sep 29 22:14:59 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Sep 29 22:26:25 2017 +0000
tree f8b9730742131791cfd06f4eb33f01e381380746
parent fb30ca641af9a0bdf77592cc836dbdb145d507e7

Revert "Prevent getting data from Clipboard if device is locked"

This reverts commit 93d77b07c34077b6c403c459b7bb75933446a502.

Change-Id: I3ab20d3de1cb1e5fa94fffb8b69683b7508a3503
(cherry picked from commit 4fd5096fffb5aba9cde567981e28558e31e86345)

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

diff --git a/services/core/java/com/android/server/clipboard/ClipboardService.java b/services/core/java/com/android/server/clipboard/ClipboardService.java
index efc930e..db72c5e 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.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 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 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 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 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 @@
         }
     }
 
-    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;