Vasu Nori
6b9ef860aa
Merge "turn off sqlite WAL until bugs bug:3024421 and bug:3353077 are fixed"
2011-02-09 13:34:43 -08:00
Mathias Agopian
1eac1c8e48
am bfe9e9cf: am cc24170d: Merge "fix [3374821] Cannot take screenshot of HC preview" into honeycomb
...
* commit 'bfe9e9cf18ca84214bc59d875d74ca63a27e2414':
fix [3374821] Cannot take screenshot of HC preview
2011-02-09 13:27:01 -08:00
Mathias Agopian
bfe9e9cf18
am cc24170d: Merge "fix [3374821] Cannot take screenshot of HC preview" into honeycomb
...
* commit 'cc24170dc653ea5fc9fe7b9b8c596700c4d6dc99':
fix [3374821] Cannot take screenshot of HC preview
2011-02-09 13:22:46 -08:00
Mathias Agopian
cc24170dc6
Merge "fix [3374821] Cannot take screenshot of HC preview" into honeycomb
2011-02-09 13:18:53 -08:00
Glenn Kasten
ac018be84f
Merge "Bug 3438513 Fix incorrect throws clause"
2011-02-09 13:08:00 -08:00
Dirk Dougherty
da21e03041
am bf5cde2f: am be04bfd0: am 01967c0e: Merge "Doc change: Add diff report for api 10." into gingerbread
...
* commit 'bf5cde2f7112b53e5b237e7275267caef25c789d':
Doc change: Add diff report for api 10.
2011-02-09 12:22:26 -08:00
Gilles Debunne
fdc8ec689f
am 54afc818: am 63bd55c7: am cdfe8999: Fix for multiple merge problem.
...
* commit '54afc818afa2d3ffe525e35ecdfc421c6fa862f3':
Fix for multiple merge problem.
2011-02-09 12:22:23 -08:00
Dirk Dougherty
bf5cde2f71
am be04bfd0: am 01967c0e: Merge "Doc change: Add diff report for api 10." into gingerbread
...
* commit 'be04bfd09914bbabf715959170c32030072b65f4':
Doc change: Add diff report for api 10.
2011-02-09 12:19:54 -08:00
Gilles Debunne
54afc818af
am 63bd55c7: am cdfe8999: Fix for multiple merge problem.
...
* commit '63bd55c7bf6f5d9384ad25637a4f4a7d2ef8d441':
Fix for multiple merge problem.
2011-02-09 12:19:46 -08:00
Svetoslav Ganov
cb1d665590
Merge "Added tests for WebView accessibility no JS"
2011-02-09 11:14:43 -08:00
Svetoslav Ganov
8bf7cace20
Added tests for WebView accessibility no JS
...
bug:3421690
This change is related to change:Idfec7e6a
1. Added tests for cases in which the previous
implementation was not behaving as expected.
2. Refatered the tests to be intrumentation tests
since the code under tests uses the DOM element
dimensions to determine visibility and if the
the WebView has no size i.e. not attached to
ViewRoot the size of all DOM elements is zero
forcing all tests to fail.
Change-Id: Ib4c01af8feb09f2b2a6b9d906e08bfaaa9e9bc74
2011-02-09 11:04:23 -08:00
Vasu Nori
d67dbeeb32
turn off sqlite WAL until bugs bug:3024421 and bug:3353077 are fixed
...
they are becoming pretty disruptive bugs.
many more instances of gmail crashing with locking protocol error.
and a positive identification of WAL as the problem in Music app
AND one instance of gmail crash that I know of.
who knows how many folks are NOT reporting the gmail crash.
too bad we relied on pre-released version sqlite feature
without seeing it complettly tested in the field.
not a safe feature to turn on at this point in time.
maybe more testing and debugging in Ice timeframe.
Change-Id: I283ad26ba7e1793772a372aa8e24df0cb96ce2ef
2011-02-09 10:52:51 -08:00
Eric Fischer
5f6166b757
am c3e3cc3d: (-s ours) am ebcbde6a: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit 'c3e3cc3dee2a6a20fabbf98496ae1d9ddedc897c':
Import revised translations. DO NOT MERGE
2011-02-09 10:52:11 -08:00
Eric Fischer
c3e3cc3dee
am ebcbde6a: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit 'ebcbde6a6e5a8da947a3f28eba7207256b891fdd':
Import revised translations. DO NOT MERGE
2011-02-09 10:47:47 -08:00
Glenn Kasten
dbc289d6c2
Bug 3438513 Fix incorrect throws clause
...
Change-Id: Ib47c12b2b03b0b03d8df69f1b943839283c9f867
2011-02-09 10:38:39 -08:00
Eric Fischer
ebcbde6a6e
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-02-09 10:11:18 -08:00
Daniel Sandler
b6dd088a3b
Merge "Bringing back the pocket."
2011-02-09 06:19:58 -08:00
Vasu Nori
61eadaa6c3
Merge "bug:3435895 change a couple of retryable error constants to < 400"
2011-02-08 22:01:39 -08:00
Mathias Agopian
9afc7b02fa
fix [3374821] Cannot take screenshot of HC preview
...
the screencap tool will now fallback to /dev/graphics/fb0 is the
screenshot API fails.
Change-Id: I3f593847c72f4ca5429d4f64ca22bd5436dd2051
2011-02-08 20:43:00 -08:00
Gilles Debunne
397c659273
am 4fd30641: Merge "resolved conflicts for merge of e04c1496 to honeycomb-plus-aosp" into honeycomb-plus-aosp
...
* commit '4fd30641a9a82ae3bfbc59473e8ea4e9691a7c39':
Double tap triggers text selection in a TextView. DO NOT MERGE
2011-02-08 20:41:35 -08:00
Gilles Debunne
4fd30641a9
Merge "resolved conflicts for merge of e04c1496 to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-02-08 20:38:59 -08:00
Gilles Debunne
a8b94925ab
resolved conflicts for merge of e04c1496 to honeycomb-plus-aosp
...
Change-Id: I59886953b76857ab0a089947e1c5335b93f68d5e
2011-02-08 20:36:04 -08:00
Mike Lockwood
0a8bfd1b3b
Merge "MTP: Fix NPE in MtpPropertyGroup"
2011-02-08 19:00:32 -08:00
Scott Main
9bcc2a748b
am 5988355a: am 3f41d8f5: docs: fix a couple titles
...
* commit '5988355af4635094a99e408ce4199e9d19af6f9e':
docs: fix a couple titles
2011-02-08 18:51:32 -08:00
Scott Main
5988355af4
am 3f41d8f5: docs: fix a couple titles
...
* commit '3f41d8f5ee1a8d5366d79ee03d97fac8403c676a':
docs: fix a couple titles
2011-02-08 18:48:53 -08:00
Scott Main
3f41d8f5ee
docs: fix a couple titles
...
Change-Id: I1c2d6c420f814e1ddff5f661214cbbd11f3ca6dd
2011-02-08 18:46:23 -08:00
Mike Lockwood
fd22edc668
MTP: Fix NPE in MtpPropertyGroup
...
Change-Id: I65fbd3f2f62724434136c6ae310e6647884902d2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-08 21:45:22 -05:00
Scott Main
6edbd32835
am 2b7aec46: am f002b675: Merge "docs: shorten and revise some titles in the Developing docs and resolve respective links" into honeycomb
...
* commit '2b7aec46639ffb3242eb1ac6d557c87e68442438':
docs: shorten and revise some titles in the Developing docs and resolve respective links
2011-02-08 18:42:01 -08:00
Scott Main
2b7aec4663
am f002b675: Merge "docs: shorten and revise some titles in the Developing docs and resolve respective links" into honeycomb
...
* commit 'f002b6752562a442c934bdf7c04cb0fedc24d442':
docs: shorten and revise some titles in the Developing docs and resolve respective links
2011-02-08 18:39:24 -08:00
Scott Main
f002b67525
Merge "docs: shorten and revise some titles in the Developing docs and resolve respective links" into honeycomb
2011-02-08 18:36:04 -08:00
Dmitri Plotnikov
cdf228cf87
Merge "Full text search: new API, deprecating old API."
2011-02-08 18:14:40 -08:00
Eric Fischer
b8a036307a
Import revised translations. DO NOT MERGE
...
Change-Id: I989585acd6f901a82e8db9b07257af5a5736989e
2011-02-08 18:00:38 -08:00
Dirk Dougherty
be04bfd099
am 01967c0e: Merge "Doc change: Add diff report for api 10." into gingerbread
...
* commit '01967c0ee104e985167374e41f2c416c1100f767':
Doc change: Add diff report for api 10.
2011-02-08 17:31:54 -08:00
Gilles Debunne
63bd55c7bf
am cdfe8999: Fix for multiple merge problem.
...
* commit 'cdfe899991c365d9e197d83f8859089cae082011':
Fix for multiple merge problem.
2011-02-08 17:31:33 -08:00
Vasu Nori
0ba3055b1e
bug:3435895 change a couple of retryable error constants to < 400
...
so that they are not considered permanent failures
Change-Id: I4513e6abcce127f78b5be98ab78c985ed698e43e
2011-02-08 17:18:27 -08:00
Christopher Tate
0b6b6fcf20
Merge "Align inexact alarms in both time bases; don't pull to wall time"
2011-02-08 17:15:37 -08:00
Joe Malin
b1508a2078
am 9087566b: am 7777fb04: Merge "DOC CHANGE: Fix bug 3416872 in MonkeyRunner doc" into honeycomb
...
* commit '9087566bf1d6b2b7d7a0d3112732113400f6ec47':
DOC CHANGE: Fix bug 3416872 in MonkeyRunner doc
2011-02-08 17:01:35 -08:00
Christopher Tate
b8849c1e85
Align inexact alarms in both time bases; don't pull to wall time
...
The previous implementation failed to properly distinguish between
trigger times in the RTC vs the ELAPSED time bases. The pernicious
result of this was that sometimes it would decide to align RTC
alarms based on, say, 0 rather than on the real current time.
This would pull the recurrence into wall-clock alignment, with
serious side effects: in particular, periodic tasks that would hit
external network resources would, because *all* devices would be
pulled into wall-clock alignment, wind up inducing heavy QPS
spikes on the backends.
The new implementation works completely differently. The basic
goal is the same: try to align inexact alarms to "the same" time,
avoiding extra wakeups / radio spinups / etc. The way this is done
is to divide the timeline into 15-minute quanta, and drift the start
time of every inexact alarm onto one of these 15-minute quantum
boundaries. The skew between the RTC and ELAPSED time bases is
taken into effect; RTC alarms are no longer pulled into wall clock
alignment.
Fixes bug 3388961
Change-Id: I2a0460e1f5d0e4036f3402f332b642b557b2fc20
2011-02-08 16:59:46 -08:00
Joe Malin
9087566bf1
am 7777fb04: Merge "DOC CHANGE: Fix bug 3416872 in MonkeyRunner doc" into honeycomb
...
* commit '7777fb04f1bdb11628ef8978c42b14e51ebb9c56':
DOC CHANGE: Fix bug 3416872 in MonkeyRunner doc
2011-02-08 16:58:22 -08:00
Joe Malin
7777fb04f1
Merge "DOC CHANGE: Fix bug 3416872 in MonkeyRunner doc" into honeycomb
2011-02-08 16:55:53 -08:00
Gilles Debunne
e04c14962f
resolved conflicts for merge of c0728cc0 to gingerbread-plus-aosp
...
Change-Id: I1b941e0610e498365d441c7bd23af276d1b5f986
2011-02-08 16:33:58 -08:00
Adam Powell
a1ea2c8457
Merge "Fix bug 3345948 - ActionBar.show()/hide() shouldn't animate if called before first layout"
2011-02-08 16:32:54 -08:00
Dmitri Plotnikov
123653b890
Full text search: new API, deprecating old API.
...
All of this API, old and new, is hidden for now.
Bug: 2078420
Change-Id: I5895e992aa820fa189321e1859179bfe7ccb71ff
2011-02-08 16:31:20 -08:00
Adam Powell
50efbed668
Fix bug 3345948 - ActionBar.show()/hide() shouldn't animate if called
...
before first layout
Enable/disable the action bar show/hide animation as part of the
activity/dialog lifecycle. This allows apps to set action bar
visibility state as the activity first becomes visible or returns to
visibility without the associated animation.
Change-Id: I85ff9268d2cb2c8fcd3364dd275597fe90529224
2011-02-08 16:24:15 -08:00
James Dong
cbefb805a8
Merge "Should reset errno to 0 before calling strtoll()."
2011-02-08 16:07:42 -08:00
Andy McFadden
ccc9d14d6c
Merge "Use JNI helper function to get buffer address"
2011-02-08 16:03:24 -08:00
James Dong
75fb238b3f
Should reset errno to 0 before calling strtoll().
...
bug - 3431238
Change-Id: I855847209d2e022242b8eb62985759922ab94779
2011-02-08 15:41:58 -08:00
Scott Main
108c7c514a
am 91c1b185: am b70afd34: docs: remove and correct parent links for fundamental docs and hide the "beginner\'s path" because it\'s not complete
...
* commit '91c1b18533078e543c40d6937dea9c4ed2171565':
docs: remove and correct parent links for fundamental docs and hide the "beginner's path" because it's not complete
2011-02-08 15:06:57 -08:00
Scott Main
121370d25c
am 3c565377: am b508d6e2: Merge "docs: fix links to revised fundamentals documents" into honeycomb
...
* commit '3c5653773d6b48f27aa52d746a7a6f8728d5ba36':
docs: fix links to revised fundamentals documents
2011-02-08 15:06:54 -08:00
Jason Sams
fbf8e02d99
am e2b2a02a: am 4fd70373: Merge "Fix bug 3421901 remove 2 functions from public headers in the SDK." into honeycomb
...
* commit 'e2b2a02a91dc4101a9481b5bb6ba4c56c7a35dd7':
Fix bug 3421901 remove 2 functions from public headers in the SDK.
2011-02-08 15:06:50 -08:00