diff options
| author | Tom Taylor <tomtaylor@google.com> | 2010-04-22 14:05:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-22 14:05:34 -0700 |
| commit | ae000a474883f89e4529e2d1b8e3cbd862bc820e (patch) | |
| tree | 6d8544580ce0f283f3b7eb12eed0beda1b258520 | |
| parent | 934eadd37cb6b50df6d4e58a6ece58ae9cfbc2bf (diff) | |
| parent | ac551c101b12f905707ad9321bbe94c908ef85fd (diff) | |
| download | Mms-ae000a474883f89e4529e2d1b8e3cbd862bc820e.tar.gz | |
am ac551c10: Fix MMS to work with GoogleVoice
Merge commit 'ac551c101b12f905707ad9321bbe94c908ef85fd' into froyo-plus-aosp
* commit 'ac551c101b12f905707ad9321bbe94c908ef85fd':
Fix MMS to work with GoogleVoice
| -rw-r--r-- | src/com/android/mms/data/WorkingMessage.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/com/android/mms/data/WorkingMessage.java b/src/com/android/mms/data/WorkingMessage.java index 20062c07..1951b6cb 100644 --- a/src/com/android/mms/data/WorkingMessage.java +++ b/src/com/android/mms/data/WorkingMessage.java @@ -85,7 +85,7 @@ public class WorkingMessage { // GoogleVoice integration public static final String GOOGLE_VOICE_PACKAGE = "com.google.android.apps.googlevoice"; public static final String GOOGLE_VOICE_SENDER = - "com.google.android.apps.googlevoice.SmsSenderActivity"; + "com.google.android.apps.googlevoice.sms.SendingSmsReceiver"; private static boolean mGoogleVoiceInstalled; // don't reference directly, use // getter: googleVoiceInstalled() private static boolean mCheckedForGoogleVoice; // gets reset when GoogleVoice is installed @@ -1018,12 +1018,14 @@ public class WorkingMessage { if (!mCheckedForGoogleVoice) { PackageManager manager = mContext.getPackageManager(); Intent broadcastIntent = new Intent(ACTION_SENDING_SMS); - final List<ResolveInfo> activities = manager.queryIntentActivities(broadcastIntent, 0); - LogTag.debug("getSendInterceptor activities: " + activities); - if (activities != null) { - int len = activities.size(); + final List<ResolveInfo> receivers = + manager.queryBroadcastReceivers(broadcastIntent, PackageManager.GET_META_DATA); + LogTag.debug("getSendInterceptor broadcast receivers: " + receivers); + mGoogleVoiceInstalled = false; + if (receivers != null) { + int len = receivers.size(); for (int i = 0; i < len; i++) { - ResolveInfo info = activities.get(i); + ResolveInfo info = receivers.get(i); LogTag.debug("getSendInterceptor " + info.activityInfo.applicationInfo.packageName + " - " + info.activityInfo.name); |