Wink Saville
3130010f7f
Merge "Telephony: GDCT - Set enabled state before notification is sent out." into honeycomb-LTE
2011-04-16 14:45:42 -07:00
Wink Saville
aa349179e7
Merge "Telephony: Set Radio turned off reason when powered off." into honeycomb-LTE
2011-04-16 14:44:08 -07:00
Wink Saville
c3b28e4563
Merge "Clean up calls immediately if cid become inactive in unsol data state changed" into honeycomb-LTE
2011-04-16 14:43:30 -07:00
Wink Saville
9e5fdca509
Merge "handle missing constants when creating a Phone instance" into honeycomb-LTE
2011-04-16 14:42:49 -07:00
Wink Saville
47a40c1d4a
Merge "Cleanup/add log statements." into honeycomb-LTE
2011-04-15 15:44:18 -07:00
Wink Saville
29f61001a4
Merge "Change RIL initialization." into honeycomb-LTE
2011-04-15 15:36:43 -07:00
Dianne Hackborn
3ba563f61a
am f6f87c98: Merge "Fix issue #4291805 : Tap Fish crashes on launch" into honeycomb-mr1
...
* commit 'f6f87c985989603139b31df663f9f9a90543cacc':
Fix issue #4291805 : Tap Fish crashes on launch
2011-04-14 15:27:32 -07:00
Dianne Hackborn
2f94260a9c
Merge "Fix issue #4291805 : Tap Fish crashes on launch" into honeycomb-mr1
2011-04-14 15:10:31 -07:00
Eric Fischer
ba4aa67beb
am 4e3d6aa0: am d284a867: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '4e3d6aa0688f023dfe5feb2eb197207cc8267463':
Import revised translations. DO NOT MERGE
2011-04-14 14:26:46 -07:00
Eric Fischer
8d5645716c
am d284a867: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit 'd284a8676e002a72b66d321402ec7f4ed61c7915':
Import revised translations. DO NOT MERGE
2011-04-14 14:21:57 -07:00
Eric Fischer
7c1a8f7461
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-04-14 14:14:46 -07:00
Scott Main
b0ca3a2935
am 2a08e7bf: am d08debcb: docs: bring back the SDK EULA wall for downloading archived SDKs
...
* commit '2a08e7bf6778fe7494be45c7231e2df3edce5ab4':
docs: bring back the SDK EULA wall for downloading archived SDKs
2011-04-14 14:08:51 -07:00
Scott Main
8fcb75765d
am d08debcb: docs: bring back the SDK EULA wall for downloading archived SDKs
...
* commit 'd08debcb211ec2e369c8c88ce15e4aaadd54a8d4':
docs: bring back the SDK EULA wall for downloading archived SDKs
2011-04-14 13:55:16 -07:00
Xia Wang
203f649656
am 46b59ef0: Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1
...
* commit '46b59ef01be530a6bbe3f0e9a2bed27de9985f40':
Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi
2011-04-13 15:34:29 -07:00
Xia Wang
aef161d454
Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1
2011-04-13 15:13:10 -07:00
Glenn Kasten
ce5c08c2e4
am b0d6f10e: Bug 4167061 remove debugging code
...
* commit 'b0d6f10eedeef099164995d51dbd076a6fcc5acc':
Bug 4167061 remove debugging code
2011-04-13 11:48:28 -07:00
Wink Saville
36fb943450
Merge "Fix occasional phone app crash" into honeycomb-LTE
2011-04-12 16:53:54 -07:00
Scott Main
c2b8995c9a
am 7e8902a9: am f42937a8: docs: fix doc typo
...
* commit '7e8902a90566bf05c9bc12f87f4149fc6e3c00a4':
docs: fix doc typo
2011-04-12 14:48:30 -07:00
Scott Main
281c94f89d
am f42937a8: docs: fix doc typo
...
* commit 'f42937a8aa0af6b22d8a2a43a9bfc07c38aeffb5':
docs: fix doc typo
2011-04-12 14:44:02 -07:00
Scott Main
372f5c0ed2
am c7b94371: am b9fedd97: docs: fix broken links
...
* commit 'c7b94371a0a4cbe853c17c4610a564a5a4d3efd5':
docs: fix broken links
2011-04-12 13:06:50 -07:00
Scott Main
6b923ae419
am b9fedd97: docs: fix broken links
...
* commit 'b9fedd9771a6aedf068155fd91f15baf52e668cd':
docs: fix broken links
2011-04-12 13:02:43 -07:00
Bill Gruber
46fe2b098d
am df8fc2e1: am 9a693ed9: Doc fix-corrects the cited download locations
...
* commit 'df8fc2e1bfb6abcbea107636f36fae464faf976f':
Doc fix-corrects the cited download locations
2011-04-12 12:23:33 -07:00
Bill Gruber
af40f2d47d
am 9a693ed9: Doc fix-corrects the cited download locations
...
* commit '9a693ed9870cf2d5817a3bfc8dc0fbec4456a3c2':
Doc fix-corrects the cited download locations
2011-04-12 11:48:00 -07:00
Benoit Goby
29d013afa9
resolved conflicts for merge of 08c39c6a to honeycomb-LTE
...
Change-Id: I79f8ac1dc8ff9f5d0559d37043b850cd26246b92
2011-04-11 18:41:23 -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
3cc95585e2
Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE
2011-04-11 12:04:47 -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
42b6501ff8
Merge "Cleanup all functions overridden from DCT in GDCT" into honeycomb-LTE
2011-04-09 07:50:37 -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
40ff957b48
Merge "Make ApnSettings threadsafe." into honeycomb-LTE
2011-04-08 17:19:53 -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
5489f042dc
Merge "Check different CellLocation type in GsmDataConnectionTracker" into honeycomb-LTE
2011-04-08 13:20:20 -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
91cd40d0cf
Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTE
2011-04-08 10:07:31 -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
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
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
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
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
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
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
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
8331a02477
Merge "Add a 4G icon for LTE." into honeycomb-LTE
2011-04-07 09:35:18 -07:00
Teng-Hui Zhu
ccd0789d9d
am b25181aa: Merge "Fix the issue the video can\'t start to play" into honeycomb-mr1
...
* commit 'b25181aaccb00fee405251bf3575ce1d40badf46':
Fix the issue the video can't start to play
2011-04-07 09:07:52 -07:00
Teng-Hui Zhu
decffc4e2f
Merge "Fix the issue the video can't start to play" into honeycomb-mr1
2011-04-07 08:52:45 -07:00