diff options
author | Evan Charlton <evanc@google.com> | 2014-09-17 18:54:16 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-17 18:54:16 +0000 |
commit | 8162e913f3b0695d903c9144dc9e2c446eba0127 (patch) | |
tree | 3af3be335ed58befcf1330c98711950648720901 /InCallUI | |
parent | 4039d80d3262898d06f334d74a850dd5034c576a (diff) | |
parent | 322aeef2d1b8785eeeab083d947fb4bff561c7ac (diff) |
am 99821566: Merge "Pass Context to InCall ObjectFactory" into lmp-dev
* commit '9982156693d8f5efe63bb1a52b489b87b38e21bd':
Pass Context to InCall ObjectFactory
Diffstat (limited to 'InCallUI')
3 files changed, 5 insertions, 4 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java index bc6a120ac..b6085217b 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -353,7 +353,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> } public void onCallStateButtonTouched() { - Intent broadcastIntent = ObjectFactory.getCallStateButtonBroadcastIntent(); + Intent broadcastIntent = ObjectFactory.getCallStateButtonBroadcastIntent(mContext); if (broadcastIntent != null) { Log.d(this, "Sending call state button broadcast: ", broadcastIntent); mContext.sendBroadcast(broadcastIntent, Manifest.permission.READ_PHONE_STATE); diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java index 3342c7d6b..c7a512266 100644 --- a/InCallUI/src/com/android/incallui/InCallPresenter.java +++ b/InCallUI/src/com/android/incallui/InCallPresenter.java @@ -603,7 +603,7 @@ public class InCallPresenter implements CallList.Listener, InCallPhoneListener { mProximitySensor.onInCallShowing(showing); } - Intent broadcastIntent = ObjectFactory.getUiReadyBroadcastIntent(); + Intent broadcastIntent = ObjectFactory.getUiReadyBroadcastIntent(mContext); if (broadcastIntent != null) { broadcastIntent.putExtra(EXTRA_FIRST_TIME_SHOWN, !mIsActivityPreviouslyStarted); diff --git a/InCallUI/src/com/android/incalluibind/ObjectFactory.java b/InCallUI/src/com/android/incalluibind/ObjectFactory.java index c64e98efb..a2adc102f 100644 --- a/InCallUI/src/com/android/incalluibind/ObjectFactory.java +++ b/InCallUI/src/com/android/incalluibind/ObjectFactory.java @@ -16,16 +16,17 @@ package com.android.incalluibind; +import android.content.Context; import android.content.Intent; public class ObjectFactory { /** @return An {@link Intent} to be broadcast when the InCallUI is visible. */ - public static Intent getUiReadyBroadcastIntent() { return null; } + public static Intent getUiReadyBroadcastIntent(Context context) { return null; } /** * @return An {@link Intent} to be broadcast when the call state button in the InCallUI is * touched while in a call. */ - public static Intent getCallStateButtonBroadcastIntent() { return null; } + public static Intent getCallStateButtonBroadcastIntent(Context context) { return null; } } |