diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2013-04-03 14:58:48 -0700 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2013-04-03 14:58:48 -0700 |
| commit | 314b25d0fd9fae7eff7930fef32458518e8a227d (patch) | |
| tree | 7df539e6fcace5cbd40a0d4d4c5d094713e07c11 /packages/Keyguard/src/com | |
| parent | 490b579123d4ce6119870504cd3e55929ae16b86 (diff) | |
| parent | ca762beea440ec497fd8d6f6f50ac0904a2b0a05 (diff) | |
| download | frameworks_base-314b25d0fd9fae7eff7930fef32458518e8a227d.zip frameworks_base-314b25d0fd9fae7eff7930fef32458518e8a227d.tar.gz frameworks_base-314b25d0fd9fae7eff7930fef32458518e8a227d.tar.bz2 | |
resolved conflicts for merge of ca762bee to master
Change-Id: Ib57124c30352b4f6ed66f384b386eb6f49b505c1
Diffstat (limited to 'packages/Keyguard/src/com')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java | 2 | ||||
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java index 99d4f63..3208aff 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java @@ -145,7 +145,7 @@ public class KeyguardTransportControlView extends FrameLayout implements OnClick } } - public void setTransportControlFlags(int generationId, int flags) { + public void setTransportControlInfo(int generationId, int flags, int posCapabilities) { Handler handler = mLocalHandler.get(); if (handler != null) { handler.obtainMessage(MSG_SET_TRANSPORT_CONTROLS, generationId, flags) diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java index bd0aacb..6e236b5 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -209,7 +209,7 @@ public class KeyguardUpdateMonitor { } - public void setTransportControlFlags(int generationId, int flags) { + public void setTransportControlInfo(int generationId, int flags, int posCapabilities) { } |