diff options
| author | Jim Miller <jaggies@google.com> | 2013-10-01 15:42:45 -0700 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2013-10-01 15:42:45 -0700 |
| commit | d273cae2c49c3f6d21f53406b7540e572c11bba0 (patch) | |
| tree | e9748f656120ce159b5e5a821c99c3475b4b8208 /policy | |
| parent | 900432217560a8a866866e3377926d5c729c0eed (diff) | |
| parent | fb2e3c8d47c162166a029a97d68ad3bedff89cce (diff) | |
| download | frameworks_base-d273cae2c49c3f6d21f53406b7540e572c11bba0.zip frameworks_base-d273cae2c49c3f6d21f53406b7540e572c11bba0.tar.gz frameworks_base-d273cae2c49c3f6d21f53406b7540e572c11bba0.tar.bz2 | |
resolved conflicts for merge of fb2e3c8d to master
Change-Id: Ic9fe2674e0eb82d071f9b547b6089acacf705576
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 248112f..2bd3238 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -5135,11 +5135,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) { |