diff options
author | Wink Saville <wink@google.com> | 2011-05-14 07:50:40 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-14 07:50:40 -0700 |
commit | 444889838ce46475f04956e8b6b027328917f3fe (patch) | |
tree | 3f5ad464ead110eb045a49bb0c98e17146c5c7cb | |
parent | bbdc834a56576387353fb7b6a1f08363ad68796a (diff) | |
parent | d0903e1478c7ba2fb8087f1bae1fba69791039ba (diff) | |
download | frameworks_base-444889838ce46475f04956e8b6b027328917f3fe.zip frameworks_base-444889838ce46475f04956e8b6b027328917f3fe.tar.gz frameworks_base-444889838ce46475f04956e8b6b027328917f3fe.tar.bz2 |
am d0903e14: am 6e41b32d: Merge "TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING." into honeycomb-LTE
* commit 'd0903e1478c7ba2fb8087f1bae1fba69791039ba':
TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING.
-rw-r--r-- | services/java/com/android/server/TelephonyRegistry.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/services/java/com/android/server/TelephonyRegistry.java b/services/java/com/android/server/TelephonyRegistry.java index 948118f..dd54c16 100644 --- a/services/java/com/android/server/TelephonyRegistry.java +++ b/services/java/com/android/server/TelephonyRegistry.java @@ -545,7 +545,6 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { } Intent intent = new Intent(TelephonyIntents.ACTION_SERVICE_STATE_CHANGED); - intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING); Bundle data = new Bundle(); state.fillInNotifierBundle(data); intent.putExtras(data); @@ -585,7 +584,6 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { } Intent intent = new Intent(TelephonyManager.ACTION_PHONE_STATE_CHANGED); - intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING); intent.putExtra(Phone.STATE_KEY, DefaultPhoneNotifier.convertCallState(state).toString()); if (!TextUtils.isEmpty(incomingNumber)) { intent.putExtra(TelephonyManager.EXTRA_INCOMING_NUMBER, incomingNumber); @@ -601,7 +599,6 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { // status bar takes care of that after taking into account all of the // required info. Intent intent = new Intent(TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED); - intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING); intent.putExtra(Phone.STATE_KEY, DefaultPhoneNotifier.convertDataState(state).toString()); if (!isDataConnectivityPossible) { intent.putExtra(Phone.NETWORK_UNAVAILABLE_KEY, true); @@ -626,7 +623,6 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { private void broadcastDataConnectionFailed(String reason, String apnType) { Intent intent = new Intent(TelephonyIntents.ACTION_DATA_CONNECTION_FAILED); - intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING); intent.putExtra(Phone.FAILURE_REASON_KEY, reason); intent.putExtra(Phone.DATA_APN_TYPE_KEY, apnType); mContext.sendStickyBroadcast(intent); |