summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-10-26 12:43:57 -0700
committerDianne Hackborn <hackbod@google.com>2010-10-26 15:23:15 -0700
commitf834dfabbcbbe1f209682f18c67f2e8b9d3e1dd7 (patch)
tree233e48517d46e92df1acaf942c1fa2dd7c6384b5 /services
parent78098341f86b4c71256017ca2b33674d6bcab046 (diff)
downloadframeworks_base-f834dfabbcbbe1f209682f18c67f2e8b9d3e1dd7.zip
frameworks_base-f834dfabbcbbe1f209682f18c67f2e8b9d3e1dd7.tar.gz
frameworks_base-f834dfabbcbbe1f209682f18c67f2e8b9d3e1dd7.tar.bz2
ClipDescription no longer inherits from ClipData.
Change-Id: Ie4939f87c7e1628d9c19ecb5c0b3036d1f76ef29
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/ClipboardService.java2
-rw-r--r--services/java/com/android/server/WindowManagerService.java2
2 files changed, 2 insertions, 2 deletions
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;