Mathias Agopian
49862c3630
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
Mathias Agopian
ec122eb46b
Fix some issues with RefBase debugging.
...
First slipt sp<> out of RefBase into StrongPointer.h so it can be reused
more easily and to make it clear that it doesn't require RefBase.
Note: the rest of the change only affects the system when DEBUG_REFS is enabled.
The main problem we fix here is that the owner id associated with each
reference could get out of date when a sp<> or wp<> was moved, for
instance when they're used in a Vector< >.
We fix this issue by calling into RefBase::moveReferences from
a template specialization for sp<TYPE> and wp<TYPE> of the
type helpers. RefBase::moveReferences() has then a chance to
update the owner ids.
There is a little bit of trickery to implement this generically in
RefBase, where we need to use a templatized functor that can turn
a sp<TYPE>* casted to a void* into a RefBase*.
Introduced a new debug option DEBUG_REFS_FATAL_SANITY_CHECKS
currently set to 0 by default as there seem to be an issue
with sp<ANativeWindow> which trips the sanity checks.
Change-Id: I4825b21c8ec47d4a0ef35d760760ae0c9cdfbd7f
2011-02-23 22:21:41 -08:00
Romain Guy
47b8adec39
Add a new Camera API to control the camera's location
...
Change-Id: Id9a082d2def803eb527e1987875e0d8a22c6e8aa
2011-02-23 19:51:42 -08:00
Xavier Ducrohet
81904fa40b
Merge "LayoutLib: Add debug mode."
2011-02-23 18:32:15 -08:00
Xavier Ducrohet
8ee31a0a93
Merge "LayoutLib: downsize the SparseArray when possible."
2011-02-23 18:32:10 -08:00
Xavier Ducrohet
f0a53435f1
LayoutLib: Add debug mode.
...
Change-Id: If4263c7dba63a063f84e0c6988c270eb6d291ac3
2011-02-23 18:12:49 -08:00
Jason Chen
e4ce73763d
am 36b0b85a: (-s ours) am 22577b8d: (-s ours) am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread
...
* commit '36b0b85abd20b4f4bea210060dec3fbe80870dd5':
DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
2011-02-23 18:11:21 -08:00
Jason Chen
36b0b85abd
am 22577b8d: (-s ours) am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread
...
* commit '22577b8d3a39c1373594ba3e4427212eee4cd6d4':
DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
2011-02-23 18:08:23 -08:00
Irfan Sheriff
56ae666995
am 6588c7cf: (-s ours) am 5107eea6: Merge "DO NOT MERGE Add support for background scanning" into honeycomb
...
* commit '6588c7cf73a9d09cad1fa5d4e558a55a5e5e18df':
DO NOT MERGE Add support for background scanning
2011-02-23 18:06:02 -08:00
Jason Chen
22577b8d3a
am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread
...
* commit '5ff79c3b06d7087153617dc973491fc890700af5':
DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
2011-02-23 18:03:34 -08:00
Irfan Sheriff
6588c7cf73
am 5107eea6: Merge "DO NOT MERGE Add support for background scanning" into honeycomb
...
* commit '5107eea64e46b0fffbbbcefa469a88044f309de6':
DO NOT MERGE Add support for background scanning
2011-02-23 18:02:45 -08:00
Michael Kolb
b384fac01d
Merge "make @hide actually hide"
2011-02-23 17:44:43 -08:00
Michael Kolb
601e779ae7
make @hide actually hide
...
Change-Id: I84f09acd551d0dc81081322fbeda883d271f8256
2011-02-23 17:43:16 -08:00
Jason Chen
5ff79c3b06
Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread
2011-02-23 17:23:53 -08:00
Dianne Hackborn
9248e95a2f
DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
...
Original change description follows:
-----------------------------------
Implement issue #3326435 : Battery stats improvements
Keep track of discharge while screen is on vs. off.
Checkin looks like:
5,0,u,dc,1,1,1,0
The last four numbers are, from left:
- Maximum battery drain over time period.
- Minimum battery drain over time period.
- Battery drain while screen was on.
- Battery drain while screen was off.
Change-Id: Ie3cfe52df29b3f28ba8dc3350abe6cc967c76324
2011-02-23 17:21:09 -08:00
James Dong
bc5f1f5c81
d263 may contain optional bitr box, and thus its size can be up to 23 bytes
...
bug - 3482703
Change-Id: Id6fdf9d1f4a304954c018b67d50bd79a07164687
2011-02-23 17:11:41 -08:00
Michael Kolb
75a03f9a3c
use getTitleHeight for measuring
...
Bug: 3473996
change getTitleHeight to be protected so that subclass
can override it
use getTitleHeight for rendering
use getHeight for clipping
Change-Id: I6e9a85d88eba176886e53b260d02082d26b410d8
2011-02-23 17:01:38 -08:00
Irfan Sheriff
5107eea64e
Merge "DO NOT MERGE Add support for background scanning" into honeycomb
2011-02-23 16:59:55 -08:00
Chet Haase
a8bdc2a42e
Merge "Fix bug with bad state in animators"
2011-02-23 16:59:03 -08:00
Irfan Sheriff
1e231cbf0c
Merge "Remove backup of sleep policy setting"
2011-02-23 16:54:55 -08:00
Chet Haase
154f14508a
Fix bug with bad state in animators
...
Bug 3482310: The playing state was not being correctly set to
RUNNING after an animator was start()'d. Instead, we were seeking
to the start value (correct), setting the state to SEEKED (also correct),
but not resetting the playing state to STOPPED. So when the animation
actually started animating values, it didn't recognize that it was
starting a STOPPED animation, so it never set its state to RUNNING,
and never returned true from isRunning().
Change-Id: Iea92dce98f92f60052d8a9a451094b953f9f0c67
2011-02-23 16:53:18 -08:00
John Reck
a6adf983d9
Merge "Add x- header to prevent url logging in incognito"
2011-02-23 16:50:24 -08:00
John Reck
ab5901dab2
Add x- header to prevent url logging in incognito
...
Bug: 3336575
Change-Id: I4a65242405d731f74c676382a810f608afcaad39
2011-02-23 16:42:10 -08:00
Mike Lockwood
55d03444ba
Merge "GpsLocationProvider: Clean up HAL initialization/cleanup sequence"
2011-02-23 16:40:12 -08:00
Mike Lockwood
58ec34cef5
GpsLocationProvider: Clean up HAL initialization/cleanup sequence
...
Change-Id: Id5467000f3f3da5cbe1f112dad97a032688d2eac
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-23 16:35:33 -08:00
Romain Guy
bcbe8b699e
Merge "More documentation for Canvas.drawArc()"
2011-02-23 16:32:16 -08:00
Romain Guy
4a317db43d
More documentation for Canvas.drawArc()
...
Change-Id: I007a1db94306e05cf4e245f876aa1921f518c113
2011-02-23 16:34:21 -08:00
Jason Sams
595f37c103
Merge "fix bug 3477451 Bogus asserts with pure compute scripts."
2011-02-23 16:29:41 -08:00
Kenny Root
5be2b95db6
Merge "Fix measurement of external media dir"
2011-02-23 16:27:10 -08:00
Kenny Root
c7624d9338
Fix measurement of external media dir
...
Change-Id: I90a39c6a506ad0e5d18b40824d06eb1a7e376a3e
2011-02-23 16:25:25 -08:00
Dmitri Plotnikov
dbcdbf2128
Fix javadoc for DisplayNameSources
...
Bug: 3370212
Change-Id: I13d3ae96b6fcbba6d1ae8a1f06fb971de1f73f81
2011-02-23 16:05:58 -08:00
Romain Guy
68b6b1c2d1
A bit more doc for ListAdapter#areAllItemsEnabled().
...
Change-Id: I339de99f52a8b5a3405d2aabd83a6dc92ca96e98
2011-02-23 16:05:07 -08:00
Romain Guy
557704e22a
Merge "A bit more doc for ListAdapter#areAllItemsEnabled()."
2011-02-23 16:04:07 -08:00
Scott Main
cd4ed5438c
am b1eea45a: am 201959af: Merge "docs: fix sensorevent code snippets bug: 3480932" into honeycomb
...
* commit 'b1eea45a71a3fffe3014bbe84226df3c57ddbafc':
docs: fix sensorevent code snippets bug: 3480932
2011-02-23 16:02:13 -08:00
Scott Main
b1eea45a71
am 201959af: Merge "docs: fix sensorevent code snippets bug: 3480932" into honeycomb
...
* commit '201959af6e61c148576c77de6cf772456d664251':
docs: fix sensorevent code snippets bug: 3480932
2011-02-23 16:00:08 -08:00
Scott Main
201959af6e
Merge "docs: fix sensorevent code snippets bug: 3480932" into honeycomb
2011-02-23 15:58:13 -08:00
Romain Guy
99f422fefd
Merge "Add dither XML attribute support to Gradient and ShapeDrawable."
2011-02-23 15:57:19 -08:00
Romain Guy
ed7894352f
Add dither XML attribute support to Gradient and ShapeDrawable.
...
Change-Id: I4b60a0ba6766b7e7b176e78dc7f15f8467e2b890
2011-02-23 15:57:08 -08:00
Jaikumar Ganesh
5936245654
Merge "Make BluetoothPan inherit from BluetoothProfile."
2011-02-23 15:50:57 -08:00
Jaikumar Ganesh
74ef119945
Make BluetoothPan inherit from BluetoothProfile.
...
Change-Id: Ibd3e24e391be93ebe2cf975bd075efb68e10c1ff
2011-02-23 15:49:15 -08:00
Eric Fischer
b5b75c5136
am bb0c1a36: (-s ours) am 32751e31: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit 'bb0c1a366dab54f20c8aded19ca01fe3d8721de2':
Import revised translations. DO NOT MERGE
2011-02-23 15:38:38 -08:00
Eric Fischer
bb0c1a366d
am 32751e31: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '32751e3175d8dca96d75b6c93a32557c259c13a7':
Import revised translations. DO NOT MERGE
2011-02-23 15:36:08 -08:00
Eric Fischer
32751e3175
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-02-23 15:33:12 -08:00
Mathias Agopian
7f97c4ef12
Merge "Remove RefBase.h dependency on TextOutput.h"
2011-02-23 15:23:13 -08:00
Xavier Ducrohet
b2c7dd5986
LayoutLib: downsize the SparseArray when possible.
...
Change-Id: I570b93ab161414b7729f8d2dce8ddadb706f186b
2011-02-23 15:02:58 -08:00
Eric Fischer
fc1c800b2e
Import revised translations. DO NOT MERGE
...
Change-Id: I5089e17bd14de7b4e217c1b91e393ae4799c4263
2011-02-23 14:49:04 -08:00
Jason Sams
07078e3858
fix bug 3477451
...
Bogus asserts with pure compute scripts.
Change-Id: If5928c563e06405f75a11606d9148d64fa10be07
2011-02-23 14:47:17 -08:00
Irfan Sheriff
17f49e4f91
am b0e5326d: (-s ours) am a46a5cba: Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb
...
* commit 'b0e5326d8cc661448a7ff611d02d439d4a328a3d':
DO NOT MERGE No backup of country and sleep policy
2011-02-23 14:41:01 -08:00
Irfan Sheriff
b0e5326d8c
am a46a5cba: Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb
...
* commit 'a46a5cba276ee269d227a5e4d69f3891c4349edf':
DO NOT MERGE No backup of country and sleep policy
2011-02-23 14:38:10 -08:00
Irfan Sheriff
a46a5cba27
Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb
2011-02-23 14:35:20 -08:00