commit 543b2aae5548197261aedbf1f4ef4fd439e44cd7
author Maarten Derks <maarten@fairphone.com> Fri Dec 15 14:26:25 2017 +0000
committer Maarten Derks <maarten@fairphone.com> Mon Dec 18 11:57:14 2017 +0100
tree c5935f553be42cd007bdc9b07747d60fd00d9ea3
parent 965c62759b3c9005114c1dff32aae1c1c4b3d7ff

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

This reverts commit 4c13e5c4ac54a46d58366b3e22d51e2f1de3958e.

The patches for FPIIM-2340 introduce crashes and CTS test
failures, so we revert them for the time being.

FPIIM-2393

Change-Id: I58e7925ba33dd80e88022f1e42334ef99e8813c9

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 a94a524..1c26846 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.BroadcastReceiver;
 import android.content.ClipData;
 import android.content.ClipDescription;
@@ -248,7 +247,7 @@
     public ClipData getPrimaryClip(String pkg) {
         synchronized (this) {
             if (mAppOps.noteOp(AppOpsManager.OP_READ_CLIPBOARD, Binder.getCallingUid(),
-                    pkg) != AppOpsManager.MODE_ALLOWED || isDeviceLocked()) {
+                    pkg) != AppOpsManager.MODE_ALLOWED) {
                 return null;
             }
             addActiveOwnerLocked(Binder.getCallingUid(), pkg);
@@ -259,7 +258,7 @@
     public ClipDescription getPrimaryClipDescription(String callingPackage) {
         synchronized (this) {
             if (mAppOps.checkOp(AppOpsManager.OP_READ_CLIPBOARD, Binder.getCallingUid(),
-                    callingPackage) != AppOpsManager.MODE_ALLOWED || isDeviceLocked()) {
+                    callingPackage) != AppOpsManager.MODE_ALLOWED) {
                 return null;
             }
             PerUserClipboard clipboard = getClipboard();
@@ -270,7 +269,7 @@
     public boolean hasPrimaryClip(String callingPackage) {
         synchronized (this) {
             if (mAppOps.checkOp(AppOpsManager.OP_READ_CLIPBOARD, Binder.getCallingUid(),
-                    callingPackage) != AppOpsManager.MODE_ALLOWED || isDeviceLocked()) {
+                    callingPackage) != AppOpsManager.MODE_ALLOWED) {
                 return false;
             }
             return getClipboard().primaryClip != null;
@@ -294,7 +293,7 @@
     public boolean hasClipboardText(String callingPackage) {
         synchronized (this) {
             if (mAppOps.checkOp(AppOpsManager.OP_READ_CLIPBOARD, Binder.getCallingUid(),
-                    callingPackage) != AppOpsManager.MODE_ALLOWED || isDeviceLocked()) {
+                    callingPackage) != AppOpsManager.MODE_ALLOWED) {
                 return false;
             }
             PerUserClipboard clipboard = getClipboard();
@@ -306,11 +305,6 @@
         }
     }
 
-    private boolean isDeviceLocked() {
-        final KeyguardManager keyguardManager = mContext.getSystemService(KeyguardManager.class);
-        return keyguardManager != null && keyguardManager.isDeviceLocked();
-    }
-
     private final void checkUriOwnerLocked(Uri uri, int uid) {
         if (!"content".equals(uri.getScheme())) {
             return;