From f834dfabbcbbe1f209682f18c67f2e8b9d3e1dd7 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Tue, 26 Oct 2010 12:43:57 -0700 Subject: ClipDescription no longer inherits from ClipData. Change-Id: Ie4939f87c7e1628d9c19ecb5c0b3036d1f76ef29 --- services/java/com/android/server/ClipboardService.java | 2 +- services/java/com/android/server/WindowManagerService.java | 2 +- 2 files 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 bdf313c..30ea48c 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 new ClipDescription(mPrimaryClip); + return mPrimaryClip.getDescription(); } } diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java index 9bc24d2..c29e4a9 100644 --- a/services/java/com/android/server/WindowManagerService.java +++ b/services/java/com/android/server/WindowManagerService.java @@ -569,7 +569,7 @@ public class WindowManagerService extends IWindowManager.Stub void broadcastDragStartedLw(final float touchX, final float touchY) { // Cache a base-class instance of the clip metadata so that parceling // works correctly in calling out to the apps. - mDataDescription = new ClipDescription(mData); + mDataDescription = mData.getDescription(); mNotifiedWindows.clear(); mDragInProgress = true; -- cgit v1.1