Jean-Baptiste Queru
84199cac5d
am 5fcfce96: am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."
...
* commit '5fcfce965f1380ee7e151c1df75b247dd42b349e':
Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
2011-04-26 01:20:37 -07:00
Scott Main
b1002d9ec5
am e20c91de: am e1e3d7d9: am 97fee855: docs: update a couple usb driver URLs bug: 4339758
...
* commit 'e20c91de9ccb4a8cb76a8e72884f2e9ca001a2de':
docs: update a couple usb driver URLs bug: 4339758
2011-04-26 01:18:21 -07:00
Eric Laurent
4e19d9ee2d
am 969357e3: am 223995dc: Fix issue 4335692: HDMI media volume
...
* commit '969357e31c93e168e7a4cb3b41c33a6ec26f4a26':
Fix issue 4335692: HDMI media volume
2011-04-26 01:14:07 -07:00
Scott Main
f350c5e7c7
am e1e3d7d9: am 97fee855: docs: update a couple usb driver URLs bug: 4339758
...
* commit 'e1e3d7d97caf89307230e85997f5d23074b216cb':
docs: update a couple usb driver URLs bug: 4339758
2011-04-26 01:12:14 -07:00
Irfan Sheriff
6e218d3f06
am d2127c43: Handle DHCP renewal and wakeup in framework
...
* commit 'd2127c438fc858a4f6c8ad75b7a1e4491da69a78':
Handle DHCP renewal and wakeup in framework
2011-04-26 01:01:31 -07:00
Scott Main
bba61e6644
am 97fee855: docs: update a couple usb driver URLs bug: 4339758
...
* commit '97fee8554d40a8c093ef16934284d9292e4cf7a4':
docs: update a couple usb driver URLs bug: 4339758
2011-04-26 00:45:35 -07:00
Jean-Baptiste Queru
a89e25181f
am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."
...
* commit '4b72eec34c983abb7a3afcbadd74d3bd807c4765':
Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
2011-04-26 00:39:44 -07:00
Robert Greenwalt
64e6e9ef73
am ef568c97: Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE
...
* commit 'ef568c97b5962249cbab7995f76435492a10ba68':
Make new networkAttribute parameter non-optional.
2011-04-26 00:23:03 -07:00
Ramesh Sudini
588823c28a
am dcbba67a: Telephony: Fix merge issue "Set enabled state before notification is sent out."
...
* commit 'dcbba67afc08d0ac9af53e95d5997af11f869853':
Telephony: Fix merge issue "Set enabled state before notification is sent out."
2011-04-26 00:21:37 -07:00
Eric Laurent
eaead44d23
am 223995dc: Fix issue 4335692: HDMI media volume
...
* commit '223995dcf28aca2399258951a59559a7ae318ceb':
Fix issue 4335692: HDMI media volume
2011-04-26 00:19:34 -07:00
Robert Greenwalt
b7f462b9f7
Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE
2011-04-25 16:19:30 -07:00
Jean-Baptiste Queru
26603203b6
Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."
2011-04-25 13:33:37 -07:00
Joe Fernandez
7b339d2592
am 41f665a5: am c84362a7: am a29e2cca: docs: Fixing Issue with code for Adding Tabs topic bug 4293013
...
* commit '41f665a5f9d4e73ba8dabceb721c9c8873591bac':
docs: Fixing Issue with code for Adding Tabs topic bug 4293013
2011-04-22 16:48:44 -07:00
Freeman Ng
62bc73e09e
am 3b9089c1: new LTE prepay related values
...
* commit '3b9089c1fa6970974fa5234dfea46455811c8c7a':
new LTE prepay related values
2011-04-22 16:46:52 -07:00
Joe Fernandez
7d6a9fb6e2
am c84362a7: am a29e2cca: docs: Fixing Issue with code for Adding Tabs topic bug 4293013
...
* commit 'c84362a72ab958c4ffe34c16d8cf76883d48f0e8':
docs: Fixing Issue with code for Adding Tabs topic bug 4293013
2011-04-22 16:46:37 -07:00
Joe Fernandez
0582a8bc1f
am a29e2cca: docs: Fixing Issue with code for Adding Tabs topic bug 4293013
...
* commit 'a29e2cca5d0e3ff222c09165fd69ca8f4d0f634e':
docs: Fixing Issue with code for Adding Tabs topic bug 4293013
2011-04-22 16:36:33 -07:00
Josh Stone
e6b21626a5
libutils: Fix an improper const-cast in RefBase
...
Under Fedora 15 Beta, gcc 4.6.0 warns:
frameworks/base/libs/utils/RefBase.cpp: In member function
‘void android::RefBase::weakref_type::trackMe(bool, bool)’:
frameworks/base/libs/utils/RefBase.cpp:483:67: error: passing
‘const android::RefBase::weakref_impl’ as ‘this’ argument of
‘void android::RefBase::weakref_impl::trackMe(bool, bool)’
discards qualifiers [-fpermissive]
trackMe is not a const function, so don't use const in the static_cast
to a weakref_impl pointer.
Change-Id: I3c9ba73eb127985f5f54197ffecf2939c50f632c
2011-04-22 11:13:35 -07:00
Scott Main
b2b2227c12
am a2c180a0: am caf60ebd: am 48c187f9: docs: fix typo in 3.0 notes
...
* commit 'a2c180a0dde842d76d75c8b22ee7db29b482757e':
docs: fix typo in 3.0 notes
2011-04-21 17:42:25 -07:00
Scott Main
caeae23123
am caf60ebd: am 48c187f9: docs: fix typo in 3.0 notes
...
* commit 'caf60ebdbdf9769624f17395aabac4cf11ee130d':
docs: fix typo in 3.0 notes
2011-04-21 17:39:30 -07:00
Scott Main
b724172599
am 48c187f9: docs: fix typo in 3.0 notes
...
* commit '48c187f9cf2bcb51f446a5a62346f9ef5920c7f3':
docs: fix typo in 3.0 notes
2011-04-21 17:36:40 -07:00
Scott Main
399d42a4f7
am 69ccfd7a: am ca7f30eb: am b8a57841: Merge "docs: add a little info to Configuration class description" into honeycomb
...
* commit '69ccfd7a29fc492c25dcb96dc74daf2e900118f5':
docs: add a little info to Configuration class description
2011-04-21 10:57:10 -07:00
Scott Main
20a32c0efb
am ca7f30eb: am b8a57841: Merge "docs: add a little info to Configuration class description" into honeycomb
...
* commit 'ca7f30ebb20dcf4c056f57a8c4ab3342cafaed83':
docs: add a little info to Configuration class description
2011-04-21 10:55:20 -07:00
Scott Main
952c6b5c72
am b8a57841: Merge "docs: add a little info to Configuration class description" into honeycomb
...
* commit 'b8a57841316171d6db4311a65914720213516153':
docs: add a little info to Configuration class description
2011-04-21 10:53:08 -07:00
Scott Main
9dbdb7c560
Merge "docs: add a little info to Configuration class description" into honeycomb
2011-04-21 10:51:14 -07:00
Scott Main
200cbc192a
am fdf854cc: am 1ccfd8ed: am d155e1a2: docs: change ZTE usb driver link
...
* commit 'fdf854cce521438bef666148453ff5f97e6f38e3':
docs: change ZTE usb driver link
2011-04-21 10:26:50 -07:00
Scott Main
aabbe3b133
am 1ccfd8ed: am d155e1a2: docs: change ZTE usb driver link
...
* commit '1ccfd8ed7db0d6a8e9ac268baed060f0518cb4e5':
docs: change ZTE usb driver link
2011-04-21 10:18:13 -07:00
Scott Main
d150f53ae6
am d155e1a2: docs: change ZTE usb driver link
...
* commit 'd155e1a2d8768e383824c565a5b4f5a7546960ea':
docs: change ZTE usb driver link
2011-04-21 10:08:20 -07:00
Wink Saville
dfce7aa9e4
am afa79585: Remove getCurrentDataConnectionList.
...
* commit 'afa79585e0e517d9fdfe6065bc5084cab9bb2300':
Remove getCurrentDataConnectionList.
2011-04-20 11:33:11 -07:00
Jaikumar Ganesh
d652cd8715
am 24a16e6c: am c34c88b9: am ec1a8f7a: Merge "Unable to push files to Windows 7"
...
* commit '24a16e6c53d9b45c0cfdf150425002adc919955b':
Unable to push files to Windows 7
2011-04-19 16:01:36 -07:00
Jaikumar Ganesh
1aaeddba56
am c34c88b9: am ec1a8f7a: Merge "Unable to push files to Windows 7"
...
* commit 'c34c88b948cb60c057bd2145df9f1b2091f3c894':
Unable to push files to Windows 7
2011-04-19 15:57:24 -07:00
Jaikumar Ganesh
d13def39d3
am ec1a8f7a: Merge "Unable to push files to Windows 7"
...
* commit 'ec1a8f7aa7e71e292ef813b1e886a9e26e3635af':
Unable to push files to Windows 7
2011-04-19 15:28:26 -07:00
Jaikumar Ganesh
7b55adc715
Merge "Unable to push files to Windows 7"
2011-04-19 14:48:08 -07:00
Andreas Huber
ba40efeb40
am 5ce9eb9a: (-s ours) am f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
...
* commit '5ce9eb9a34ffac3ff5aea0db81a902a380105d5b':
DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
2011-04-18 15:45:21 -07:00
Andreas Huber
e0f13c86b1
am f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
...
* commit 'f0f1ceeb517ff226532a407da6d55602f195e5b5':
DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
2011-04-18 15:39:09 -07:00
Wink Saville
e981b65330
am 64c42cae: Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.
...
* commit '64c42cae4482fe0157e977b8ddd0f2c2436b3f31':
Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.
2011-04-18 15:24:47 -07:00
Wink Saville
a05ad30fd7
am 6f200f73: Merge "Data connection attempts/retries for multiple APNs" into honeycomb-LTE
...
* commit '6f200f738ed0bbdef5c433b5f571fcb591e1760c':
Data connection attempts/retries for multiple APNs
2011-04-18 13:36:32 -07:00
Wink Saville
cabddf9c27
Merge "Data connection attempts/retries for multiple APNs" into honeycomb-LTE
2011-04-18 13:28:49 -07:00
Scott Main
72eeea895b
am 74c890a5: am 1f07f125: am 6669f251: docs: fix snippet errors in web doc
...
* commit '74c890a57a819a0245573987455088c111e2c4eb':
docs: fix snippet errors in web doc
2011-04-18 03:18:06 -07:00
Scott Main
624ef518ee
am 1f07f125: am 6669f251: docs: fix snippet errors in web doc
...
* commit '1f07f1257b62f2ac71696bb430f9328597c3de27':
docs: fix snippet errors in web doc
2011-04-18 03:08:32 -07:00
Wink Saville
bdd81b7335
am a9378485: Merge "Telephony: GDCT - Set enabled state before notification is sent out." into honeycomb-LTE
...
* commit 'a9378485cb8d0968a9a177f730875e0f1d49d689':
Telephony: GDCT - Set enabled state before notification is sent out.
2011-04-16 14:49:07 -07:00
Wink Saville
ced5bec63b
am df43e321: Merge "Telephony: Set Radio turned off reason when powered off." into honeycomb-LTE
...
* commit 'df43e321778a02f9eaeb8faacf4ae7917c434106':
Telephony: Set Radio turned off reason when powered off.
2011-04-16 14:47:17 -07:00
Wink Saville
2bc80c4a92
am dc26a0c8: Merge "Clean up calls immediately if cid become inactive in unsol data state changed" into honeycomb-LTE
...
* commit 'dc26a0c8d4ce4edcddcfc6b8e810ae5f8e73cda4':
Clean up calls immediately if cid become inactive in unsol data state changed
2011-04-16 14:47:15 -07:00
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
66b997b7bc
am 585b7acb: Merge "handle missing constants when creating a Phone instance" into honeycomb-LTE
...
* commit '585b7acb16183ae31e71912dc2bfceea421be157':
handle missing constants when creating a Phone instance
2011-04-16 14:45:28 -07:00
Ramesh Sudini
f9a499b7eb
am a5c9c724: Data Availability Indication changes.
...
* commit 'a5c9c7246b065710227395ec4a7c1df0168363ef':
Data Availability Indication changes.
2011-04-16 14:45:19 -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
Scott Main
0f03c71f66
am 6669f251: docs: fix snippet errors in web doc
...
* commit '6669f251391d7e61a6ea55e2538c941f82514dd9':
docs: fix snippet errors in web doc
2011-04-15 18:03:14 -07:00
Wink Saville
2111ecf2f2
am 6ed4798c: Merge "Cleanup/add log statements." into honeycomb-LTE
...
* commit '6ed4798c70bf4ba253a8cdd37bf48008af81da7d':
Cleanup/add log statements.
2011-04-15 15:46:27 -07:00