diff options
| author | Jim Miller <jaggies@google.com> | 2013-09-30 17:10:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-30 17:10:11 -0700 |
| commit | a192253bf214ca1e0ea9fc64ab6a4375f9b11882 (patch) | |
| tree | 0bfc54b7ebb3784ad139f2553b07f580377305cf /policy | |
| parent | b84aa9fee339301153f2471c544844510c26637b (diff) | |
| parent | fb2e3c8d47c162166a029a97d68ad3bedff89cce (diff) | |
| download | frameworks_base-a192253bf214ca1e0ea9fc64ab6a4375f9b11882.zip frameworks_base-a192253bf214ca1e0ea9fc64ab6a4375f9b11882.tar.gz frameworks_base-a192253bf214ca1e0ea9fc64ab6a4375f9b11882.tar.bz2 | |
am fb2e3c8d: Merge "Fix permissions on WindowManagerService.showAssistant()" into klp-dev
* commit 'fb2e3c8d47c162166a029a97d68ad3bedff89cce':
Fix permissions on WindowManagerService.showAssistant()
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 5 | ||||
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceWrapper.java | 6 |
2 files changed, 1 insertions, 10 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 9f9b6d6..a5fd1d7 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -5127,11 +5127,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { } @Override - public void showAssistant() { - mKeyguardDelegate.showAssistant(); - } - - @Override public boolean canMagnifyWindow(int windowType) { switch (windowType) { case WindowManager.LayoutParams.TYPE_INPUT_METHOD: diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceWrapper.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceWrapper.java index 5e299ee..83be1a8 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceWrapper.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceWrapper.java @@ -181,11 +181,7 @@ public class KeyguardServiceWrapper implements IKeyguardService { } public void showAssistant() { - try { - mService.showAssistant(); - } catch (RemoteException e) { - Slog.w(TAG , "Remote Exception", e); - } + // Not used by PhoneWindowManager } public void dispatch(MotionEvent event) { |