Merge commit 'e785d1804dbf67913aeb25896a420abebe731e80' into eclair-plus-aosp
* commit 'e785d1804dbf67913aeb25896a420abebe731e80':
Suppressed the invalidFrameRate as the framework is not throwing the IOException anymore.
Merge commit 'de71cb3b6f3a7484402e2288ddfaad3ea3821f59' into eclair-plus-aosp
* commit 'de71cb3b6f3a7484402e2288ddfaad3ea3821f59':
ContactsContract: Adding joined columns to the Data class definition.
The rationale is this. Since all these joined columns are currently on
different classes, we routinely see code like this:
private static final String[] PROJECTION_PHONE = {
Data._ID, // 0
RawContacts.CONTACT_ID, // 1
Phone.TYPE, // 2
Phone.NUMBER, // 3
Phone.LABEL, // 4
Contacts.DISPLAY_NAME, // 5
};
The most noxious line is RawContacts.CONTACT_ID
After this change, the above declaration changes to:
private static final String[] PROJECTION_PHONE = {
Data._ID, // 0
Data.CONTACT_ID, // 1
Phone.TYPE, // 2
Phone.NUMBER, // 3
Phone.LABEL, // 4
Data.DISPLAY_NAME, // 5
};
Change-Id: I03bfc700e4c8c58a175bc885bf7b807d7fed0744
Merge commit '90d8a6a449dc12fea2b56b557c243e33746d914a' into eclair-plus-aosp
* commit '90d8a6a449dc12fea2b56b557c243e33746d914a':
Inefficient but correct fix for 2122381: call finishBackup after every performBackup
When parsing an SMS message as email, extractEmailAddressFromMessageBody()
checks parts.length >= 1, but then proceeds to access parts[1] (which
may not exist). Instead, check for parts.length >= 2, and treat
parts.length = 1 as non-email.
b/2122698
Merge commit 'b18b0956afbe0730ced1c5b95c0071dba447765e' into eclair-plus-aosp
* commit 'b18b0956afbe0730ced1c5b95c0071dba447765e':
Revert "ContactsContract: Adding joined columns to the Data class definition."
Merge commit 'a411bf01fc8c581651af19556cc9e4bf7aca8da2' into eclair-plus-aosp
* commit 'a411bf01fc8c581651af19556cc9e4bf7aca8da2':
Clean up some debugging and add 2 math lib routines.
Merge commit '6a15417849afab889f1f0cd79e655eaac6b45dca' into eclair-plus-aosp
* commit '6a15417849afab889f1f0cd79e655eaac6b45dca':
ContactsContract: Adding joined columns to the Data class definition.
Merge commit '2c22a51072fd71e3a50df9c26f9078bd62c90cd3' into eclair-plus-aosp
* commit '2c22a51072fd71e3a50df9c26f9078bd62c90cd3':
More hi-res assets, and darken background color to donut level.
Merge commit 'e5a6d16f26543061a0fc815ba90644a44995e025' into eclair-plus-aosp
* commit 'e5a6d16f26543061a0fc815ba90644a44995e025':
Fix http://b/2126318 (density test fails due to wrong-size asset stripping)
The rationale is this. Since all these joined columns are currently on
different classes, we routinely see code like this:
private static final String[] PROJECTION_PHONE = {
Data._ID, // 0
RawContacts.CONTACT_ID, // 1
Phone.TYPE, // 2
Phone.NUMBER, // 3
Phone.LABEL, // 4
Contacts.DISPLAY_NAME, // 5
};
The most noxious line is RawContacts.CONTACT_ID
After this change, the above declaration changes to:
private static final String[] PROJECTION_PHONE = {
Data._ID, // 0
Data.CONTACT_ID, // 1
Phone.TYPE, // 2
Phone.NUMBER, // 3
Phone.LABEL, // 4
Data.DISPLAY_NAME, // 5
};
Change-Id: I820e68efd6c1364241596f826c4da1b9c2defe11
Merge commit '3f90aae6184bf0713ad684fcea3c4836479b9de4' into eclair-plus-aosp
* commit '3f90aae6184bf0713ad684fcea3c4836479b9de4':
Fix http://b/2086471 (list view headers too dark in mdpi).
Merge commit 'c3a3b399a9d7707b7f3c4108e0e31a1b664a6f22' into eclair-plus-aosp
* commit 'c3a3b399a9d7707b7f3c4108e0e31a1b664a6f22':
Add a Gservices setting to controll the app error reporting feature.
The density test expects all resources of all densities to be included, but specifying a density for a particular device build kills that. We therefore add all the required densities explicitly to the Makefile to compensate.
This keeps consistency with Bluez which uses upper case string address. It's
important to keep the case the same so that .equals() in BluetoothService.java
work.
Change-Id: I6404ca137d0aec3cc2e6e7cb79763d5305a03547
Resolves these specific cases:
- 8475766800;,1234
- 8475766800,;1234
Both of these should be converted to 8475766800;1234
Change-Id: Ic329007a3a6e99b1dd55cd8cdec7239dd734c3ca
Merge commit 'fd49faae33dc813c93347d1bcc8fa7c4fa0ae55d' into eclair-plus-aosp
* commit 'fd49faae33dc813c93347d1bcc8fa7c4fa0ae55d':
Add progress view and default poster for the <video> implementation
Merge commit '93727454caf1b3540a352328abd0400c2242902b' into eclair-plus-aosp
* commit '93727454caf1b3540a352328abd0400c2242902b':
Add one line of logging when SCO SOCKET connect starts.
