Merge cherrypicks of [2986363] into oc-r3-release (954d3516) · Commits · e / os / android_frameworks_base

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

+4 −11

Original line number	Diff line number	Diff line
		@@ -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;