Derek Sollenberger
d39d1affe8
Updates resulting from the Skia merge (revision 1327)
...
Change-Id: I2a8f5869dbe95bb594f2ba5d7278f9b330e6f17a
2011-05-16 15:30:40 -04:00
Wink Saville
7b06e3516c
am 7a2a87d6: am a1c29d30: Merge "Support for Vendor RIL dump of baseband logs" into honeycomb-LTE
...
* commit '7a2a87d6457885c5d3d4dbf335be101aa9c5c3ab':
Support for Vendor RIL dump of baseband logs
2011-05-15 14:47:45 -07:00
Wink Saville
32ebca5ba2
am 58779700: am 92cc1d20: Merge "Telephony: Handle Icc Status Changed Event." into honeycomb-LTE
...
* commit '58779700df18d52edf1102c6fcb3731f28d37a94':
Telephony: Handle Icc Status Changed Event.
2011-05-15 14:47:42 -07:00
Wink Saville
7a2a87d645
am a1c29d30: Merge "Support for Vendor RIL dump of baseband logs" into honeycomb-LTE
...
* commit 'a1c29d30f342c2d3dbf7022f1b130934c2519b81':
Support for Vendor RIL dump of baseband logs
2011-05-15 14:43:52 -07:00
Wink Saville
58779700df
am 92cc1d20: Merge "Telephony: Handle Icc Status Changed Event." into honeycomb-LTE
...
* commit '92cc1d20ae0e3dc7e0618027967145e26c1cb6e2':
Telephony: Handle Icc Status Changed Event.
2011-05-15 14:43:49 -07:00
Wink Saville
a1c29d30f3
Merge "Support for Vendor RIL dump of baseband logs" into honeycomb-LTE
2011-05-15 14:39:16 -07:00
Wink Saville
92cc1d20ae
Merge "Telephony: Handle Icc Status Changed Event." into honeycomb-LTE
2011-05-15 14:38:59 -07:00
Robert Greenwalt
859b72bb18
am a71a81b6: am 9713e3c6: Merge "Fix bevhavior of fetchDunApn." into honeycomb-LTE
...
* commit 'a71a81b69a6e5757ff29f083783a4b704b6a9ae9':
Fix bevhavior of fetchDunApn.
2011-05-15 08:14:17 -07:00
Robert Greenwalt
a71a81b69a
am 9713e3c6: Merge "Fix bevhavior of fetchDunApn." into honeycomb-LTE
...
* commit '9713e3c60def9d755ae828d389fced4793a3c86a':
Fix bevhavior of fetchDunApn.
2011-05-15 08:03:46 -07:00
Robert Greenwalt
9713e3c60d
Merge "Fix bevhavior of fetchDunApn." into honeycomb-LTE
2011-05-15 07:53:50 -07:00
John Michelau
71bbe7a87c
Support for Vendor RIL dump of baseband logs
...
Added hook for Vendor RIL to provide a dump of the underlying
baseband's logs. The Vendor RIL must implement the actual executable
that does the capture.
Change-Id: I40fdf2ccc4bb14a9cef92b7866fad19684502524
2011-05-14 18:54:47 -07:00
Ramesh Sudini
3ce5de7fe2
Telephony: Handle Icc Status Changed Event.
...
Change-Id: I8203d3b863ea9a27251823d3fed209673c45206c
2011-05-14 18:36:11 -07:00
Robert Greenwalt
2b5a3ec757
Fix bevhavior of fetchDunApn.
...
If nothing secure is set let us fall back to use general APN db entries.
Change-Id: Ic6908dd301c432c11a6f773e06dd6e207d45a037
2011-05-14 12:07:50 -07:00
Wink Saville
444889838c
am d0903e14: am 6e41b32d: Merge "TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING." into honeycomb-LTE
...
* commit 'd0903e1478c7ba2fb8087f1bae1fba69791039ba':
TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING.
2011-05-14 07:50:40 -07:00
Wink Saville
d0903e1478
am 6e41b32d: Merge "TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING." into honeycomb-LTE
...
* commit '6e41b32dd08a866cb7158b387646e96c9105831b':
TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING.
2011-05-14 07:43:00 -07:00
Wink Saville
6e41b32dd0
Merge "TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING." into honeycomb-LTE
2011-05-14 07:35:21 -07:00
Wink Saville
71f6cb1324
TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING.
...
The use of FLAG_RECEIVER_REPLACE_PENDING is an optimization to reduce
redundant messages. For some calls this is fine, such as
broadcastSignalStrengthChanged. For others it can cause problems, such
as broadcastDataConnectionStateChanged where the MobileDataStateTracker
will not be able to properly track the state if messages are dropped.
This changes removes the optimization from all methods in
TelephonyRegistry except broadcastSignalStrengthChanged.
bug: 4427303
Change-Id: Ia9c0dd0ce66b8b3dcda770f5ab2c63cf08f3ebfc
2011-05-14 06:51:21 -07:00
Scott Main
bbdc834a56
am ebb7d863: am 3cd61e2b: am 084d3490: am f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1
...
* commit 'ebb7d8630cc9a13563fe7fc36a6f00a8924085b8':
docs: update homepage I/O announcement
2011-05-13 20:37:02 -07:00
Scott Main
ebb7d8630c
am 3cd61e2b: am 084d3490: am f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1
...
* commit '3cd61e2bca2df05a9ad3679c7456b077f2d04f2b':
docs: update homepage I/O announcement
2011-05-13 20:34:11 -07:00
Scott Main
3cd61e2bca
am 084d3490: am f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1
...
* commit '084d3490a5283088426058d3c15532b176367926':
docs: update homepage I/O announcement
2011-05-13 20:32:32 -07:00
Scott Main
084d3490a5
am f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1
...
* commit 'f73dcad35d031afc8e4db767d9b8bc40f389e4fc':
docs: update homepage I/O announcement
2011-05-13 20:29:45 -07:00
Scott Main
f73dcad35d
Merge "docs: update homepage I/O announcement" into honeycomb-mr1
2011-05-13 20:26:56 -07:00
Jeff Sharkey
262c177b1b
Merge "Add Socket tagging for granular data accounting."
2011-05-13 18:51:36 -07:00
Dianne Hackborn
510f9eb242
am 24df0757: (-s ours) am ed9321ab: am f9dd34f4: DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
...
* commit '24df0757f86851569b65dadd0dfa139521748b9c':
DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
2011-05-13 18:43:14 -07:00
Dianne Hackborn
24df0757f8
am ed9321ab: am f9dd34f4: DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
...
* commit 'ed9321ab5d282e40e7c5fa9caf0eb9d05646f2d0':
DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
2011-05-13 18:41:04 -07:00
Dianne Hackborn
ed9321ab5d
am f9dd34f4: DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
...
* commit 'f9dd34f4d3203fd50363b3b0247c5d0db6fe2c8f':
DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
2011-05-13 18:39:01 -07:00
Dianne Hackborn
f9dd34f4d3
DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
...
And clean up some documentation.
Change-Id: I8f06e2fc3bb6c552581b64657e82ba690d524232
2011-05-13 18:31:04 -07:00
Jeff Sharkey
43be174888
Add Socket tagging for granular data accounting.
...
Introduces public API to apply "tags" to track data traffic originating
from the current thread. (Under the hood, the tags are maintained and
applied in BlockGuard.) Also adds tag/untag methods for developers who
maintain their own Socket pools.
Change-Id: Ic2dd3155559a93a7b613c7853748d4c44fb3a39e
2011-05-13 18:19:00 -07:00
Xavier Ducrohet
8c2f85d941
am d0054160: am 6d040a7f: am 738c5e60: am 2fae858d: LayoutLib: implement data binding for most AdapterView
...
* commit 'd00541603fbbb4e38264e75a2b6abf8705efeb49':
LayoutLib: implement data binding for most AdapterView
2011-05-13 16:43:37 -07:00
Xavier Ducrohet
d00541603f
am 6d040a7f: am 738c5e60: am 2fae858d: LayoutLib: implement data binding for most AdapterView
...
* commit '6d040a7f20de29a9667dd81bd4de40a9e56fd341':
LayoutLib: implement data binding for most AdapterView
2011-05-13 16:36:16 -07:00
Xavier Ducrohet
6d040a7f20
am 738c5e60: am 2fae858d: LayoutLib: implement data binding for most AdapterView
...
* commit '738c5e6072459c772064c96233cf59639bbfe2fd':
LayoutLib: implement data binding for most AdapterView
2011-05-13 16:32:47 -07:00
Dianne Hackborn
ba4990c77c
am 71da3207: am 7d87c37b: am 6121f06e: Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2
...
* commit '71da32074ce729fe170de2d6c348b110fb6625cc':
Fix a bug where an action bar could be created when it should not be.
2011-05-13 16:32:00 -07:00
James Dong
bfb6791934
Merge "Add support for platform-specific recording start time offset"
2011-05-13 16:31:10 -07:00
Xavier Ducrohet
738c5e6072
am 2fae858d: LayoutLib: implement data binding for most AdapterView
...
* commit '2fae858db55fc6984ef923a6226b9408c37c72cb':
LayoutLib: implement data binding for most AdapterView
2011-05-13 16:30:44 -07:00
James Dong
bf9f408b59
Merge "Support for storing geo information in the recorded mp4/3gpp file."
2011-05-13 16:30:16 -07:00
Dianne Hackborn
71da32074c
am 7d87c37b: am 6121f06e: Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2
...
* commit '7d87c37b031616259d1db6a78ecb1ff20ee5ff5c':
Fix a bug where an action bar could be created when it should not be.
2011-05-13 16:29:40 -07:00
James Dong
987ab4833e
Support for storing geo information in the recorded mp4/3gpp file.
...
o Geo data (latitude and longitude) is stored in udta box
Change-Id: I76e4aeb741c4b339f3753d3d28190151f3ea4919
related-to-bug: 4260295
2011-05-13 16:29:19 -07:00
Dianne Hackborn
7d87c37b03
am 6121f06e: Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2
...
* commit '6121f06ed5847d1edd22b23c3b28bf3b3e3af602':
Fix a bug where an action bar could be created when it should not be.
2011-05-13 16:26:44 -07:00
Dianne Hackborn
6121f06ed5
Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2
2011-05-13 16:24:32 -07:00
Eric Fischer
aa126171ae
Fix the build by removing @Override within javadoc comments.
...
Change-Id: I984cc6224185ab84e904bfc89eae80d567fcb59b
2011-05-13 16:08:24 -07:00
Xavier Ducrohet
2fae858db5
LayoutLib: implement data binding for most AdapterView
...
Change-Id: I27be96ed2c37573eb22cfbb391d96b6137b3df8c
2011-05-13 15:55:49 -07:00
Dianne Hackborn
e4c536049c
am 28a8bce6: (-s ours) am 6824c135: am f3f2d731: Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2
...
* commit '28a8bce691358dca3872e65d3604f3b0ff3fccaf':
DO NOT MERGE. Integrate fragment work from master
2011-05-13 15:48:02 -07:00
Dianne Hackborn
28a8bce691
am 6824c135: am f3f2d731: Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2
...
* commit '6824c135fe9639c74f38f125d678c20065c3347c':
DO NOT MERGE. Integrate fragment work from master
2011-05-13 15:45:23 -07:00
Christopher Tate
42d7c9c061
Merge "Full backup tweaks"
2011-05-13 15:41:32 -07:00
Christopher Tate
dc92c82b41
Full backup tweaks
...
* provide placeholder UI showing backup/restore start/stop/timeout
* don't kill the progress UI in mid stream
* tidy up the pax extended header data writing a little
Change-Id: Ife0cb78e3facb541d8327f1d5ca5fe77faa6cbca
2011-05-13 15:38:02 -07:00
Dianne Hackborn
6824c135fe
am f3f2d731: Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2
...
* commit 'f3f2d731e19bb47a87dc071a5750fc0f18248da2':
DO NOT MERGE. Integrate fragment work from master
2011-05-13 15:36:48 -07:00
Dianne Hackborn
f3f2d731e1
Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2
2011-05-13 15:33:21 -07:00
Jeff Brown
ae7bc6529a
am 0d9288d7: am 2bdb756c: am 4fb76253: Fix bounds check. Bug: 4413945
...
* commit '0d9288d7848e144fdf7afbd7284254dae3d13d43':
Fix bounds check. Bug: 4413945
2011-05-13 15:22:35 -07:00
Dianne Hackborn
dce3e2e120
am 2e4a3236: (-s ours) am 46a282f3: am 0ed2e845: Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2
...
* commit '2e4a3236a7634d17f89288e9739a438ecbea0471':
DO NOT MERGE. Integrate add new screen width/height in "dp" configs.
2011-05-13 15:22:30 -07:00
Scott Main
853cfd4f41
am 15f8a6a7: am 4c53fc7e: am 78b875e7: am edab852f: Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1
...
* commit '15f8a6a726658bfb195924bd5d7bb86684a22de0':
docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff
2011-05-13 15:22:27 -07:00