Bill Gruber
e3aa4ec6b1
am a8c68be8: am df8fc2e1: am 9a693ed9: Doc fix-corrects the cited download locations
...
* commit 'a8c68be89d3735e5d579e521d0798032303330d3':
Doc fix-corrects the cited download locations
2011-04-12 12:42:26 -07:00
Bill Gruber
a8c68be89d
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
df8fc2e1bf
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
Kenny Root
18490fb93e
resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp
...
Change-Id: Ia1a0024aabf531438203eb9fea3a10dd15eabe53
2011-04-12 10:27:15 -07:00
Benoit Goby
0b9b8711a1
am 43be7a61: EthernetDataTracker: implement setDependencyMet
...
* commit '43be7a6120d9dd2ee0902de2322aec2ee75b0351':
EthernetDataTracker: implement setDependencyMet
2011-04-11 20:23:42 -07:00
Benoit Goby
43be7a6120
EthernetDataTracker: implement setDependencyMet
...
Change-Id: I4be804e3c9dccacfacb5cb813a4ad6f513224f06
2011-04-11 20:13:10 -07:00
Benoit Goby
316594715d
am 2869d171: resolved conflicts for merge of 08c39c6a to honeycomb-LTE
...
* commit '2869d1715d815ef2b357bf182d384515cdf6f9ab':
Add support for USB Ethernet adapters
2011-04-11 18:53:57 -07:00
Benoit Goby
2869d1715d
resolved conflicts for merge of 08c39c6a to honeycomb-LTE
...
Change-Id: I79f8ac1dc8ff9f5d0559d37043b850cd26246b92
2011-04-11 18:41:23 -07:00
Brad Fitzpatrick
07c25b6512
am 4430670f: am ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler"
...
* commit '4430670f48f75661293371dab8db55865f5f56e0':
audioflinger: Enable ARMv5TE optimized resampler
2011-04-11 17:27:12 -07:00
Xavier Ducrohet
1f2a307b59
resolved conflicts for merge of 4754c79a to honeycomb-plus-aosp
...
Change-Id: I3e7bd605e08be0c45533d4c9193727bbf413d342
2011-04-11 17:11:41 -07:00
Benoit Goby
08c39c6a11
Add support for USB Ethernet adapters
...
Change-Id: I6ae34a32d0e1b6f21c484b8639c3e7ce086e568d
2011-04-11 16:33:43 -07:00
Xavier Ducrohet
fc1bf92563
resolved conflicts for merge of efa98a29 to honeycomb-plus-aosp
...
Change-Id: Id5fe9a8cc322a10e1a0b726c33b5dc9091e44701
2011-04-11 16:15:54 -07:00
Kenny Root
87b3c0dcc4
am 08d9d9a4: Merge "Runtime resource overlay, iteration 1."
...
* commit '08d9d9a46250c4fad66e9b637e8898a3524c4286':
Runtime resource overlay, iteration 1.
2011-04-11 15:33:19 -07:00
Mike Lockwood
9e13c7e5d7
am 9645081c: am 43707a83: UsbManager: minor Javadoc tweak
...
* commit '9645081cc7f31e1151fedbcd5932a100719e91e4':
UsbManager: minor Javadoc tweak
2011-04-11 14:24:11 -07:00
Jason parks
f953d3e2ea
am 7f506024: am 78a9766b: Merge "Implement teardown script." into gingerbread
...
* commit '7f506024e989c2c7dfa8f9f72ea088944e307c26':
Implement teardown script.
2011-04-11 14:24:06 -07:00
Jeff Hamilton
a83bc16089
am 7bb236c3: am 84d34078: Make the NFC UID forward compatible.
...
* commit '7bb236c3b5e49f53b3110855276d99e664b29931':
Make the NFC UID forward compatible.
2011-04-11 14:23:59 -07:00
James Dong
6f2b5d614c
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
a7e8385cb3
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
87ee132ac5
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
1b00dc66d4
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
3156a8c169
Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE
2011-04-11 12:04:47 -07:00
Wink Saville
d3059487ab
Move ProcessedMessage into HierarchicalStateMachine.
...
ProcessedMessage is really private to HSM and so moving
it into the HSM class.
Change-Id: Ida476fc7aae5e9bfb6ac632dac979e11f489b6fc
2011-04-11 11:51:28 -07:00
Freeman Ng
2df36fd6ec
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
b7e8a54d98
Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE
2011-04-11 11:10:18 -07:00
Glenn Kasten
c6c2285b36
Enable HDCP debugging in Stagefright (1 of 2)
...
Change-Id: Ia3ea555d5fa45547ed6bfce59f299087ced7809c
2011-04-11 11:07:53 -07:00
Kenny Root
08d9d9a462
Merge "Runtime resource overlay, iteration 1."
2011-04-11 10:07:15 -07:00
Wink Saville
6e79756665
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
442b08bc7c
Merge "Cleanup all functions overridden from DCT in GDCT" into honeycomb-LTE
2011-04-09 07:50:37 -07:00
Bill Gruber
9a693ed987
Doc fix-corrects the cited download locations
...
Change-Id: I4225adb4162801b6cf5534dc4ed4f03e79a47e36
2011-04-08 17:55:17 -07:00
Jamie Gennis
0fb4e73f5f
am 3a9f5143: am 66380f76: Stagefright: authenticate ANativeWindow.
...
* commit '3a9f5143efe63b4b94a1bd1312e0ba618a58674f':
Stagefright: authenticate ANativeWindow.
2011-04-08 17:41:38 -07:00
Jamie Gennis
3a9f5143ef
am 66380f76: Stagefright: authenticate ANativeWindow.
...
* commit '66380f768c0de8bde1f54ac6ab3f126b66928dad':
Stagefright: authenticate ANativeWindow.
2011-04-08 17:40:00 -07:00
Robert Greenwalt
862da792c0
Cleanup all functions overridden from DCT in GDCT
...
Also removed use of iterator.
Change-Id: I58e505d641cc2b84b6522a6793665c2a3c839580
2011-04-08 17:36:39 -07:00
Robert Greenwalt
da2790fa0a
am 658779f5: Merge "Make ApnSettings threadsafe." into honeycomb-LTE
...
* commit '658779f5d81031dc2c34ef6bc374fad394d01465':
Make ApnSettings threadsafe.
2011-04-08 17:21:43 -07:00
Robert Greenwalt
658779f5d8
Merge "Make ApnSettings threadsafe." into honeycomb-LTE
2011-04-08 17:19:53 -07:00
Robert Greenwalt
561538879b
Make ApnSettings threadsafe.
...
Also fixes getActiveApnString.
Change-Id: I2278b30505cc8a6be484341cba12d14f7b6316e8
2011-04-08 16:48:42 -07:00
Robert Greenwalt
ede9ed9f70
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
de78352c6c
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
1eeeae59d0
Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE
2011-04-08 16:31:03 -07:00
Robert Greenwalt
ac9c73ae61
Merge "Fix notification of disconnected networks." into honeycomb-LTE
2011-04-08 16:22:06 -07:00
Robert Greenwalt
1b6c758c29
Fix getActiveApnTypes for GsmDCT.
...
Change-Id: I42e71f0cbe31289f16623de38141213f547aa13f
2011-04-08 16:07:37 -07:00
Robert Greenwalt
6b01e4cdf8
Fix notification of disconnected networks.
...
Reorder - set state and then report the state, else we always report disconnecting which
is interpreted as still connected.
Change-Id: I95f5fe9ccee0d7ee9a03f78ae5b614af2ba0860b
2011-04-08 15:52:23 -07:00
Jamie Gennis
66380f768c
Stagefright: authenticate ANativeWindow.
...
This change adds a check to verify that the ANativeWindow to which
decoded video buffers are queued sends those buffers to SurfaceFlinger.
The check is done when the buffer content is flagged as protected. This
change also adds an error in the case where protected buffers are
needed, but an ANativeWindow is not being used as the video destination.
Change-Id: I107c9082d65ef0de4a13594e9535a2053ad5161b
Bug: 4269240
2011-04-08 15:24:10 -07:00
Wink Saville
4a28096dec
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
73ad388aae
Merge "Check different CellLocation type in GsmDataConnectionTracker" into honeycomb-LTE
2011-04-08 13:20:20 -07:00
Robert Greenwalt
01f8f290cd
am 63edf6c4: Rename PhoneBase\'s DataConnectionTracker member.
...
* commit '63edf6c4f5795009e55f2ae9556550c38daa9774':
Rename PhoneBase's DataConnectionTracker member.
2011-04-08 12:23:49 -07:00
Robert Greenwalt
63edf6c4f5
Rename PhoneBase's DataConnectionTracker member.
...
Was called mDataConnection, but this is more confusing now that we have multiple
DataConnections. Changed it to the more correct mDataConnectionTracker.
Change-Id: I3cdc4f2897d60e5b0885891744aa6ff2db27af37
2011-04-08 11:54:01 -07:00
Kazuhiro Ondo
8968f9f6d4
Check different CellLocation type in GsmDataConnectionTracker
...
Addressing phone app crash in GsmDataConnectionTracker when CDMALTEPhone
is used. CDMALTEPhone uses CDMA SST so getCellLocation() was returning
an instance of CdmaCellLocation. This was causing a crash when GsmDCT
type casts the instance as GsmCellLocation.
This patch tries to check the instance type before retrieving corresponding
cell id.
Change-Id: I6ac9cd4dc078552dc58d4d9350494a7b608c2b98
2011-04-08 11:42:51 -07:00
Wink Saville
4b1a37d725
am 5203a5bc: Cleanup debugging.
...
* commit '5203a5bc28a5ae432eab236780b2f97bdec71dbf':
Cleanup debugging.
2011-04-08 11:35:11 -07:00
Wink Saville
5203a5bc28
Cleanup debugging.
...
Change-Id: I4c61b6716a6d03d70bc1e9013954d6b2002cec54
2011-04-08 11:14:23 -07:00
Wink Saville
b93811091d
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