0xdroid:packages_apps_mms.git
7 years agoMerge "Turn off messaging app's SEVERE_WARNING" into gingerbread beagle-gingerbread
Tom Taylor [Fri, 22 Oct 2010 23:31:48 +0000 (16:31 -0700)]
Merge "Turn off messaging app's SEVERE_WARNING" into gingerbread

7 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Fri, 22 Oct 2010 22:29:28 +0000 (15:29 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I5cdee6e9e71aecc70ddbe91168000e083f2d6a45

7 years agoTurn off messaging app's SEVERE_WARNING
Tom Taylor [Fri, 22 Oct 2010 22:28:14 +0000 (15:28 -0700)]
Turn off messaging app's SEVERE_WARNING

Bug 3062274

Change-Id: I100914f4f31bf74c2cc79e784f38cd0fc33143d1

7 years agoPrepare for turning off extensive logging
Tom Taylor [Mon, 18 Oct 2010 21:11:09 +0000 (14:11 -0700)]
Prepare for turning off extensive logging

Bug 3062274

Change-Id: I02dbc06b6502d8f50ba7bb2dca367623364adc40

7 years agoFix crash logging exception
Tom Taylor [Fri, 15 Oct 2010 14:01:43 +0000 (07:01 -0700)]
Fix crash logging exception

Bug 3099377. The rest of the code is full of lines like this:
  Log.e(TAG, e.getMessage(), e);
I tested code like that and when getMessage() is null it
will log (but not crash):
E/MessageListAdapter( 2210): null
E/MessageListAdapter( 2210): com.google.android.mms.MmsException
E/MessageListAdapter( 2210):  at com.android.mms.ui.MessageListAdapter.newView(MessageListAdapter.java:255)
E/MessageListAdapter( 2210):  at android.widget.CursorAdapter.getView(CursorAdapter.java:182)

Change-Id: I728e20cc5f0d8e986d67d2964d04682645a550d4

7 years agoImport revised translations
Kenny Root [Thu, 14 Oct 2010 16:44:28 +0000 (09:44 -0700)]
Import revised translations

Change-Id: Iec10782854c4ae81d4959100a7f06ed1a756274f

7 years agoRemove some PII.
Wink Saville [Tue, 12 Oct 2010 18:46:57 +0000 (11:46 -0700)]
Remove some PII.

Change-Id: I846866881d79b985ea0bc6fa647f8e7a38e63a9b

7 years agoTighten recipient check
Tom Taylor [Mon, 11 Oct 2010 18:49:11 +0000 (11:49 -0700)]
Tighten recipient check

When we send a message, the recips in the UI can be empty when the
user manually types in a number and hits send. prepareForSave() then
turns those working numbers into real recips. Add an extra test
for that situation before complaining of different recips.
Bug 3066322

Change-Id: I4aaa86138bc9aa817848b24cc5aac1c7718fe735

7 years agoMerge "Call dialog.dismiss()" into gingerbread
Tom Taylor [Sat, 9 Oct 2010 20:19:41 +0000 (13:19 -0700)]
Merge "Call dialog.dismiss()" into gingerbread

7 years agoFix too strict scary message
Tom Taylor [Sat, 9 Oct 2010 18:09:56 +0000 (11:09 -0700)]
Fix too strict scary message

Don't check threadIds in syncWorkingRecipients. Instead, check recipients
across a call to prepareForSave in send. Bug 3076599

Change-Id: I26f12370bfb7e42196194edd1374ca2b89997595

7 years agoCall dialog.dismiss()
Tom Taylor [Sat, 9 Oct 2010 17:45:06 +0000 (10:45 -0700)]
Call dialog.dismiss()

In many of the click handlers, we neglected to dismiss the dialog.
Bug 3072307

Change-Id: Ie461492394c9f29ce2a7bb6e7f00a93068ea2bf8

7 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Thu, 7 Oct 2010 00:13:18 +0000 (17:13 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: Id8c77e65f64624f49207ceae5460752527f54ce1

7 years agoNew downscaled menu assets
Gilles Debunne [Wed, 6 Oct 2010 16:57:59 +0000 (09:57 -0700)]
New downscaled menu assets

Change-Id: Ifd78299b85eb359e1d795c118069473c18cf3354

7 years agoLoosen recipients check
Tom Taylor [Wed, 6 Oct 2010 00:24:51 +0000 (17:24 -0700)]
Loosen recipients check

A valid sending scenario was found where we were complaining the
recipients didn't match. Bug 3066322

Change-Id: I53da6a9a9d063d09826ce7f955a2dfaaf0633b38

7 years agoMerge "Add debugging code" into gingerbread
Tom Taylor [Tue, 5 Oct 2010 01:18:34 +0000 (18:18 -0700)]
Merge "Add debugging code" into gingerbread

7 years agoAdd debugging code
Tom Taylor [Tue, 5 Oct 2010 01:12:40 +0000 (18:12 -0700)]
Add debugging code

Add a number of tests to try and track down the situation that causes
a message to be sent to the wrong recipient. Bug 3057952

Change-Id: I2da3e91dcb039e87c3222e48026b859d1644793e

7 years agoMerge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Thu, 30 Sep 2010 22:47:02 +0000 (15:47 -0700)]
Merge "Import revised translations.  DO NOT MERGE" into gingerbread

7 years agoFix proguard flag file dependency.
Ying Wang [Wed, 29 Sep 2010 22:24:57 +0000 (15:24 -0700)]
Fix proguard flag file dependency.

Change-Id: I38204e9946a468cf91c8e0966ed2bb3bbc0f3a1f

7 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 29 Sep 2010 21:35:04 +0000 (14:35 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I286c76c304fe117f8a83041396ac466c50699d5c

7 years agoGenericize strings that refer to the SD card.
Eric Fischer [Tue, 28 Sep 2010 23:35:04 +0000 (16:35 -0700)]
Genericize strings that refer to the SD card.

Change-Id: I0d467767507e88118de3737c13e3ddeb52472112

7 years agoTrim unwanted whitespace from translations. DO NOT MERGE
Eric Fischer [Mon, 27 Sep 2010 19:19:20 +0000 (12:19 -0700)]
Trim unwanted whitespace from translations.  DO NOT MERGE

Change-Id: I8703102b3e68e697746c140ad038a85dd949234d

7 years agodo not merge
Chet Haase [Sat, 18 Sep 2010 00:22:38 +0000 (17:22 -0700)]
do not merge

new assets

Change-Id: I983006630c15453c72c0a081545a17548c9a2aeb

7 years agoDismiss dialog
Tom Taylor [Thu, 16 Sep 2010 22:44:53 +0000 (15:44 -0700)]
Dismiss dialog

Dismiss the dialog and don't leak the window.
Bug 2675689

Change-Id: Iacaff5e6463c7cbef41ab09c80b6512d50aa5b35

7 years agoFix multi-image attachment
Tom Taylor [Thu, 16 Sep 2010 22:00:28 +0000 (15:00 -0700)]
Fix multi-image attachment

Handle the case where building a PDU part returns null. Tested by
forcing this code path to occur. The user sees a toast and the Mms message
is put into the error state (with visible error icon).
Bug 2938634

Change-Id: I8043fce21080f3b8073aed03b7f194406acf4768

7 years agoHandle OutOfMemory when decoding images
Tom Taylor [Thu, 16 Sep 2010 01:20:18 +0000 (18:20 -0700)]
Handle OutOfMemory when decoding images

Decoding images and videos in the messaging app appears to be a
vulnerable point for running out of memory. Catch those exceptions,
log an error, and continue on without loading the image. Most of these
"catches" are around situations where there's been a problem decoding
the original image in the first place, and now we're simply trying
to decode a small missing stand-in image. However, since BitmapFactory.decodeResource
seems to be in an inordinate number of bug reports, I want to log every
use in the code in case of failure.
Handles the 2nd part of bug 2994057.

Change-Id: Iaa8035f6ef28385b353d31507b9753934881d3e8

7 years agoDon't do disk writes on the UI thread when updating cache.
Brad Fitzpatrick [Tue, 14 Sep 2010 23:31:53 +0000 (16:31 -0700)]
Don't do disk writes on the UI thread when updating cache.

Fixes some of the more common StrictMode violations.

Change-Id: Ica4373ec20a6040642cee035f1e7eafdcdc2af67

7 years agoThread call start
Tom Taylor [Fri, 10 Sep 2010 21:36:27 +0000 (14:36 -0700)]
Thread call start

A thread was calling run() instead of start(). Add names to the
threads in this file. Gingerbread bug 2991885.

Change-Id: I20f144b53c96227f977340d4a69bc68311403ed5

7 years agoUse new apply() instead of commit().
Brad Fitzpatrick [Thu, 26 Aug 2010 22:47:43 +0000 (15:47 -0700)]
Use new apply() instead of commit().

apply() starts an async disk write and doesn't have a return
value but is otherwise identical in observable effects.

Change-Id: I126fa7cb5d02a2c30721eb702ecf5bd9d9376b17

7 years agomerge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Jean-Baptiste Queru [Tue, 24 Aug 2010 02:09:10 +0000 (19:09 -0700)]
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward

Change-Id: I551c090b9ebcb904da09faf3a99c2106c5973d95

8 years agoMove failed message to failed state
Tom Taylor [Tue, 3 Aug 2010 00:27:02 +0000 (17:27 -0700)]
Move failed message to failed state

When we try and send a message and the telephony layer throws an
exception, move that message to the failed state. Otherwise, it
perpetually remains in the outbox and shows as "Sending..." to the
user.

Change-Id: Iaa2a4ed05f67828e8f980228e01a5a34e4fc069e

8 years agoam 943dc156: (-s ours) Move failed message to failed state
Tom Taylor [Tue, 17 Aug 2010 22:16:44 +0000 (15:16 -0700)]
am 943dc156: (-s ours) Move failed message to failed state

Merge commit '943dc156a704156b0cb62c76f7a1a80c9768c3d0' into gingerbread

* commit '943dc156a704156b0cb62c76f7a1a80c9768c3d0':
  Move failed message to failed state

8 years agoMove failed message to failed state
Tom Taylor [Tue, 3 Aug 2010 00:27:02 +0000 (17:27 -0700)]
Move failed message to failed state

When we try and send a message and the telephony layer throws an
exception, move that message to the failed state. Otherwise, it
perpetually remains in the outbox and shows as "Sending..." to the
user.

Change-Id: Iaa2a4ed05f67828e8f980228e01a5a34e4fc069e

8 years agoMerge "Move failed message to failed state" into gingerbread
Tom Taylor [Tue, 10 Aug 2010 21:31:41 +0000 (14:31 -0700)]
Merge "Move failed message to failed state" into gingerbread

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 10 Aug 2010 18:52:09 +0000 (11:52 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: Ib89dee7c7686204c7fda29079a3e56cb55a830c6

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 4 Aug 2010 17:44:15 +0000 (10:44 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I18605bedb91020eef4279b9f73eb754f18a32da5

8 years agoMove failed message to failed state
Tom Taylor [Tue, 3 Aug 2010 17:23:24 +0000 (10:23 -0700)]
Move failed message to failed state

When we try and send a message and the telephony layer throws an
exception, move that message to the failed state. Otherwise, it
perpetually remains in the outbox and shows as "Sending..." to the
user. Bug 2885780.

Change-Id: Ic2ba789c24a9ed0842c51102c2e424ce1a2d9905

8 years agoset up fast-forward from froyo-release to gingerbread
The Android Open Source Project [Tue, 29 Jun 2010 21:34:54 +0000 (14:34 -0700)]
set up fast-forward from froyo-release to gingerbread

Change-Id: I687d1c1364c1db4ea2a34cb2cec723c48c99b879

8 years agoFix mismash message
Tom Taylor [Thu, 24 Jun 2010 18:32:31 +0000 (11:32 -0700)]
Fix mismash message

DO NOT MERGE
A particular set of repo steps involving creating a draft, then deleting
the draft and then receiving a new message can lead to a situation where
a new incoming message gets the old thread id of the discarded
draft. The compose activity can end up displaying the recipients of the
old message with the contents of the new message. Recognize this dangerous
situation and bail out to the ConversationList where the user can
enter the compose activity in a clean manner.
Bug 2793874

Change-Id: I04727de3908e3c50d4687cb6e2a9cc6589daed9c

8 years agoam 2b7da074: (-s ours) Fix mismash message
Tom Taylor [Thu, 24 Jun 2010 19:15:34 +0000 (12:15 -0700)]
am 2b7da074: (-s ours) Fix mismash message

Merge commit '2b7da074e10ceb0e04cc205efe721092781f2712' into gingerbread

* commit '2b7da074e10ceb0e04cc205efe721092781f2712':
  Fix mismash message

8 years agoFix mismash message
Tom Taylor [Thu, 24 Jun 2010 18:32:31 +0000 (11:32 -0700)]
Fix mismash message

DO NOT MERGE
A particular set of repo steps involving creating a draft, then deleting
the draft and then receiving a new message can lead to a situation where
a new incoming message gets the old thread id of the discarded
draft. The compose activity can end up displaying the recipients of the
old message with the contents of the new message. Recognize this dangerous
situation and bail out to the ConversationList where the user can
enter the compose activity in a clean manner.
Bug 2793874

Change-Id: I04727de3908e3c50d4687cb6e2a9cc6589daed9c

8 years agoFix mismash message
Tom Taylor [Thu, 24 Jun 2010 01:01:19 +0000 (18:01 -0700)]
Fix mismash message

A particular set of repo steps involving creating a draft, then deleting
the draft and then receiving a new message can lead to a situation where
a new incoming message gets the old thread id of the discarded
draft. The compose activity can end up displaying the recipients of the
old message with the contents of the new message. Recognize this dangerous
situation and bail out to the ConversationList where the user can
enter the compose activity in a clean manner.
Bug 2793874

Change-Id: I795ed6e1d95d9c1a2d1093a2491ca8c449ff2609

8 years agobug #2780967: fix SMS sending message to the wrong person.
Wei Huang [Fri, 18 Jun 2010 23:07:48 +0000 (16:07 -0700)]
bug #2780967: fix SMS sending message to the wrong person.

- there is an edge case where an old draft message (but w/ only recipient entered, no draft message) would confuse Compose activity to think it's the same
thread_id as a new message (coming into onNewIntent() from status notification). In that case, we don't re-initialize mConversation, which retained the old draft recipient

When the user sends a new message in that state, the message would be addressed to the old draft recipient instead of what's appearing in the UI.

Change-Id: Ic78c4343dc1d9a1639f586dcc8ac861adf73f44f

8 years agoam 7bb3d8cf: bug #2780967: fix SMS sending message to the wrong person.
Wei Huang [Fri, 18 Jun 2010 23:32:37 +0000 (16:32 -0700)]
am 7bb3d8cf: bug #2780967: fix SMS sending message to the wrong person.

Merge commit '7bb3d8cf74ec1e4ae18cb814c17e12a00816f105' into gingerbread

* commit '7bb3d8cf74ec1e4ae18cb814c17e12a00816f105':
  bug #2780967: fix SMS sending message to the wrong person.

8 years agobug #2780967: fix SMS sending message to the wrong person.
Wei Huang [Fri, 18 Jun 2010 23:07:48 +0000 (16:07 -0700)]
bug #2780967: fix SMS sending message to the wrong person.

- there is an edge case where an old draft message (but w/ only recipient entered, no draft message) would confuse Compose activity to think it's the same
thread_id as a new message (coming into onNewIntent() from status notification). In that case, we don't re-initialize mConversation, which retained the old draft recipient

When the user sends a new message in that state, the message would be addressed to the old draft recipient instead of what's appearing in the UI.

Change-Id: Ic78c4343dc1d9a1639f586dcc8ac861adf73f44f

8 years agoam 03f3ab97: Add positional substitution for strings
Kenny Root [Thu, 17 Jun 2010 19:36:24 +0000 (12:36 -0700)]
am 03f3ab97: Add positional substitution for strings

Merge commit '03f3ab97453c4498c2a1006e83340e8163417954' into gingerbread

* commit '03f3ab97453c4498c2a1006e83340e8163417954':
  Add positional substitution for strings

8 years agoAdd positional substitution for strings
Kenny Root [Wed, 16 Jun 2010 16:27:36 +0000 (09:27 -0700)]
Add positional substitution for strings

Chinese, Czech, Japanese, Korean, Polish, Russian, and Turkish have different
word order for some strings which necessitate positional substitution.

Change-Id: I2655d6cc445287ee05e616bedb5467aba595ac03

8 years agoam 39e04ccb: Import revised translations
Kenny Root [Thu, 10 Jun 2010 05:50:22 +0000 (22:50 -0700)]
am 39e04ccb: Import revised translations

Merge commit '39e04ccb4f1726592c012511c9c1fb4f6ded7fcb' into kraken

* commit '39e04ccb4f1726592c012511c9c1fb4f6ded7fcb':
  Import revised translations

8 years agoImport revised translations
Kenny Root [Thu, 10 Jun 2010 05:45:05 +0000 (22:45 -0700)]
Import revised translations

Change-Id: Ie7862fab73887eef9e192abd4fc0fa4ddbc85d7a

8 years agoam 6b535547: move synchronization fix over from master
Mark Wagner [Wed, 26 May 2010 18:49:14 +0000 (11:49 -0700)]
am 6b535547: move synchronization fix over from master

Merge commit '6b535547dbd34d2a45ca66e08c22a79243451ebd' into froyo-plus-aosp

* commit '6b535547dbd34d2a45ca66e08c22a79243451ebd':
  move synchronization fix over from master

8 years agomove synchronization fix over from master
Mark Wagner [Wed, 26 May 2010 18:17:02 +0000 (11:17 -0700)]
move synchronization fix over from master

Bugfix 2622197.  Move this change over from master.

Change-Id: Ia965a457db575cbb990e8c6edd9b771b45b75cfd

8 years agoam 9653d43d: bug #2641505: when the SIM card doesn\'t have the MSISDN, sending MMS...
Tom Taylor [Tue, 18 May 2010 23:38:56 +0000 (16:38 -0700)]
am 9653d43d: bug #2641505: when the SIM card doesn\'t have the MSISDN, sending MMS fails.

Merge commit '9653d43dfe3713df14ef3567b124c5729543c5f2' into froyo-plus-aosp

* commit '9653d43dfe3713df14ef3567b124c5729543c5f2':
  bug #2641505: when the SIM card doesn't have the MSISDN, sending MMS fails.

8 years agobug #2641505: when the SIM card doesn't have the MSISDN, sending MMS fails.
Tom Taylor [Tue, 18 May 2010 19:04:10 +0000 (12:04 -0700)]
bug #2641505: when the SIM card doesn't have the MSISDN, sending MMS fails.

(merge baa290bb62ab5517a8501a90790b7a13ea41306c from Eclair)
Don't insert an empty or null number in the send request for MMS transaction. We'd get a NPE and fail to send the MMS message.

Change-Id: I04b0aafef1c73fec4d16be5411006b9576615f5c

8 years agoam d669a2b2: bug #2694518: remove Google Voice private API in MMS app per discussion...
Wei Huang [Tue, 18 May 2010 22:35:02 +0000 (15:35 -0700)]
am d669a2b2: bug #2694518: remove Google Voice private API in MMS app per discussion with team.

Merge commit 'd669a2b2fcde0f588944af6caaca814a1bd4e92d' into froyo-plus-aosp

* commit 'd669a2b2fcde0f588944af6caaca814a1bd4e92d':
  bug #2694518: remove Google Voice private API in MMS app per discussion with team.

8 years agobug #2694518: remove Google Voice private API in MMS app per discussion with team.
Wei Huang [Tue, 18 May 2010 21:55:31 +0000 (14:55 -0700)]
bug #2694518: remove Google Voice private API in MMS app per discussion with team.

- we decided that we cannot have Google specific code in a platform application like MMS. Will revisit this feature in Gingerbread.

Change-Id: I5cf030a759be54ab32032a95141472a4fd89b5da

8 years agomerge from open-source master
The Android Open Source Project [Tue, 18 May 2010 16:38:44 +0000 (09:38 -0700)]
merge from open-source master

Change-Id: I10ce97874fcb4d8217bade5b5aab0d80ddff61ca

8 years agoMerge "removed calls to deprecated APIs"
Jean-Baptiste Queru [Mon, 17 May 2010 21:33:15 +0000 (14:33 -0700)]
Merge "removed calls to deprecated APIs"

8 years agoremoved calls to deprecated APIs
Christian Mehlmauer [Mon, 17 May 2010 18:29:16 +0000 (20:29 +0200)]
removed calls to deprecated APIs

Change-Id: Iaaee3e770bf65d4f041b0786d0cf6c683feebea6

8 years agoRemoved calls to Deprected APIs and unused Imports
Christian Mehlmauer [Mon, 17 May 2010 19:26:02 +0000 (21:26 +0200)]
Removed calls to Deprected APIs and unused Imports

Change-Id: I5e7778a4312cbe2ab6938a5bcd6b893418079c27

8 years agoam 4e5d6b71: Import revised translations
Kenny Root [Mon, 17 May 2010 19:08:50 +0000 (12:08 -0700)]
am 4e5d6b71: Import revised translations

Merge commit '4e5d6b71cd1c222a7625e4f75048bedbd7291a84' into froyo-plus-aosp

* commit '4e5d6b71cd1c222a7625e4f75048bedbd7291a84':
  Import revised translations

8 years agoImport revised translations
Kenny Root [Mon, 17 May 2010 18:37:19 +0000 (11:37 -0700)]
Import revised translations

Change-Id: I1a468c6bdc681f520daeca68f12746f4177d4217

8 years agomerge from open-source master
The Android Open Source Project [Wed, 12 May 2010 23:42:56 +0000 (16:42 -0700)]
merge from open-source master

Change-Id: Id75aa0c9ba9ad95cb8bbd5cf98d417b075de876a

8 years agoDisplay message when operation fails since FDN being enabled
Naveen Kalla [Mon, 29 Mar 2010 18:45:19 +0000 (11:45 -0700)]
Display message when operation fails since FDN being enabled

The terminal disallows SMS operations for numbers which are not in the Fixed
Dialing Number (FDN) list when the FDN service is enabled. FDN_CHECK_FAILURE
error is sent from by RIL when this happens. Display a message to the user.

Change-Id: I0c271db743997a24f12ef96f0162a62462f52569

8 years agoam b142ea00: Handle anonymous sender
Tom Taylor [Mon, 10 May 2010 16:43:17 +0000 (09:43 -0700)]
am b142ea00: Handle anonymous sender

Merge commit 'b142ea00f24f4b838e6b4d0f2761eedd0f14f625' into froyo-plus-aosp

* commit 'b142ea00f24f4b838e6b4d0f2761eedd0f14f625':
  Handle anonymous sender

8 years agoHandle anonymous sender
Tom Taylor [Fri, 7 May 2010 18:50:05 +0000 (11:50 -0700)]
Handle anonymous sender

In some places (such as Korea), it's possible to receive
a message without the sender's address. In this case,
all such anonymous messages will get added to the same
thread. Bug 2665039

Change-Id: Ic6bf7a7bfadfd3162d21ef4a59788b8886679872

8 years agomerge from open-source master
The Android Open Source Project [Wed, 5 May 2010 22:58:33 +0000 (15:58 -0700)]
merge from open-source master

Change-Id: Ia4ff7a14539989ccd9347d132da2cae5cd521520

8 years agoShould unescapeXML(src) before getPartBy*()
takuo [Fri, 30 Apr 2010 20:58:32 +0000 (05:58 +0900)]
Should unescapeXML(src) before getPartBy*()

Change-Id: Icc5cb8ed8a4e6e3e08308d0ba8aac8e8e2b17dc5

8 years agoam a8c49a46: Import revised translations
Kenny Root [Thu, 29 Apr 2010 22:53:42 +0000 (15:53 -0700)]
am a8c49a46: Import revised translations

Merge commit 'a8c49a46af320be92f60150b4671fe3d908c8b3c' into froyo-plus-aosp

* commit 'a8c49a46af320be92f60150b4671fe3d908c8b3c':
  Import revised translations

8 years agoImport revised translations
Kenny Root [Thu, 29 Apr 2010 22:43:48 +0000 (15:43 -0700)]
Import revised translations

Change-Id: I0dad3ab7334117adc44ee34defa6bfb0fc416520

8 years agoam e89e8008: Merge "Fix cursor null-refs" into froyo
Tom Taylor [Wed, 28 Apr 2010 21:27:59 +0000 (14:27 -0700)]
am e89e8008: Merge "Fix cursor null-refs" into froyo

Merge commit 'e89e8008b86939bbb3bd5693b87f708a1d7e3913' into froyo-plus-aosp

* commit 'e89e8008b86939bbb3bd5693b87f708a1d7e3913':
  Fix cursor null-refs

8 years agoMerge "Fix cursor null-refs" into froyo
Tom Taylor [Wed, 28 Apr 2010 21:24:36 +0000 (14:24 -0700)]
Merge "Fix cursor null-refs" into froyo

8 years agoam f49fc5b9: Merge "missing synchronization fix" into froyo
Mark Wagner [Wed, 28 Apr 2010 20:14:32 +0000 (13:14 -0700)]
am f49fc5b9: Merge "missing synchronization fix" into froyo

Merge commit 'f49fc5b9e665006684c9a87ba809374be14b4b86' into froyo-plus-aosp

* commit 'f49fc5b9e665006684c9a87ba809374be14b4b86':
  missing synchronization fix

8 years agoMerge "missing synchronization fix" into froyo
Mark Wagner [Wed, 28 Apr 2010 19:15:45 +0000 (12:15 -0700)]
Merge "missing synchronization fix" into froyo

8 years agoFix cursor null-refs
Tom Taylor [Wed, 28 Apr 2010 17:49:02 +0000 (10:49 -0700)]
Fix cursor null-refs

Found by the devious and relentless monkey. Bug 2631640

Change-Id: If45ce4f5e42b25b2b0e69cedfd03f1b4c359c2b5

8 years agoam 2e2a345a: Import revised translations
Kenny Root [Wed, 28 Apr 2010 16:33:53 +0000 (09:33 -0700)]
am 2e2a345a: Import revised translations

Merge commit '2e2a345aef4045479289871e20215d11853ed103' into froyo-plus-aosp

* commit '2e2a345aef4045479289871e20215d11853ed103':
  Import revised translations

8 years agoImport revised translations
Kenny Root [Tue, 27 Apr 2010 20:57:51 +0000 (13:57 -0700)]
Import revised translations

Change-Id: I12f898e8ac915e0feaef9d429f66f69c4742e52d

8 years agomissing synchronization fix
Mark Wagner [Tue, 27 Apr 2010 22:45:08 +0000 (15:45 -0700)]
missing synchronization fix

Bugfix 2622197.

Modification of the static mListeners (hashmap) is synchronized on the ContactsCache
class object.  This was missing, however, when we clone the hashmap in order to
send out updates.  Cloning is done in case the callback modifies the list of listeners.

Change-Id: Ic09aaee91e448c4a7d610b6f72ad8122fefef7da

8 years agoam 6bbfd941: Fix unread notifications
Tom Taylor [Fri, 23 Apr 2010 16:39:57 +0000 (09:39 -0700)]
am 6bbfd941: Fix unread notifications

Merge commit '6bbfd941885c588cc5d94e345d2cfc4197134a19' into froyo-plus-aosp

* commit '6bbfd941885c588cc5d94e345d2cfc4197134a19':
  Fix unread notifications

8 years agoFix unread notifications
Tom Taylor [Fri, 23 Apr 2010 16:20:00 +0000 (09:20 -0700)]
Fix unread notifications

Reading one thread would mark all messages read. The expression
read=0 OR seen=0 was getting combined with the thread_id in the
provider like this: read=0 OR seen=0 AND thread_id=N, which was evaluated
as read=0 OR (seen=0 AND thread_id=N). The expression needs parens
so it will get evaluated correctly. Bug 2615680

Change-Id: Ib495a74e41346b835a576a8d6d53e809b839f93d

8 years agoam ac551c10: Fix MMS to work with GoogleVoice
Tom Taylor [Thu, 22 Apr 2010 21:05:34 +0000 (14:05 -0700)]
am ac551c10: Fix MMS to work with GoogleVoice

Merge commit 'ac551c101b12f905707ad9321bbe94c908ef85fd' into froyo-plus-aosp

* commit 'ac551c101b12f905707ad9321bbe94c908ef85fd':
  Fix MMS to work with GoogleVoice

8 years agoFix MMS to work with GoogleVoice
Tom Taylor [Wed, 21 Apr 2010 22:59:14 +0000 (15:59 -0700)]
Fix MMS to work with GoogleVoice

Look for a GV BroadcastReceiver rather than an activity.
Tested with sample app. Bug 2614752

Change-Id: Ic52e18ab40ec4813856db3f75dc8722e309a47ff

8 years agoam 7e6f558e: Import revised translations
Kenny Root [Thu, 15 Apr 2010 13:00:32 +0000 (06:00 -0700)]
am 7e6f558e: Import revised translations

Merge commit '7e6f558e509c0759804947a5fd53689e99ea2c77' into froyo-plus-aosp

* commit '7e6f558e509c0759804947a5fd53689e99ea2c77':
  Import revised translations

8 years agoImport revised translations
Kenny Root [Thu, 15 Apr 2010 03:33:21 +0000 (20:33 -0700)]
Import revised translations

Change-Id: I25a081569e0f9f5f589e84f641c81848c79d61aa

8 years agomerge from open-source master
The Android Open Source Project [Wed, 14 Apr 2010 22:28:52 +0000 (15:28 -0700)]
merge from open-source master

Change-Id: Ib54a62360d01c059a4fc2ade5968e79009a4b201

8 years agoFix Cursor NPE when closing.
Brad Fitzpatrick [Wed, 14 Apr 2010 15:51:20 +0000 (08:51 -0700)]
Fix Cursor NPE when closing.

BUG=2595862

Change-Id: I81d432417cb02d785cd98ac24007728f0ada4644

8 years agoMerge "Fix memory leaks and corner cases in MMS app"
Tom Taylor [Wed, 14 Apr 2010 16:04:59 +0000 (09:04 -0700)]
Merge "Fix memory leaks and corner cases in MMS app"

8 years agoFix memory leaks and corner cases in MMS app
Naveen Kalla [Thu, 8 Apr 2010 01:27:27 +0000 (18:27 -0700)]
Fix memory leaks and corner cases in MMS app

The following problems will be fixed with these changes
1) IndexOutOfBounds exception when viewing a slide show. mCurrentElement should
   not exceed the size of all entries. This caused IndexOutOfBounds exception
2) Redundant call for registerSimChangeObserver causes OOM issues.
   SimChangeObserver is registered in onResume function. So the call in
   onQueryComplete can be removed.
3) Check for empty sender address before trying to get associated contact number
   when an SMS is received
4) Fix Cursor leak while receiving sms

