summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2013-10-07 17:04:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-07 17:04:20 +0000
commitbacb5422bc4670d2b8905d9f58d068a97836561f (patch)
tree50c74719b3ec38cc68516f148b70662cda9b4196 /packages/Keyguard
parentd5102f19653f6b00ce872435c5efb5cb630deed7 (diff)
parentf108cdd9ee5efe354d87edd02a07b323298c116c (diff)
downloadframeworks_base-bacb5422bc4670d2b8905d9f58d068a97836561f.zip
frameworks_base-bacb5422bc4670d2b8905d9f58d068a97836561f.tar.gz
frameworks_base-bacb5422bc4670d2b8905d9f58d068a97836561f.tar.bz2
Merge "Also rely on enabled notification listeners for RemoteController registration" into klp-dev
Diffstat (limited to 'packages/Keyguard')
-rw-r--r--packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java3
-rw-r--r--packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java4
2 files changed, 5 insertions, 2 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java
index 45aedbd..6d7b743 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java
@@ -203,8 +203,7 @@ public class KeyguardTransportControlView extends FrameLayout {
if (DEBUG) Log.v(TAG, "Create TCV " + this);
mAudioManager = new AudioManager(mContext);
mCurrentPlayState = RemoteControlClient.PLAYSTATE_NONE; // until we get a callback
- mRemoteController = new RemoteController(context);
- mRemoteController.setOnClientUpdateListener(mRCClientUpdateListener);
+ mRemoteController = new RemoteController(context, mRCClientUpdateListener);
final DisplayMetrics dm = context.getResources().getDisplayMetrics();
final int dim = Math.max(dm.widthPixels, dm.heightPixels);
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
index 734f517..76deb77 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -232,6 +232,10 @@ public class KeyguardUpdateMonitor {
}
+ public void setEnabled(boolean enabled) {
+ // no-op: this RemoteControlDisplay is not subject to being disabled.
+ }
+
public void setCurrentClientId(int clientGeneration, PendingIntent mediaIntent,
boolean clearing) throws RemoteException {
Message msg = mHandler.obtainMessage(MSG_SET_CURRENT_CLIENT_ID,