OSDN Git Service
Wink Saville [Tue, 19 Jul 2011 01:39:41 +0000 (18:39 -0700)]
am
cd4636ec: Add LteOnCdmaDevice system property.
* commit '
cd4636ec08a50ab890acab0cf0c3c3f07f91896a':
Add LteOnCdmaDevice system property.
Conley Owens [Mon, 18 Jul 2011 23:55:33 +0000 (16:55 -0700)]
am
a4aef41a: am
a74774fd: am
4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
* commit '
a4aef41a74a69b0296b88361ffb33d0470a26362':
stagefright aacenc: Mark codeWord as UWord16
Conley Owens [Mon, 18 Jul 2011 23:53:41 +0000 (16:53 -0700)]
am
a74774fd: am
4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
* commit '
a74774fd9146aa22801487d3652dc18e9e328b8e':
stagefright aacenc: Mark codeWord as UWord16
Conley Owens [Mon, 18 Jul 2011 23:52:26 +0000 (16:52 -0700)]
am
4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
* commit '
4d8f6a38e7268e29e189cb4173f42c7aa5b320a3':
stagefright aacenc: Mark codeWord as UWord16
Conley Owens [Mon, 18 Jul 2011 23:49:43 +0000 (16:49 -0700)]
Merge "stagefright aacenc: Mark codeWord as UWord16"
Deckard Autoverifier [Mon, 18 Jul 2011 22:44:03 +0000 (15:44 -0700)]
am
2acddc54: am
89bac182: am
88409911: Merge "stagefright: Include stdlib.h for malloc/free"
* commit '
2acddc54e1e7a9f41b4b5acc2e8984c46539425a':
stagefright: Include stdlib.h for malloc/free
Deckard Autoverifier [Mon, 18 Jul 2011 22:44:01 +0000 (15:44 -0700)]
am
31140598: am
16db83c2: am
eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file"
* commit '
31140598866c668047fc6dede7944e146aa21a0a':
stagefright amrwbenc: Remove a duplicate, unused file
Deckard Autoverifier [Mon, 18 Jul 2011 22:43:58 +0000 (15:43 -0700)]
am
29fd8cdb: am
80ef1745: am
c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
* commit '
29fd8cdbe554ca65c57dd9eea59dc57e3392acc3':
stagefright aacenc: Make the mem_malloc function 64-bit safe
Deckard Autoverifier [Mon, 18 Jul 2011 22:43:54 +0000 (15:43 -0700)]
am
691257b1: am
68e37dac: am
55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
* commit '
691257b1812ffd8172b01c17b9ba23a48eb76594':
stagefright: Only use __int64 on MSVC, not on all win32 compilers
Deckard Autoverifier [Mon, 18 Jul 2011 22:41:31 +0000 (15:41 -0700)]
am
89bac182: am
88409911: Merge "stagefright: Include stdlib.h for malloc/free"
* commit '
89bac1820f3788d655ae293ec9a65c18226e09ee':
stagefright: Include stdlib.h for malloc/free
Deckard Autoverifier [Mon, 18 Jul 2011 22:41:29 +0000 (15:41 -0700)]
am
16db83c2: am
eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file"
* commit '
16db83c26442f5e25b6aad77a37b612fa0be9862':
stagefright amrwbenc: Remove a duplicate, unused file
Deckard Autoverifier [Mon, 18 Jul 2011 22:41:26 +0000 (15:41 -0700)]
am
80ef1745: am
c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
* commit '
80ef1745d00c235b117e389e56e58210cf88e5c8':
stagefright aacenc: Make the mem_malloc function 64-bit safe
Deckard Autoverifier [Mon, 18 Jul 2011 22:41:24 +0000 (15:41 -0700)]
am
68e37dac: am
55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
* commit '
68e37dacc065eebb971d443722b7a8413ff403d6':
stagefright: Only use __int64 on MSVC, not on all win32 compilers
Deckard Autoverifier [Mon, 18 Jul 2011 22:38:30 +0000 (15:38 -0700)]
am
88409911: Merge "stagefright: Include stdlib.h for malloc/free"
* commit '
88409911aebed6c3663e51d51fca67f527c0c2fb':
stagefright: Include stdlib.h for malloc/free
Deckard Autoverifier [Mon, 18 Jul 2011 22:38:27 +0000 (15:38 -0700)]
am
eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file"
* commit '
eb07c531498f4dc881ad2b4d1a32cacab25950ff':
stagefright amrwbenc: Remove a duplicate, unused file
Deckard Autoverifier [Mon, 18 Jul 2011 22:38:25 +0000 (15:38 -0700)]
am
c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
* commit '
c06c3603e09a85136eb97d1d8ba1a49fcebae93b':
stagefright aacenc: Make the mem_malloc function 64-bit safe
Deckard Autoverifier [Mon, 18 Jul 2011 22:38:22 +0000 (15:38 -0700)]
am
55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
* commit '
55f115a3214343c826acf27fcbc4bf2927049083':
stagefright: Only use __int64 on MSVC, not on all win32 compilers
Deckard Autoverifier [Mon, 18 Jul 2011 22:23:41 +0000 (15:23 -0700)]
Merge "stagefright: Include stdlib.h for malloc/free"
Deckard Autoverifier [Mon, 18 Jul 2011 22:23:31 +0000 (15:23 -0700)]
Merge "stagefright amrwbenc: Remove a duplicate, unused file"
Deckard Autoverifier [Mon, 18 Jul 2011 22:23:20 +0000 (15:23 -0700)]
Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
Deckard Autoverifier [Mon, 18 Jul 2011 22:23:09 +0000 (15:23 -0700)]
Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
Conley Owens [Mon, 18 Jul 2011 19:47:50 +0000 (12:47 -0700)]
am
45ddd425: am
3edba93f: am
98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '
45ddd42544167494cee7213ecddcb6f8057c86c0':
stagefright aacenc/amrwbenc: Remove trailing whitespace
Conley Owens [Mon, 18 Jul 2011 19:44:57 +0000 (12:44 -0700)]
am
3edba93f: am
98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '
3edba93fd9bff8e2b22486271e6e816e3b233ae9':
stagefright aacenc/amrwbenc: Remove trailing whitespace
Conley Owens [Mon, 18 Jul 2011 19:42:42 +0000 (12:42 -0700)]
am
98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '
98fcc4041d35831c7a65a6e2f0e61021e0fb37e2':
stagefright aacenc/amrwbenc: Remove trailing whitespace
Conley Owens [Mon, 18 Jul 2011 19:37:16 +0000 (12:37 -0700)]
Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
Wink Saville [Mon, 18 Jul 2011 18:32:55 +0000 (11:32 -0700)]
Add LteOnCdmaDevice system property.
Provide a system property which may be
optionally set at build time.
Change-Id: I253ff0df7c8f8c5627c775fb0cff2cb831157eed
Nick Pelly [Fri, 15 Jul 2011 17:47:10 +0000 (10:47 -0700)]
am
1bce9e25: am
01588aca: Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread
* commit '
1bce9e25b6979780d849096059ef73507bdda250':
Preserve invariant that sService is not null (although NfcAdapter.get() can return null)
Robert Greenwalt [Fri, 15 Jul 2011 17:20:48 +0000 (10:20 -0700)]
Robert Greenwalt [Fri, 15 Jul 2011 16:55:48 +0000 (09:55 -0700)]
resolved conflicts for merge of
0a46db5d to honeycomb-plus-aosp
Change-Id: I0f1bea54d999ab3ef10400ee67bd4d3b2a5d1783
Robert Greenwalt [Fri, 15 Jul 2011 16:45:08 +0000 (09:45 -0700)]
Small fix to
5008973 fix.
Removed redundent log.
Cleaned some logic.
Will try to modify route even if recursive operation had an error.
bug:
5008973
Change-Id: Ie2ca51cc39cfac027a8a2e2eaddcb7d6c378c4da
Robert Greenwalt [Thu, 14 Jul 2011 21:28:05 +0000 (14:28 -0700)]
Apply the dns and route diff which we get a change
bug:
5008973
Change-Id: Ib99e43d9d852452cc1f2aea6bef07bbd194f28cc
John Wang [Thu, 14 Jul 2011 21:00:58 +0000 (14:00 -0700)]
am
54b2a326: Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE
* commit '
54b2a3262738cdb3d0df747d8719e9a3cac33dfc':
Show SIM blocked after 10 time puk wrong entries.
John Wang [Thu, 14 Jul 2011 20:59:10 +0000 (13:59 -0700)]
Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE
John Wang [Fri, 8 Jul 2011 19:31:08 +0000 (12:31 -0700)]
Show SIM blocked after 10 time puk wrong entries.
After user enters 10 time wrong puk in puk unlock screen,
device need show the SIM permanently disabled message
is in lock screen.
bug:
4905509
Change-Id: I06242834972b3f403cfe99a2edd8bae47d7ed474
Nick Pelly [Thu, 14 Jul 2011 05:38:44 +0000 (22:38 -0700)]
am
01588aca: Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread
* commit '
01588acaf87cfe9916239b7b26cc6810e0097138':
Preserve invariant that sService is not null (although NfcAdapter.get() can return null)
Wink Saville [Wed, 13 Jul 2011 21:19:12 +0000 (14:19 -0700)]
am
6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE
* commit '
6d1d16c324a681dd966d47497a71a02eac512234':
Remove STOPSHIP but allow seamless Handoff when possible.
Wink Saville [Wed, 13 Jul 2011 21:15:19 +0000 (14:15 -0700)]
Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE
Wink Saville [Wed, 13 Jul 2011 20:44:13 +0000 (13:44 -0700)]
Remove STOPSHIP but allow seamless Handoff when possible.
If an address is removed we must reset the connection but
only for the connections associated with that address. For
now we're doing the "all" addresses for a type (IPv6 or IPv4)
in the future we only need to reset a particular addresses
connections.
Bug:
4981919
Change-Id: I97f8071a3ed6f827ed22f32216ca5011bfe6c1d9
Jaikumar Ganesh [Wed, 13 Jul 2011 19:29:57 +0000 (12:29 -0700)]
resolved conflicts for merge of
ab3ec176 to honeycomb-plus-aosp
Change-Id: I75fcd15f85f2cb3912ada1df453fb02bd13e5d85
Jaikumar Ganesh [Wed, 13 Jul 2011 17:25:27 +0000 (10:25 -0700)]
am
9ff89495: am
53cf7858: Merge "Bluetooth: correcting return value from cancelDiscovery"
* commit '
9ff89495a4890191a0bc5dfddf28f23f79f23698':
Bluetooth: correcting return value from cancelDiscovery
Jaikumar Ganesh [Wed, 13 Jul 2011 17:22:40 +0000 (10:22 -0700)]
am
53cf7858: Merge "Bluetooth: correcting return value from cancelDiscovery"
* commit '
53cf7858c3fd36082302efdc4d848925bcc0001e':
Bluetooth: correcting return value from cancelDiscovery
John Wang [Wed, 13 Jul 2011 17:21:38 +0000 (10:21 -0700)]
am
2ac78a2d: Merge "Add getImei() to Phone interface." into honeycomb-LTE
* commit '
2ac78a2da52b29f6ac72294072d7ca87d991dab1':
Add getImei() to Phone interface.
John Wang [Wed, 13 Jul 2011 17:17:22 +0000 (10:17 -0700)]
Merge "Add getImei() to Phone interface." into honeycomb-LTE
Jaikumar Ganesh [Wed, 13 Jul 2011 17:04:19 +0000 (10:04 -0700)]
Merge "Bluetooth: correcting return value from cancelDiscovery"
John Wang [Mon, 11 Jul 2011 23:50:10 +0000 (16:50 -0700)]
Add getImei() to Phone interface.
Need IMEI to be displayed in LTE Settings. Since getDeviceId() returns MEID for LTE device,
getImei() is added to return IMEI for all devices. getImei returns null if not set (as SipPhone).
bug:
4983512
Change-Id: Idfe2ec8de514f330248db7a9de7e241f9a38cb96
David 'Digit' Turner [Mon, 11 Jul 2011 23:15:27 +0000 (16:15 -0700)]
am
db4c5f35: resolved conflicts for merge of
7816eded to gingerbread-plus-aosp
* commit '
db4c5f352d6eb8e248953ccff1dbecb1270af4c5':
NativeDaemonConnector: Fix SDCard mounting bug in the emulator.
Fix missing NL
Scott Main [Mon, 11 Jul 2011 23:08:27 +0000 (16:08 -0700)]
am
bc047bb0: am
e32c49ab: docs: de-new sidenavs
* commit '
bc047bb03e6084ded47ffd5d810045ca973d54e5':
docs: de-new sidenavs
Scott Main [Mon, 11 Jul 2011 23:06:25 +0000 (16:06 -0700)]
am
e32c49ab: docs: de-new sidenavs
* commit '
e32c49ab2c5d6b347b39635a0202d7dbdc1f0769':
docs: de-new sidenavs
Robert Ly [Mon, 11 Jul 2011 23:05:40 +0000 (16:05 -0700)]
am
1e4cf2dd: am
10a36020: cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
* commit '
1e4cf2dddbac4d357731ffaf02c4402426aa3763':
cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
Robert Ly [Mon, 11 Jul 2011 23:03:30 +0000 (16:03 -0700)]
am
10a36020: cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
* commit '
10a36020e3d37ef088f5f7ed6d64ba35847fc069':
cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
Scott Main [Mon, 11 Jul 2011 22:36:21 +0000 (15:36 -0700)]
docs: de-new sidenavs
Change-Id: I2aaafe763e4b006059222677e563963d3284d314
Robert Ly [Thu, 23 Jun 2011 18:47:37 +0000 (11:47 -0700)]
cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
Change-Id: I4cb22b628978c86b5c07ff80b2fe8547e25015a1
David 'Digit' Turner [Mon, 11 Jul 2011 22:57:09 +0000 (00:57 +0200)]
resolved conflicts for merge of
7816eded to gingerbread-plus-aosp
Change-Id: I1f7d1f488f6a86774962d427aca472a8a444e0aa
Scott Main [Mon, 11 Jul 2011 22:53:09 +0000 (15:53 -0700)]
am
56a085c9: am
d3fa7bd1: docs: fix date on opengl dashboard
* commit '
56a085c98801d9c4b08cbf398d8225b6761816ac':
docs: fix date on opengl dashboard
Scott Main [Mon, 11 Jul 2011 22:50:16 +0000 (15:50 -0700)]
am
d3fa7bd1: docs: fix date on opengl dashboard
* commit '
d3fa7bd1e873d885f00b11bb8123284357ccd362':
docs: fix date on opengl dashboard
Scott Main [Mon, 11 Jul 2011 22:47:41 +0000 (15:47 -0700)]
docs: fix date on opengl dashboard
Change-Id: I0d4443664fb61466de441c1be702a351fbf28ac1
Xavier Ducrohet [Mon, 11 Jul 2011 19:46:07 +0000 (12:46 -0700)]
Xavier Ducrohet [Mon, 11 Jul 2011 19:43:15 +0000 (12:43 -0700)]
Xavier Ducrohet [Fri, 8 Jul 2011 18:55:00 +0000 (11:55 -0700)]
Merge
36a3a392 from mr1.
Protect against OOB index in BridgeTypedArray.
Change-Id: I40be1e039f9eb36c182b6522bd50d6ed98e15b5c
Nick Pelly [Mon, 11 Jul 2011 18:07:22 +0000 (11:07 -0700)]
Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread
Chia-chi Yeh [Mon, 11 Jul 2011 17:29:32 +0000 (10:29 -0700)]
am
4821d3bd: Merge "VpnService: stop VPN when unknown DNS servers show up." into honeycomb-LTE
* commit '
4821d3bdf8ce35408c6a10fe45c39a5e701ea8e2':
VpnService: stop VPN when unknown DNS servers show up.
Chia-chi Yeh [Mon, 11 Jul 2011 17:25:28 +0000 (10:25 -0700)]
Merge "VpnService: stop VPN when unknown DNS servers show up." into honeycomb-LTE
Wink Saville [Mon, 11 Jul 2011 02:35:14 +0000 (19:35 -0700)]
am
12b91edc: Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE
* commit '
12b91edc81763b69090bf5815bc8d59ab8d8f342':
Add a property so that CSIM provision check can be bypassed
Wink Saville [Mon, 11 Jul 2011 02:33:54 +0000 (19:33 -0700)]
Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE
Kazuhiro Ondo [Sat, 9 Jul 2011 21:01:10 +0000 (16:01 -0500)]
Add a property so that CSIM provision check can be bypassed
To support test environment where a call box is used with
non-provisioned SIM.
Bug:
5010622
Change-Id: I0dd2d3c2d199f600e5979c865f97b41e2fbb706d
Kazuhiro Ondo [Mon, 11 Jul 2011 00:21:52 +0000 (17:21 -0700)]
am
89799e72: Fix incorrect ERI banner format
* commit '
89799e72eee54935ec5830f89dfd0a7d32983917':
Fix incorrect ERI banner format
Kazuhiro Ondo [Sat, 9 Jul 2011 18:20:37 +0000 (13:20 -0500)]
Fix incorrect ERI banner format
Fix conflicting display issue with ERI and CSIM SPN test.
Do not display them together but only override ERI text with CSIM
SPN in home area.
Bug:
5008969
Change-Id: I88383acd1c7f4c5bfb1f66349ff2f37b2edbbc9c
Kazuhiro Ondo [Sun, 10 Jul 2011 23:16:54 +0000 (16:16 -0700)]
am
64ba5eaa: Concurrent multi-PDP support in TrafficStats
* commit '
64ba5eaa40614877c679b3fbaaa3c2efd17d50d2':
Concurrent multi-PDP support in TrafficStats
Kazuhiro Ondo [Tue, 5 Jul 2011 21:12:10 +0000 (16:12 -0500)]
Concurrent multi-PDP support in TrafficStats
Quick fix to enable concurrent multiple PDP support in TrafficStats.
Just updated the list of hard-coded mobile interfaces for now.
Bug:
4553527
Change-Id: I44ce73f3000542d6457f353bb561a2275684af6b
Robert Tsai [Sun, 10 Jul 2011 06:57:22 +0000 (23:57 -0700)]
Preserve invariant that sService is not null (although NfcAdapter.get() can return null)
Change-Id: I85fcbc5e79549835dac255ce614bd5d65d39fc25
Chia-chi Yeh [Sat, 9 Jul 2011 00:59:54 +0000 (17:59 -0700)]
VpnService: stop VPN when unknown DNS servers show up.
Bug:
5002601
Change-Id: I5459db009e7391ff874623cb1830065ac75c80ed
Robert Ly [Fri, 8 Jul 2011 17:44:10 +0000 (10:44 -0700)]
am
6b98e712: am
3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2
* commit '
6b98e7128b3fbfd8b2c421286c403e4609c69708':
cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052
Joe Malin [Fri, 8 Jul 2011 17:41:54 +0000 (10:41 -0700)]
am
230ef987: am
0e89d916: Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2
* commit '
230ef98728f3b59a81f55dab5129aa50d5f27969':
DOC CHANGE: Change GTV info on intro page
Joe Fernandez [Fri, 8 Jul 2011 17:41:35 +0000 (10:41 -0700)]
am
20f65201: am
0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2
* commit '
20f6520197a6b70123d2ff7c466ee58349ae3032':
cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c
Robert Ly [Fri, 8 Jul 2011 17:39:46 +0000 (10:39 -0700)]
am
3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2
* commit '
3f3b8cbfa775f2ebff985c069300f8daaeb7a84c':
cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052
Robert Ly [Fri, 8 Jul 2011 17:13:28 +0000 (10:13 -0700)]
Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2
Wink Saville [Fri, 8 Jul 2011 16:40:11 +0000 (09:40 -0700)]
am
7283bb93: Merge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE
* commit '
7283bb9323c83621a818c387bb80fe1bc9d6aa7c':
Disconnect ApnContexts in INITING state when error.
Wink Saville [Fri, 8 Jul 2011 16:40:08 +0000 (09:40 -0700)]
am
8171e6f6: Use resetConnections with resetMask.
* commit '
8171e6f690cca1bad354e7e352823d79d420daf3':
Use resetConnections with resetMask.
Wink Saville [Fri, 8 Jul 2011 16:40:03 +0000 (09:40 -0700)]
am
848aa3ab: Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE
* commit '
848aa3ab8a00835c5af2ead954c7736e507249b5':
No need to have BASE_DATA_CONNECTION_TRACKER start at 50000.
Joe Malin [Fri, 8 Jul 2011 16:39:25 +0000 (09:39 -0700)]
am
0e89d916: Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2
* commit '
0e89d916f078a518093c476725fa7e0798dcc590':
DOC CHANGE: Change GTV info on intro page
Joe Fernandez [Fri, 8 Jul 2011 16:39:22 +0000 (09:39 -0700)]
am
0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2
* commit '
0fbe1dfb8df94a51d79e9a42fcbaebed6f6e516e':
cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c
David 'Digit' Turner [Fri, 8 Jul 2011 16:19:01 +0000 (18:19 +0200)]
merge intel x86 patches into gingerbread branch
Wink Saville [Fri, 8 Jul 2011 05:00:56 +0000 (22:00 -0700)]
Merge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE
Joe Malin [Fri, 8 Jul 2011 01:19:18 +0000 (18:19 -0700)]
Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2
Ramesh Sudini [Wed, 29 Jun 2011 16:43:27 +0000 (11:43 -0500)]
Disconnect ApnContexts in INITING state when error.
When DCT tears down a link due to error, the ApnContexts which are in INITING state are
not torndown. Due to this the DC refCount does not hit 0, and the Data Link is not torndown.
Bug:
4973894
Change-Id: If1263f360d55f6874220235fede294909db4837e
Wink Saville [Thu, 7 Jul 2011 23:17:06 +0000 (16:17 -0700)]
Use resetConnections with resetMask.
Bug:
4981919
Change-Id: I5dec2da0756d5083bc81494fd583672704537694
Joe Fernandez [Thu, 7 Jul 2011 22:03:55 +0000 (15:03 -0700)]
Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2
Wink Saville [Thu, 7 Jul 2011 21:39:23 +0000 (14:39 -0700)]
Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE
Wink Saville [Thu, 7 Jul 2011 21:16:30 +0000 (14:16 -0700)]
No need to have BASE_DATA_CONNECTION_TRACKER start at 50000.
Update comment that values should be changed after releasing.
Change-Id: I10ed6a0238e4f5be866dd97cfb56c5e7c84ddb52
Scott Main [Thu, 7 Jul 2011 17:17:00 +0000 (10:17 -0700)]
am
e4e1c3fd: am
40afb97c: cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
* commit '
e4e1c3fda937d30c9aa75a43c470de6c54a97073':
cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
Scott Main [Thu, 7 Jul 2011 17:14:38 +0000 (10:14 -0700)]
am
0657e1a7: am
77dfe217: cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
* commit '
0657e1a7e7d25fee700930252f6b85c3d70bc368':
cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
Scott Main [Thu, 7 Jul 2011 17:13:44 +0000 (10:13 -0700)]
am
40afb97c: cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
* commit '
40afb97c3289cd3daae9a31f4829d660ba747d37':
cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
Scott Main [Thu, 7 Jul 2011 17:10:29 +0000 (10:10 -0700)]
am
77dfe217: cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
* commit '
77dfe2173e2970a6a662b7d9537715c81886185e':
cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
Scott Main [Thu, 19 May 2011 01:47:40 +0000 (18:47 -0700)]
cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896
docs: add button builder for android market apps
Change-Id: I0d9da685f850f92737c2d9d3eb758b41dbec0a39
Scott Main [Thu, 7 Jul 2011 16:49:44 +0000 (09:49 -0700)]
cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb
docs: update dashboards
Change-Id: Ib37f2b8a3bf8c9c7ae09ea2edbeeb707899abf58
Wink Saville [Thu, 7 Jul 2011 02:05:40 +0000 (19:05 -0700)]
am
48b6d5af: Merge "Reset FAILED ApnContext state to IDLE on data setup triggers" into honeycomb-LTE
* commit '
48b6d5afae76bec08c5e1194758e6db3e0f8b07c':
Reset FAILED ApnContext state to IDLE on data setup triggers
Wink Saville [Thu, 7 Jul 2011 02:04:30 +0000 (19:04 -0700)]
Merge "Reset FAILED ApnContext state to IDLE on data setup triggers" into honeycomb-LTE
David 'Digit' Turner [Thu, 16 Jun 2011 15:40:23 +0000 (17:40 +0200)]
NativeDaemonConnector: Fix SDCard mounting bug in the emulator.
This patch fixes a really annoying bug that prevented the emulator
from properly mounting the SD Card.
The issue was that mOutputStream was not initialized when the onDaemonConnected
callbacks are called, just after the daemon's socket connection is established.
In one specific case (MountService a.k.a. VoldConnector), the corresponding
callback function immediately tried to perform a doCommandList() call on the
connector object. The request failed because mOutputStream was still defined
as null when it happened.
By moving the initialization of the variable just before the callback is
invoked, we ensure that things work properly.
Change-Id: I46726a50ef69eaafe70081ff4eda1244b744beba
Bruce Beare [Fri, 25 Jun 2010 16:08:12 +0000 (09:08 -0700)]
Fix missing NL
Orig-Change-Id: I323f0c01d2e9ad4c9f07cad24bf6b63edc28ad62
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
Kazuhiro Ondo [Sat, 2 Jul 2011 18:34:13 +0000 (13:34 -0500)]
Reset FAILED ApnContext state to IDLE on data setup triggers
Make sure FAILED ApnContext state is reset to IDLE regarless of
existence of the reconnect alarm. This is to let FW re-evaluate
call setup conditions properly on data setup triggers.
Bug:
4989604
Change-Id: Ia9ec439db1df03bbd2e56803d3558542ba5f5400
OSDN Git Service
