Elliott Hughes
40a2d50af1
Merge "Use jniThrowException for exception throwing from native code."
2011-04-08 10:08:19 -07:00
Robert Greenwalt
f83b30ec1b
am e3e535a9: am 4410660e: Fix ISO country code of Slovenia.
...
* commit 'e3e535a9c6b35971b54becc912e45da0f8b3f727':
Fix ISO country code of Slovenia.
2011-04-08 10:07:26 -07:00
Robert Greenwalt
3c0875c741
am 4410660e: Fix ISO country code of Slovenia.
...
* commit '4410660e02c04b29d323c6d3bf81633fd07b6411':
Fix ISO country code of Slovenia.
2011-04-08 10:05:01 -07:00
Teng-Hui Zhu
753c2a6c8d
Merge "Don't send pause again when coming back from full screen"
2011-04-08 09:19:01 -07:00
Wu-cheng Li
97a03dc6ac
Merge "Add camera focus area API."
2011-04-08 02:47:39 -07:00
Dianne Hackborn
ecc3707e96
Merge "Improve activity manager debug dumps."
2011-04-07 18:46:54 -07:00
Nicolas Roard
9a3dead827
am 16d8de7a: am 3e37a2f3: am fcba2353: Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1
...
* commit '16d8de7a293e5d626823a59f2d8b74e0d4a75cbd':
Remove uncalled function -- java counterpart of the fix for bug:4183801
2011-04-07 17:27:53 -07:00
Nicolas Roard
17d071f1b9
am 3e37a2f3: am fcba2353: Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1
...
* commit '3e37a2f3ae3e3a777bf479a6562063922a7e44c6':
Remove uncalled function -- java counterpart of the fix for bug:4183801
2011-04-07 17:25:56 -07:00
Nicolas Roard
d3390c2951
am fcba2353: Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1
...
* commit 'fcba23536b1b432a5977e1ba4ea70ae0ff5aed4a':
Remove uncalled function -- java counterpart of the fix for bug:4183801
2011-04-07 17:24:05 -07:00
Nicolas Roard
d0277b0001
Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1
2011-04-07 17:21:53 -07:00
Adam Cohen
f1f34e4a48
Merge "Fix crash in bug 4259574"
2011-04-07 17:12:19 -07:00
Daisuke Miyakawa
7340b4f5e3
Merge "Add params for primary account to ContactsContract"
2011-04-07 17:03:18 -07:00
Wink Saville
5855251b2b
am 5f66c953: am 7183a7a5: Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall." into honeycomb-LTE
...
* commit '5f66c953a7ebf5dd6dc2ce1c79f2c2ee324dd13b':
Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall.
2011-04-07 16:53:34 -07:00
Wink Saville
077600118b
am 7183a7a5: Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall." into honeycomb-LTE
...
* commit '7183a7a584397142ab7347d6f721011d743fb699':
Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall.
2011-04-07 16:51:50 -07:00
Wink Saville
9e4c369be4
Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall." into honeycomb-LTE
2011-04-07 16:49:02 -07:00
Robert Greenwalt
8ffe69fbda
Merge "Fix build."
2011-04-07 16:01:46 -07:00
Bill Gruber
aa22430ee3
am 60bfa4d0: am 216d9894: am 6bb8b0ec: am afecd1e9: IAB docs--status codes fix Bug: 4208641
...
* commit '60bfa4d0f5d55eb474146330be7f5404521b1c67':
IAB docs--status codes fix Bug: 4208641
2011-04-07 15:20:16 -07:00
Bill Gruber
9ff3d38dc8
am 216d9894: am 6bb8b0ec: am afecd1e9: IAB docs--status codes fix Bug: 4208641
...
* commit '216d98949ddeb84359836594ab00be158d69545e':
IAB docs--status codes fix Bug: 4208641
2011-04-07 15:17:26 -07:00
Bill Gruber
3b6ce8f7bd
am 6bb8b0ec: am afecd1e9: IAB docs--status codes fix Bug: 4208641
...
* commit '6bb8b0ecb558373ba99e44ad5c351e1d7bb410d6':
IAB docs--status codes fix Bug: 4208641
2011-04-07 15:14:54 -07:00
Bill Gruber
411937b5f7
am afecd1e9: IAB docs--status codes fix Bug: 4208641
...
* commit 'afecd1e99284dc386f07571c69edfed8c12f1cef':
IAB docs--status codes fix Bug: 4208641
2011-04-07 15:09:33 -07:00
Wink Saville
69ece6c6d6
am de1b950d: am 9e7a5a1e: Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE
...
* commit 'de1b950d2b07737e3d284ed2ada361737d8a5a1a':
ConnectivityService needs to use the new names for the NetConfig vars.
2011-04-07 14:31:20 -07:00
Wink Saville
8eeb7fc265
am 9e7a5a1e: Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE
...
* commit '9e7a5a1e567a0e696d9a7b68fffd00b7408e6ac1':
ConnectivityService needs to use the new names for the NetConfig vars.
2011-04-07 14:29:17 -07:00
Wink Saville
e77aa4a817
Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE
2011-04-07 14:28:06 -07:00
Teng-Hui Zhu
1ce21b999e
am 4e790ee1: (-s ours) am 29fa50be: am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1
...
* commit '4e790ee1894118a1ab2032d09e5016fa9414dae7':
DO NOT MERGE : cherry pick of change Ieb7ae26b from master
DO NOT MERGE : cherry pick of change I0f9f2c65 from master
2011-04-07 14:27:03 -07:00
Teng-Hui Zhu
190f3369d5
am 29fa50be: am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1
...
* commit '29fa50be2484ed9d7a5e8075b764caa37b6494b9':
DO NOT MERGE : cherry pick of change Ieb7ae26b from master
DO NOT MERGE : cherry pick of change I0f9f2c65 from master
2011-04-07 14:24:22 -07:00
Xavier Ducrohet
f837358fc4
am 65ef6e86: (-s ours) am 96ac8560: am 515a08b0: Merge 59aad78e from master. do not merge.
...
* commit '65ef6e8690cc13e9e20582fd0236b18eaae204b9':
Merge 59aad78e from master. do not merge.
2011-04-07 14:24:00 -07:00
Teng-Hui Zhu
6d692d73fd
am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1
...
* commit 'bb55777be1a3231d187205dc378ca35b01e8bc65':
DO NOT MERGE : cherry pick of change Ieb7ae26b from master
DO NOT MERGE : cherry pick of change I0f9f2c65 from master
2011-04-07 14:22:33 -07:00
Robert Greenwalt
82863327e3
am f4a29403: resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp
...
* commit 'f4a29403ae5b6d3e8e754a025d33f0c33adecb21':
Add external dependency API.
2011-04-07 14:22:03 -07:00
Xavier Ducrohet
fee8d78ce8
am 96ac8560: am 515a08b0: Merge 59aad78e from master. do not merge.
...
* commit '96ac85607b1462508981936b1be29ae5f9e4271d':
Merge 59aad78e from master. do not merge.
2011-04-07 14:18:20 -07:00
Teng-Hui Zhu
8d314a934e
Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1
...
* changes:
DO NOT MERGE : cherry pick of change Ieb7ae26b from master
DO NOT MERGE : cherry pick of change I0f9f2c65 from master
2011-04-07 14:17:52 -07:00
Robert Greenwalt
f3eae4d6b8
resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp
...
Change-Id: I0962138f6ecb1ed54fda25524d8850b086f13c4f
2011-04-07 14:13:52 -07:00
Eric Fischer
d278132ec1
Merge "Import revised translations."
2011-04-07 14:08:55 -07:00
Xavier Ducrohet
42b6957036
am 515a08b0: Merge 59aad78e from master. do not merge.
...
* commit '515a08b01851a1ab9386f85dee6d9fd7b65ee7ad':
Merge 59aad78e from master. do not merge.
2011-04-07 13:38:13 -07:00
Jeff Brown
76a8686e2b
Merge "Coalesce input events that arrive faster than 333Hz."
2011-04-07 13:18:38 -07:00
Jeff Brown
4e394b18ba
Coalesce input events that arrive faster than 333Hz.
...
Some drivers report individual finger updates one at a time
instead of all at once. When 10 fingers are down, this can
cause the framework to have to handle 10 times as many events
each with 10 times as much data. Applications like
PointerLocation would get significantly bogged down by all
of the redundant samples.
This change coalesces samples that are closely spaced in time,
before they are dispatched, as part of the motion event batching
protocol.
Increased the size of the InputChannel shared memory buffer so
that applications can catch up faster if they accumulate a
backlog of samples.
Added logging code to help measure input dispatch and drawing
latency issues in the view hierarchy. See ViewDebug.DEBUG_LATENCY.
Change-Id: Ia5898f781f19901d2225c529a910c32bdf4f504f
2011-04-07 13:11:16 -07:00
Robert Greenwalt
409496a306
Merge "Add external dependency API." into honeycomb-LTE
2011-04-07 13:02:28 -07:00
John Wang
733f9e0824
am 91bc0f81: am 574d3c4b: Merge "Refactor onSetupConnectionCompleted." into honeycomb-LTE
...
* commit '91bc0f818c9e4cfdffc09f6edecfd11a1ce1806e':
Refactor onSetupConnectionCompleted.
2011-04-07 12:48:22 -07:00
John Wang
e232873da7
am c343c183: am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE
...
* commit 'c343c18376b8fd7d27a07adc5bb617d0260a8cdc':
Make LinkProperties comparable.
2011-04-07 12:48:17 -07:00
John Wang
62a2b945b5
am 574d3c4b: Merge "Refactor onSetupConnectionCompleted." into honeycomb-LTE
...
* commit '574d3c4b2cb120314b68bffa34aed2545d1b1158':
Refactor onSetupConnectionCompleted.
2011-04-07 12:46:21 -07:00
John Wang
45da60e99f
am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE
...
* commit '5d6f1167039e22889545212ce18192460f9b503e':
Make LinkProperties comparable.
2011-04-07 12:46:18 -07:00
John Wang
31edd5cf3c
Merge "Refactor onSetupConnectionCompleted." into honeycomb-LTE
2011-04-07 12:44:14 -07:00
John Wang
1a564a8b57
Merge "Make LinkProperties comparable." into honeycomb-LTE
2011-04-07 12:44:04 -07:00
Jason Sams
3ddcdea010
Merge "Migrate most GL from context to driver."
2011-04-07 11:33:11 -07:00
James Dong
405b3de371
Merge "Media JNI code cleanup"
2011-04-07 11:16:49 -07:00
Eric Laurent
ff7e573224
Merge "Do not disable effect in AudioEffect destructor."
2011-04-07 10:31:11 -07:00
Wink Saville
ecfb9caa34
am 7ff3c410: am add31091: Merge "Add a 4G icon for LTE." into honeycomb-LTE
...
* commit '7ff3c410be00776159ff7a433ce218fabf3f44c4':
Add a 4G icon for LTE.
2011-04-07 09:38:41 -07:00
Wink Saville
b2e5bb2b2b
am add31091: Merge "Add a 4G icon for LTE." into honeycomb-LTE
...
* commit 'add31091785c3de8df1555163cca9ee9d22c9968':
Add a 4G icon for LTE.
2011-04-07 09:37:06 -07:00
Wink Saville
8331a02477
Merge "Add a 4G icon for LTE." into honeycomb-LTE
2011-04-07 09:35:18 -07:00
Teng-Hui Zhu
d8ba087b44
am d4e8e4bb: am b3bb6fd5: am b25181aa: Merge "Fix the issue the video can\'t start to play" into honeycomb-mr1
...
* commit 'd4e8e4bb3c2921ae9e15ef012bafc504b48c7efe':
Fix the issue the video can't start to play
2011-04-07 09:24:02 -07:00
Teng-Hui Zhu
c77a4c2bae
am b3bb6fd5: am b25181aa: Merge "Fix the issue the video can\'t start to play" into honeycomb-mr1
...
* commit 'b3bb6fd5e3050b6d17bc1a58906ea04e97a29e20':
Fix the issue the video can't start to play
2011-04-07 09:14:50 -07:00