summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2013-09-28 01:18:17 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-28 01:18:17 +0000
commitfb2e3c8d47c162166a029a97d68ad3bedff89cce (patch)
tree3ad0bdcbe8f6ed37152d692536a20af80b0bf09c /tools
parentb415525a16074b6dc8e295655648b7c7c1074bbb (diff)
parent6c9df5054a25f179ea7359a1a5e59e7d5d8da122 (diff)
downloadframeworks_base-fb2e3c8d47c162166a029a97d68ad3bedff89cce.zip
frameworks_base-fb2e3c8d47c162166a029a97d68ad3bedff89cce.tar.gz
frameworks_base-fb2e3c8d47c162166a029a97d68ad3bedff89cce.tar.bz2
Merge "Fix permissions on WindowManagerService.showAssistant()" into klp-dev
Diffstat (limited to 'tools')
-rw-r--r--tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java5
1 files changed, 0 insertions, 5 deletions
diff --git a/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java b/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
index f0c3a75..fd7a645 100644
--- a/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
+++ b/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
@@ -458,11 +458,6 @@ public class IWindowManagerImpl implements IWindowManager {
}
@Override
- public void showAssistant() {
-
- }
-
- @Override
public IBinder getFocusedWindowToken() {
// TODO Auto-generated method stub
return null;