commit ad852cc5428a6522b057fa4e2fe095f6d2ab5819
author Evan Charlton <evanc@google.com> Tue Sep 16 08:57:18 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 16 08:57:18 2014 +0000
tree 52c8b939e1fd6406e2b9cde1aa7c82d81832db50
parent 81669a7899ab147f0b4e92d2b8d7128484c9f2fb
parent f4203993a2ca5674f8caff1a74c3edb4fbb6a3c5

am fe8f9638: am e37fdac4: Merge "Switch InCallUI broadcast to be sticky" into lmp-dev

* commit 'fe8f9638a8bfac4bd477154065ab95b4b864fe88':
  Switch InCallUI broadcast to be sticky

InCallUI/src/com/android/incallui/InCallPresenter.java

diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java
index 241056d..3342c7d 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -603,13 +603,20 @@
             mProximitySensor.onInCallShowing(showing);
         }
 
-        if (showing) {
-            Intent broadcastIntent = ObjectFactory.getUiReadyBroadcastIntent();
-            if (broadcastIntent != null) {
-                broadcastIntent.putExtra(EXTRA_FIRST_TIME_SHOWN, !mIsActivityPreviouslyStarted);
-                mContext.sendBroadcast(broadcastIntent, Manifest.permission.READ_PHONE_STATE);
-            }
+        Intent broadcastIntent = ObjectFactory.getUiReadyBroadcastIntent();
+        if (broadcastIntent != null) {
+            broadcastIntent.putExtra(EXTRA_FIRST_TIME_SHOWN, !mIsActivityPreviouslyStarted);
 
+            if (showing) {
+                Log.d(this, "Sending sticky broadcast: ", broadcastIntent);
+                mContext.sendStickyBroadcast(broadcastIntent);
+            } else {
+                Log.d(this, "Removing sticky broadcast: ", broadcastIntent);
+                mContext.removeStickyBroadcast(broadcastIntent);
+            }
+        }
+
+        if (showing) {
             mIsActivityPreviouslyStarted = true;
         }
     }