8 years agoMerge "Use the default avatar until we have something better to replace it with....
Evan Millar [Fri, 9 Apr 2010 20:03:05 +0000 (13:03 -0700)]
Merge "Use the default avatar until we have something better to replace it with." into froyo

8 years agoUse the default avatar until we have something better to replace it with.
Evan Millar [Fri, 9 Apr 2010 17:38:45 +0000 (10:38 -0700)]
Use the default avatar until we have something better to replace it with.

Fixes bug http://b/issue?id=2584852

Change-Id: Ia7efaf4210037f9408c2e87ef2dbc56db45b05e0

8 years agobug #2582343: attempt to fix the sticky notification bug.
Wei Huang [Fri, 9 Apr 2010 00:24:06 +0000 (17:24 -0700)]
bug #2582343: attempt to fix the sticky notification bug.

- when going to the compose screen, we query to see if there are unread messages, and if so, update both read and seen columns to 1. So in the chance that read=1 and seen=0 (not sure how that can happen), we wouldn't update seen to 1.

change the query to check for (read=0 OR seen=0) instead of just (read=0).

- add selective verbose logging in case this isn't the real fix.

Change-Id: I978ba3a83be227cd924d0c4c85d090bf42be1c8d

8 years agobug #2438230: more logging for Conversation and Recipient cache.
Wei Huang [Thu, 8 Apr 2010 03:19:31 +0000 (20:19 -0700)]
bug #2438230: more logging for Conversation and Recipient cache.

