Mathias Agopian
32bebb0a58
Fix sp<> conversion operator / constructor
...
some of the conversion operators were not using the proper
pointer type when calling incStrong/decStrong, usually it
has no bad consequences, but for some implementation
of the ref-counted object it could lead to recording the wrong
owner id.
Change-Id: If574b9069b8a4cf6e0911a992c8f095aba799995
2011-02-25 16:20:52 -08:00
Dianne Hackborn
c614e553cc
Merge "Implement issue #3426299 : Introduce application "stopped" state"
2011-02-25 16:15:27 -08:00
Chet Haase
4de33f6d13
Merge "ViewPropertyAnimator cancels prior animations"
2011-02-25 16:02:34 -08:00
Andreas Huber
2b6fff5ed6
am cd6828e8: (-s ours) am 2332cd8c: Merge "DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues." into honeycomb
...
* commit 'cd6828e84220c6bdf92bbca12fcd88a8da76387c':
DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues.
2011-02-25 15:43:07 -08:00
Andreas Huber
4337714147
am 2332cd8c: Merge "DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues." into honeycomb
...
* commit '2332cd8c675628f3bdd6e46a8dd6da639bd7f76e':
DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues.
2011-02-25 15:38:06 -08:00
Andreas Huber
ebe5114be6
Merge "DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues." into honeycomb
2011-02-25 15:33:28 -08:00
Adam Cohen
26e9e35d14
Merge "Adding framework support for resizable widgets"
2011-02-25 15:28:29 -08:00
Robert Greenwalt
70817664ab
Merge "Fixing the write of BackgroundData setting."
2011-02-25 15:20:30 -08:00
Christopher Tate
9f5b53d4b0
Revert "Binder linkage no longer depends on JNI objrefs as persistent tokens"
...
This reverts commit c2d55dd89743c8a38deb809f3cdf1ad2d1dbac2b.
2011-02-25 15:18:53 -08:00
Winson Chung
ef71330158
Merge "Fixing build"
2011-02-25 15:17:17 -08:00
Alex Sakhartchouk
2a4d1256aa
Merge "Moving dependency includes out of librs headers."
2011-02-25 14:53:34 -08:00
Winson Chung
d51815e7d2
Merge "Fixing issue where RemoteViewsService.onDestroy() was never being called."
2011-02-25 14:30:37 -08:00
Xavier Ducrohet
b8ff70fe39
Merge "LayoutLib: fix incorrect indices in one of the 2 native_drawTextRun methods."
2011-02-25 14:28:20 -08:00
Jaikumar Ganesh
3d060d447a
Merge "Unset device trust state before unpairing."
2011-02-25 14:25:16 -08:00
Gilles Debunne
0e78830361
Merge "Code clean-up around ScrollView."
2011-02-25 13:48:19 -08:00
Gilles Debunne
0db9091a57
Merge "Removed ViewTreeObserver in TextView when handles are hidden"
2011-02-25 13:47:37 -08:00
David Li
1baaecc7c4
Merge "Fix mTexCoordsSlot > 0 check to mTexCoordsSlot >= 0"
2011-02-25 12:59:14 -08:00
Samyeoul Choi
8ba7319527
am 350799b7: am 6c5d9a06: am 09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' for Sprint
...
* commit '350799b72c3180e04ec91469509f6079c932b971':
Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
2011-02-25 12:55:35 -08:00
Samyeoul Choi
889dda2ec3
am 6c5d9a06: am 09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' for Sprint
...
* commit '6c5d9a0622ed33be8549f8d4dcdf597b0dc499cf':
Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
2011-02-25 12:51:51 -08:00
Svetoslav Ganov
d159f32212
am dc365a36: Merge "resolved conflicts for merge of 66edf2bb to honeycomb-plus-aosp" into honeycomb-plus-aosp
...
* commit 'dc365a36dac50bccc1411c37839513daec56d335':
Use different version of CLDR data in DatePicker
2011-02-25 12:45:53 -08:00
Svetoslav Ganov
005f783fa0
Merge "resolved conflicts for merge of 66edf2bb to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-02-25 12:40:57 -08:00
Svetoslav Ganov
7788d44a5e
resolved conflicts for merge of 66edf2bb to honeycomb-plus-aosp
...
Change-Id: I687ca9b7873890e3b30da16d5dde6b57ce92f0d6
2011-02-25 12:39:59 -08:00
Samyeoul Choi
2a4d60e301
am 09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' for Sprint
...
* commit '092238916fd5d10090c0bcad33644778a1f366e7':
Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
2011-02-25 12:08:08 -08:00
James Dong
be566cb570
Merge "mp4a box contains mp3 audio when the object type indication is 0x6b"
2011-02-25 11:52:14 -08:00
Eric Fischer
4aa1c420b7
Merge "Import revised translations."
2011-02-25 11:48:14 -08:00
Eric Fischer
70cf6e2faf
am 040f6150: (-s ours) am 9967ce04: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '040f61504aeab1d905ac9fb85945699877e78d4e':
Import revised translations. DO NOT MERGE
2011-02-25 11:26:13 -08:00
Eric Fischer
68ca4d3c97
am 9967ce04: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '9967ce04572e916a5f68ae0f9345f13b35ec20b0':
Import revised translations. DO NOT MERGE
2011-02-25 11:11:13 -08:00
Eric Fischer
d0a5556b00
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-02-25 10:54:34 -08:00
Shimeng (Simon) Wang
822029f742
Merge "Make sure pinch zoom and overview scale are within limits"
2011-02-25 10:37:33 -08:00
Vasu Nori
66bbadffa3
Merge "bug:3467948 if byteArray couldn't be allocated for blob, throw exception"
2011-02-25 08:57:59 -08:00
Leon Scroggins
4810e557ac
Merge "Comment clean up."
2011-02-25 08:21:23 -08:00
Wu-cheng Li
49ff84c4cc
Merge "Improve camera getSupportedPreviewFormats javadoc."
2011-02-25 01:36:56 -08:00
Svetoslav Ganov
c93b9968b2
am 9e5b1a49: Merge "Use different version of CLDR data in DatePicker" into gingerbread
...
* commit '9e5b1a49022d08aee8653fd34f3a8cd878618aa5':
Use different version of CLDR data in DatePicker
2011-02-25 00:09:03 -08:00
Svetoslav Ganov
c174c6696c
Merge "Use different version of CLDR data in DatePicker" into gingerbread
2011-02-24 23:56:52 -08:00
Wink Saville
aa7ce3a016
Merge "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
2011-02-24 22:08:41 -08:00
Jeff Hamilton
f016da1f3f
am 09979bcf: am fd34aa8e: am 5644d0e1: Support for NDEF on iCODE.
...
* commit '09979bcf730e7df033ab0d8cadf564873c7e624b':
Support for NDEF on iCODE.
2011-02-24 20:45:27 -08:00
Jeff Hamilton
2fcb04e75b
am fd34aa8e: am 5644d0e1: Support for NDEF on iCODE.
...
* commit 'fd34aa8e1386547bcfbaf043f26c054946b92c2b':
Support for NDEF on iCODE.
2011-02-24 20:43:15 -08:00
Robert Ly
c30c83ac81
am dbc796c5: am b7a8c1e7: Merge "Doc change: fixing errors in library proj docs" into honeycomb
...
* commit 'dbc796c5c045af6a5a7730a267c3c3a574e2bd3e':
Doc change: fixing errors in library proj docs
2011-02-24 20:35:06 -08:00
Robert Ly
49052f31ba
am 92a07c63: am 00e08463: Doc change: clarifying nfc tech filter usage
...
* commit '92a07c634d38221cbdb1253124efedc3da0dd487':
Doc change: clarifying nfc tech filter usage
2011-02-24 20:35:00 -08:00
Xavier Ducrohet
cfc429a8ca
am b84c678a: (-s ours) am db1acf52: (-s ours) am 1175ef7e: Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread
...
* commit 'b84c678a9c397d5b3c5141ddda304ceb71426c8d':
LayoutLib: Adapt the HC layoutlib to GB. do not merge.
2011-02-24 20:32:31 -08:00
Xavier Ducrohet
a602be6f8c
am b052ecaa: resolved conflicts for merge of 86e43034 to honeycomb-plus-aosp
...
* commit 'b052ecaa7e6ce40cec43efe5353b4bb12079aa55':
LayoutLib: Original import of Honeycomb's layoutlib. do not merge.
2011-02-24 20:32:13 -08:00
Jeff Hamilton
5f40f7c53f
am 5644d0e1: Support for NDEF on iCODE.
...
* commit '5644d0e18ad847b66a8cb4f185cb28edebe75d88':
Support for NDEF on iCODE.
2011-02-24 20:30:14 -08:00
Romain Guy
ccbe0e188b
Merge "Remove the right entries from the cache when a GC happens."
2011-02-24 19:50:26 -08:00
Jesse Wilson
e288797a81
Merge "Remove default constructors from static utility classes."
2011-02-24 19:37:00 -08:00
Chung-yih Wang
32bed6e430
Merge "Activate the wifi high perf. for sip calls."
2011-02-24 19:27:12 -08:00
Mathias Agopian
d4e5832b69
Merge "Fix a wp<> bug where the owner ID would be wrong"
2011-02-24 18:27:40 -08:00
Robert Ly
33d2935175
am b7a8c1e7: Merge "Doc change: fixing errors in library proj docs" into honeycomb
...
* commit 'b7a8c1e781517b5c6b47ee2b0c7bd0e70d9a1880':
Doc change: fixing errors in library proj docs
2011-02-24 18:13:43 -08:00
Mathias Agopian
d005004f14
Fix a wp<> bug where the owner ID would be wrong
...
this was introduced recently. we make sure to use
the correct owner id (the sp) instead of the wp.
Change-Id: I78fdc6ec0c2d3e687278b70442d74d1924b512a2
2011-02-24 18:12:34 -08:00
Robert Ly
8e41e13a9b
Merge "Doc change: fixing errors in library proj docs" into honeycomb
2011-02-24 18:07:28 -08:00
Robert Ly
3d5887032a
am 00e08463: Doc change: clarifying nfc tech filter usage
...
* commit '00e08463cb8df0969e71fd731a4e078680c4f2b5':
Doc change: clarifying nfc tech filter usage
2011-02-24 18:02:58 -08:00