From 3b99ede362568a3d213a2b3668126965ad80677e Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Wed, 22 Dec 2010 17:37:34 -0800 Subject: Fix issue #3299143: Problem report for Hanping Chinese Dictionary Pro Let's not crash if there is no clip. Change-Id: I295031adf37fdd0997c39a2cffc2c6f602d7694e --- services/java/com/android/server/ClipboardService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'services') diff --git a/services/java/com/android/server/ClipboardService.java b/services/java/com/android/server/ClipboardService.java index 30ea48c..bec35d1 100644 --- a/services/java/com/android/server/ClipboardService.java +++ b/services/java/com/android/server/ClipboardService.java @@ -115,7 +115,7 @@ public class ClipboardService extends IClipboard.Stub { public ClipDescription getPrimaryClipDescription() { synchronized (this) { - return mPrimaryClip.getDescription(); + return mPrimaryClip != null ? mPrimaryClip.getDescription() : null; } } @@ -211,7 +211,7 @@ public class ClipboardService extends IClipboard.Stub { } catch (NameNotFoundException e) { throw new IllegalArgumentException("Unknown package " + pkg, e); } - if (!mActivePermissionOwners.contains(pkg)) { + if (mPrimaryClip != null && !mActivePermissionOwners.contains(pkg)) { final int N = mPrimaryClip.getItemCount(); for (int i=0; i