- add more logging to try to catch the mismatching contact/thread bug.
- add selective checking to make sure thread id and recipients are not compromised.

Change-Id: I038dca4f7b32bf822ef68e344c7a6eaf8990e328

8 years agoadd launch performance test for messaging app
Guang Zhu [Mon, 5 Apr 2010 17:31:38 +0000 (10:31 -0700)]
add launch performance test for messaging app

this is part of the effort for collecting app launch time for the platform

Change-Id: I757548dd605334781d55ac88934034aaa425ce92

8 years agodon't crash trying to show the delivery report if it doesn't exist
Mark Wagner [Fri, 2 Apr 2010 19:12:15 +0000 (12:12 -0700)]
don't crash trying to show the delivery report if it doesn't exist

Apparently you can click on the error icon to go back into compose
message activity with the original text and original address
prepopulated -- so you can fix it up.  But for reasons that aren't
clear (it's not clear if it's even intentional) we continue to also
show the failed message item with the failure icon.  If you long
press on that item we include a menu item for showing the delivery
report.  Clicking on that fails to find the item in the sms or mms
table and we crash.

This change makes it so that we're more resilient to this state.
In other words we don't crash.  The dialog which shows the delivery
report is somewhat ugly in this case but acceptible in my opinion.

Change-Id: Ie34c32c83982ff0d506e0102813370e1e7c49a12

