James Dong
eb71e49725
am b0ccbacd: (-s ours) am ea5d2c58: Merge "When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE." into gingerbread
...
* commit 'b0ccbacdb35e8e987eb9efd61af13fefd7c2f5f0':
When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE.
2011-04-11 14:23:52 -07:00
Glenn Kasten
fe6844cdd8
am 87ee132a: am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2)
...
* commit '87ee132ac5dd99564d4ad8f05631bbb021dbc0b0':
Enable HDCP debugging in Stagefright (1 of 2)
2011-04-11 12:46:38 -07:00
Glenn Kasten
2c287e4572
am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2)
...
* commit 'c6c2285b36e83b96056e2404371cdf6e6f7acaee':
Enable HDCP debugging in Stagefright (1 of 2)
2011-04-11 12:43:28 -07:00
Wink Saville
2ab253ac63
am 3156a8c1: Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE
...
* commit '3156a8c1694756dfa74c3918867f528bcf916e28':
Move ProcessedMessage into HierarchicalStateMachine.
2011-04-11 12:08:19 -07:00
Wink Saville
3cc95585e2
Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE
2011-04-11 12:04:47 -07:00
Freeman Ng
0428aaa920
am b7e8a54d: Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE
...
* commit 'b7e8a54d98f753406c8763a7075e5f6b92e9300e':
Add prepaid data services URL to Secure Settings
2011-04-11 11:19:18 -07:00
Freeman Ng
90cd144ad3
Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE
2011-04-11 11:10:18 -07:00
Wink Saville
4c25818c7d
am 442b08bc: Merge "Cleanup all functions overridden from DCT in GDCT" into honeycomb-LTE
...
* commit '442b08bc7c934f601a111bf97ea96842d69cdc23':
Cleanup all functions overridden from DCT in GDCT
2011-04-09 07:57:35 -07:00
Wink Saville
42b6501ff8
Merge "Cleanup all functions overridden from DCT in GDCT" into honeycomb-LTE
2011-04-09 07:50:37 -07:00
Jamie Gennis
e2138567d9
am 3a9f5143: am 66380f76: Stagefright: authenticate ANativeWindow.
...
* commit '3a9f5143efe63b4b94a1bd1312e0ba618a58674f':
Stagefright: authenticate ANativeWindow.
2011-04-08 17:41:38 -07:00
Jamie Gennis
f82a9a29d7
am 66380f76: Stagefright: authenticate ANativeWindow.
...
* commit '66380f768c0de8bde1f54ac6ab3f126b66928dad':
Stagefright: authenticate ANativeWindow.
2011-04-08 17:40:00 -07:00
Robert Greenwalt
4e3f02dc82
am 658779f5: Merge "Make ApnSettings threadsafe." into honeycomb-LTE
...
* commit '658779f5d81031dc2c34ef6bc374fad394d01465':
Make ApnSettings threadsafe.
2011-04-08 17:21:43 -07:00
Robert Greenwalt
40ff957b48
Merge "Make ApnSettings threadsafe." into honeycomb-LTE
2011-04-08 17:19:53 -07:00
Robert Greenwalt
7fa484bb6f
am 1eeeae59: Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE
...
* commit '1eeeae59d07ccc6b7db865b942d3e0b9394b1a59':
Fix getActiveApnTypes for GsmDCT.
2011-04-08 16:38:39 -07:00
Robert Greenwalt
76db8f5faf
am ac9c73ae: Merge "Fix notification of disconnected networks." into honeycomb-LTE
...
* commit 'ac9c73ae619aee63f49cf1f845ef5588bd46dce8':
Fix notification of disconnected networks.
2011-04-08 16:38:34 -07:00
Robert Greenwalt
884a16e3be
Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE
2011-04-08 16:31:03 -07:00
Robert Greenwalt
8ad8536fa9
Merge "Fix notification of disconnected networks." into honeycomb-LTE
2011-04-08 16:22:06 -07:00
Wink Saville
098c69629b
am 73ad388a: Merge "Check different CellLocation type in GsmDataConnectionTracker" into honeycomb-LTE
...
* commit '73ad388aae28213dd3f47bcac1b52c671e3cacc7':
Check different CellLocation type in GsmDataConnectionTracker
2011-04-08 13:23:24 -07:00
Wink Saville
5489f042dc
Merge "Check different CellLocation type in GsmDataConnectionTracker" into honeycomb-LTE
2011-04-08 13:20:20 -07:00
Robert Greenwalt
d0856efeac
am 63edf6c4: Rename PhoneBase\'s DataConnectionTracker member.
...
* commit '63edf6c4f5795009e55f2ae9556550c38daa9774':
Rename PhoneBase's DataConnectionTracker member.
2011-04-08 12:23:49 -07:00
Wink Saville
8e0392e80e
am 5203a5bc: Cleanup debugging.
...
* commit '5203a5bc28a5ae432eab236780b2f97bdec71dbf':
Cleanup debugging.
2011-04-08 11:35:11 -07:00
Wink Saville
3e2844ad79
am 1905e166: Merge "DataConnection: set CID to the correct value." into honeycomb-LTE
...
* commit '1905e166ed40ee11e80476848ef40e817512f740':
DataConnection: set CID to the correct value.
2011-04-08 10:41:09 -07:00
Wink Saville
68a57ea882
Merge "DataConnection: set CID to the correct value." into honeycomb-LTE
2011-04-08 10:38:25 -07:00
Robert Greenwalt
73b494a72d
am 9c7f433c: Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTE
...
* commit '9c7f433c80fd2014562f8d161e6a34710fe475d6':
Fix isApnTypeActive in GDCT.
2011-04-08 10:09:03 -07:00
Robert Greenwalt
91cd40d0cf
Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTE
2011-04-08 10:07:31 -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
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
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
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
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
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
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
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
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
Robert Greenwalt
409496a306
Merge "Add external dependency API." into honeycomb-LTE
2011-04-07 13:02:28 -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
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
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