8 years agofix race condition unregistering receivers
Mark Wagner [Thu, 1 Apr 2010 00:19:31 +0000 (17:19 -0700)]
fix race condition unregistering receivers

bug 2553387

Change-Id: I43b37c0104bfbe22be81d1f938c4ff66240557bc

8 years agoregex fixes: need to quote the string
Mark Wagner [Thu, 1 Apr 2010 16:44:34 +0000 (09:44 -0700)]
regex fixes: need to quote the string

bug 2553520

Change-Id: I1b3daac42dc60b4cb74ede658ae6ec7f9d0c0ff9

8 years agoMms update due to CamcorderProfile.java public API refresh
James Dong [Wed, 31 Mar 2010 23:50:58 +0000 (16:50 -0700)]
Mms update due to CamcorderProfile.java public API refresh
Dependency: https://android-git.corp.google.com/g/#change,47310

bug - 2553862

Change-Id: I65abbc0b62139efe5f50f74d2bf3a5894136146b

8 years agoMerge "Import revised translations" into froyo
Kenny Root [Tue, 30 Mar 2010 16:31:39 +0000 (09:31 -0700)]
Merge "Import revised translations" into froyo

8 years agoImport revised translations
Kenny Root [Tue, 30 Mar 2010 16:16:30 +0000 (09:16 -0700)]
Import revised translations

Change-Id: I84af1167d88e44b9d5282b97eeec41574e4b8f40

8 years agoRemove overscroll
Adam Powell [Tue, 30 Mar 2010 00:27:16 +0000 (17:27 -0700)]
Remove overscroll

Change-Id: Iab02df7615227480080c411a3526f6297dcc7bf2

8 years agoMerge "Migrate Vibrate setting from previous versions if needed"
Jim Shuma [Thu, 25 Mar 2010 22:55:50 +0000 (15:55 -0700)]
Merge "Migrate Vibrate setting from previous versions if needed"

8 years agoMigrate Vibrate setting from previous versions if needed
Jim Shuma [Thu, 25 Mar 2010 21:34:06 +0000 (14:34 -0700)]
Migrate Vibrate setting from previous versions if needed

The Vibrate setting was getting properly interpreted
in MessagingNotification, but this was not visible from the
preference screen. This change migrates the preference
when the preference screen is brought up.

Bug: 2545853
Change-Id: I00a07b9f60ee4bc6cb21bb4466b31ed175d22c38