OSDN Git Service
Glenn Kasten [Tue, 3 Jan 2012 22:22:33 +0000 (14:22 -0800)]
AudioTrack and AudioFlinger send level cleanup
Add an API to control block for getting/setting send level.
This allow us to make the mSendLevel field private.
Document the lack of barriers.
Use 0.0f to initialize floating-point values (for doc only).
Change-Id: I59f83b00adeb89eeee227e7648625d9a835be7a4
Guang Zhu [Fri, 13 Jan 2012 05:00:15 +0000 (21:00 -0800)]
Merge "Move where prop dev.bootcomplete is set"
Bart Sears [Fri, 13 Jan 2012 03:20:05 +0000 (19:20 -0800)]
Merge "Add glyphs for Vertical Text"
Mathias Agopian [Fri, 13 Jan 2012 02:49:07 +0000 (18:49 -0800)]
Merge "fix a bug with vsync management"
Ken Wakasa [Fri, 13 Jan 2012 02:15:42 +0000 (18:15 -0800)]
Merge "Bring LatinIME's privateImeOptions "forceAscii" to a formal public API"
Guang Zhu [Thu, 12 Jan 2012 20:02:22 +0000 (12:02 -0800)]
Move where prop dev.bootcomplete is set
Currently test harnesses depends on this flag to determine when
the system is fully booted, and start dismissing keyguard, launch
tests etc. However, the flag is usually set when the boot animation
is still running, and typically about 5 seconds before keyguard is
up etc. Moving to to when BOOT_COMPLETE broadcast is sent makes it
work more reliable.
We also discussed about using sys.boot_completed instead,
unfortunately this flag is not in all platform and we still have
backwards compatibility to maintain in order to drive unbundled
tests.
Change-Id: I99b084cd70d8e4bcfe490ddeca868136d32712e2
Alon Albert [Fri, 13 Jan 2012 01:39:37 +0000 (17:39 -0800)]
Merge "Log global autosync on dumpsys Protect dumpsys from divide by zero"
James Dong [Fri, 13 Jan 2012 00:56:58 +0000 (16:56 -0800)]
Merge "Separate sniffing from session initialization"
Adam Cohen [Fri, 13 Jan 2012 00:47:00 +0000 (16:47 -0800)]
Merge "Getting rid of hack where the wallpaper offset was being deferred"
Ken Wakasa [Thu, 12 Jan 2012 13:51:55 +0000 (22:51 +0900)]
Bring LatinIME's privateImeOptions "forceAscii" to a formal public API
bug:
5850605
Change-Id: I6ab6076909c735a3e0729b457de68d0b5301184d
Bart Sears [Fri, 13 Jan 2012 00:42:32 +0000 (16:42 -0800)]
Add glyphs for Vertical Text
Adds U+FE10-U+FE19, U+2022, U+25C9, U+FE45, U+FE46
Also has an updated version of U+59A9 (this is a bug fix
unrelated to the new Vertical Text glyphs).
This is the second drop from Monotype. The first drop was
missing U+FE11 and U+FE13 and had a few other minor issues.
Bug:
5472953
Change-Id: I270ae3c88bf8ba227de58cdce7321464ca708308
James Dong [Tue, 10 Jan 2012 16:24:37 +0000 (08:24 -0800)]
Separate sniffing from session initialization
This avoid lengthy/duplicate sniffing for drm plugins when a decrypt session is opened
o The change is backward compatibile in that no update is required
for existing drm plug-ins if they do not plan to provide separate
sniffer/extractor
related-to-bug:
5725548
Change-Id: I7fc4caf82d77472da4e2bc7b5d31060fb54fd84c
Mathias Agopian [Fri, 13 Jan 2012 00:13:54 +0000 (16:13 -0800)]
fix a bug with vsync management
this bug was introduced recently. we were signaling *all* clients
regardless of the vsync rate.
Change-Id: I2ae8a6c820a390f602382596ba75e8ed737fb2ef
Scott Main [Thu, 12 Jan 2012 23:49:34 +0000 (15:49 -0800)]
am
cea3892b: am
722c8c02: Merge "docs: make AD logo clickable on home page" into ics-mr1
* commit '
cea3892bd7fdf605d51a7f99aa0d20dfbea80dd3':
docs: make AD logo clickable on home page
Scott Main [Thu, 12 Jan 2012 23:47:15 +0000 (15:47 -0800)]
am
722c8c02: Merge "docs: make AD logo clickable on home page" into ics-mr1
* commit '
722c8c02f1e17c232b041440ea97a2fda336a6e8':
docs: make AD logo clickable on home page
Scott Main [Thu, 12 Jan 2012 23:44:53 +0000 (15:44 -0800)]
Merge "docs: make AD logo clickable on home page" into ics-mr1
Svetoslav Ganov [Thu, 12 Jan 2012 23:36:58 +0000 (15:36 -0800)]
Merge "AccessibilityService description not internationalized."
Scott Main [Thu, 12 Jan 2012 23:33:38 +0000 (15:33 -0800)]
docs: make AD logo clickable on home page
Change-Id: Ib8a94280d4183b82bcbc5969f2dff1a67c1ecc53
Jeff Brown [Thu, 12 Jan 2012 23:03:26 +0000 (15:03 -0800)]
Merge "Rewrite SQLite database wrappers."
Jeff Brown [Thu, 12 Jan 2012 22:59:30 +0000 (14:59 -0800)]
Merge "Fix indentation and whitespace."
Jeff Brown [Thu, 12 Jan 2012 22:59:11 +0000 (14:59 -0800)]
Merge "Clean up database tests a little bit."
Jeff Brown [Tue, 1 Nov 2011 00:48:13 +0000 (17:48 -0700)]
Rewrite SQLite database wrappers.
The main theme of this change is encapsulation. This change
preserves all existing functionality but the implementation
is now much cleaner.
Instead of a "database lock", access to the database is treated
as a resource acquisition problem. If a thread's owns a database
connection, then it can access the database; otherwise, it must
acquire a database connection first, and potentially wait for other
threads to give up theirs. The SQLiteConnectionPool encapsulates
the details of how connections are created, configured, acquired,
released and disposed.
One new feature is that SQLiteConnectionPool can make scheduling
decisions about which thread should next acquire a database
connection when there is contention among threads. The factors
considered include wait queue ordering (fairness among peers),
whether the connection is needed for an interactive operation
(unfairness on behalf of the UI), and whether the primary connection
is needed or if any old connection will do. Thus one goal of the
new SQLiteConnectionPool is to improve the utilization of
database connections.
To emulate some quirks of the old "database lock," we introduce
the concept of the primary database connection. The primary
database connection is the one that is typically used to perform
write operations to the database. When a thread holds the primary
database connection, it effectively prevents other threads from
modifying the database (although they can still read). What's
more, those threads will block when they try to acquire the primary
connection, which provides the same kind of mutual exclusion
features that the old "database lock" had. (In truth, we
probably don't need to be requiring use of the primary database
connection in as many places as we do now, but we can seek to refine
that behavior in future patches.)
Another significant change is that native sqlite3_stmt objects
(prepared statements) are fully encapsulated by the SQLiteConnection
object that owns them. This ensures that the connection can
finalize (destroy) all extant statements that belong to a database
connection when the connection is closed. (In the original code,
this was very complicated because the sqlite3_stmt objects were
managed by SQLiteCompiledSql objects which had different lifetime
from the original SQLiteDatabase that created them. Worse, the
SQLiteCompiledSql finalizer method couldn't actually destroy the
sqlite3_stmt objects because it ran on the finalizer thread and
therefore could not guarantee that it could acquire the database
lock in order to do the work. This resulted in some rather
tortured logic involving a list of pending finalizable statements
and a high change of deadlocks or leaks.)
Because sqlite3_stmt objects never escape the confines of the
SQLiteConnection that owns them, we can also greatly simplify
the design of the SQLiteProgram, SQLiteQuery and SQLiteStatement
objects. They no longer have to wrangle a native sqlite3_stmt
object pointer and manage its lifecycle. So now all they do
is hold bind arguments and provide a fancy API.
All of the JNI glue related to managing database connections
and performing transactions is now bound to SQLiteConnection
(rather than being scattered everywhere). This makes sense because
SQLiteConnection owns the native sqlite3 object, so it is the
only class in the system that can interact with the native
SQLite database directly. Encapsulation for the win.
One particularly tricky part of this change is managing the
ownership of SQLiteConnection objects. At any given time,
a SQLiteConnection is either owned by a SQLiteConnectionPool
or by a SQLiteSession. SQLiteConnections should never be leaked,
but we handle that case too (and yell about it with CloseGuard).
A SQLiteSession object is responsible for acquiring and releasing
a SQLiteConnection object on behalf of a single thread as needed.
For example, the session acquires a connection when a transaction
begins and releases it when finished. If the session cannot
acquire a connection immediately, then the requested operation
blocks until a connection becomes available.
SQLiteSessions are thread-local. A SQLiteDatabase assigns a
distinct session to each thread that performs database operations.
This is very very important. First, it prevents two threads
from trying to use the same SQLiteConnection at the same time
(because two threads can't share the same session).
Second, it prevents a single thread from trying to acquire two
SQLiteConnections simultaneously from the same database (because
a single thread can't have two sessions for the same database which,
in addition to being greedy, could result in a deadlock).
There is strict layering between the various database objects,
objects at lower layers are not aware of objects at higher layers.
Moreover, objects at higher layers generally own objects at lower
layers and are responsible for ensuring they are properly disposed
when no longer needed (good for the environment).
API layer: SQLiteDatabase, SQLiteProgram, SQLiteQuery, SQLiteStatement.
Session layer: SQLiteSession.
Connection layer: SQLiteConnectionPool, SQLiteConnection.
Native layer: JNI glue.
By avoiding cyclic dependencies between layers, we make the
architecture much more intelligible, maintainable and robust.
Finally, this change adds a great deal of new debugging information.
It is now possible to view a list of the most recent database
operations including how long they took to run using
"adb shell dumpsys dbinfo". (Because most of the interesting
work happens in SQLiteConnection, it is easy to add debugging
instrumentation to track all database operations in one place.)
Change-Id: Iffb4ce72d8bcf20b4e087d911da6aa84d2f15297
Adam Cohen [Thu, 12 Jan 2012 22:38:38 +0000 (14:38 -0800)]
Getting rid of hack where the wallpaper offset was being deferred
-> This was a hack, and with all the work going into vsync etc, it
really shouldn't be needed.
Change-Id: I59005e2644e0ba08846a6c661e8c4e22640d8e02
Jeff Brown [Thu, 12 Jan 2012 22:21:54 +0000 (14:21 -0800)]
Fix indentation and whitespace.
Change-Id: Iccb954fb77f21b230eecb3f06328e11b14611f17
Jeff Brown [Thu, 12 Jan 2012 20:04:22 +0000 (12:04 -0800)]
Clean up database tests a little bit.
Change-Id: Ib05c699bf59187cb51627b5f352c2a15ad2c28bb
Chia-chi Yeh [Thu, 12 Jan 2012 22:30:44 +0000 (14:30 -0800)]
am
1e9e7f76: am
ff321d49: Merge "VPN: silence VPN notifications." into ics-mr1
* commit '
1e9e7f76d5e6187befaf96eece258c27fd08bdc5':
VPN: silence VPN notifications.
Chia-chi Yeh [Thu, 12 Jan 2012 22:26:43 +0000 (14:26 -0800)]
am
ff321d49: Merge "VPN: silence VPN notifications." into ics-mr1
* commit '
ff321d496a6a07fc667112ecfe4d9a107d44147b':
VPN: silence VPN notifications.
Chia-chi Yeh [Thu, 12 Jan 2012 22:24:30 +0000 (14:24 -0800)]
Merge "VPN: silence VPN notifications." into ics-mr1
Gilles Debunne [Thu, 12 Jan 2012 22:21:58 +0000 (14:21 -0800)]
Merge "Fixed fadingEdge documentation"
Roman Nurik [Thu, 12 Jan 2012 22:11:01 +0000 (14:11 -0800)]
am
4ecb2633: am
aaaafca8: docs: Android design CSS/JS fixes
* commit '
4ecb2633981d0d58421562ca379a5c79adb413a0':
docs: Android design CSS/JS fixes
Roman Nurik [Thu, 12 Jan 2012 22:07:51 +0000 (14:07 -0800)]
am
aaaafca8: docs: Android design CSS/JS fixes
* commit '
aaaafca8543eaa75f1865d70c801c9b62caa56e2':
docs: Android design CSS/JS fixes
Roman Nurik [Thu, 12 Jan 2012 21:57:44 +0000 (13:57 -0800)]
docs: Android design CSS/JS fixes
- Remove new window icon for Developer site link
- Make videos re-load and replay on click to prevent
failed replay for unseekable videos
Change-Id: I689607d0d53247b0e599612cb7d23a98d6ad24a1
Roman Nurik [Thu, 12 Jan 2012 21:38:01 +0000 (13:38 -0800)]
am
0786bc73: am
baa88ef7: Merge "docs: minor Design Principles fixes for Android Design" into ics-mr1
* commit '
0786bc734e55b40a16d1a475f311c5460ff55d36':
docs: minor Design Principles fixes for Android Design
Jim Miller [Thu, 12 Jan 2012 21:37:58 +0000 (13:37 -0800)]
am
1aff11be: am
7a286d83: Merge "Fix
5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1
* commit '
1aff11be4585d6ddff784d7e74188963050805fa':
Fix
5620754: don't show pattern screen after SIM PUK unlock
Daniel Sandler [Thu, 12 Jan 2012 21:37:54 +0000 (13:37 -0800)]
am
66e66e1d: am
755a967b: Merge "Clean up wifi/mobile indicators in the expanded panel." into ics-mr1
* commit '
66e66e1d70bdcf184a29bc5eb8cfdeecffdb799f':
Clean up wifi/mobile indicators in the expanded panel.
Scott Main [Thu, 12 Jan 2012 21:37:41 +0000 (13:37 -0800)]
am
499b9441: am
cf602dbd: docs: replace "decide for me image" bug:
5860467
* commit '
499b944133298b4da344fbf97cff25c6f6b9d62f':
docs: replace "decide for me image" bug:
5860467
Roman Nurik [Thu, 12 Jan 2012 20:46:50 +0000 (12:46 -0800)]
am
baa88ef7: Merge "docs: minor Design Principles fixes for Android Design" into ics-mr1
* commit '
baa88ef7d3b4d3b16f97a3c56a3049dcb686baf9':
docs: minor Design Principles fixes for Android Design
Roman Nurik [Thu, 12 Jan 2012 20:45:00 +0000 (12:45 -0800)]
Merge "docs: minor Design Principles fixes for Android Design" into ics-mr1
Jim Miller [Thu, 12 Jan 2012 20:31:07 +0000 (12:31 -0800)]
am
7a286d83: Merge "Fix
5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1
* commit '
7a286d8391a58637e6834f4de296bf66183ce1b2':
Fix
5620754: don't show pattern screen after SIM PUK unlock
Jim Miller [Thu, 12 Jan 2012 20:28:59 +0000 (12:28 -0800)]
Merge "Fix
5620754: don't show pattern screen after SIM PUK unlock" into ics-mr1
Roman Nurik [Thu, 12 Jan 2012 20:08:07 +0000 (12:08 -0800)]
docs: minor Design Principles fixes for Android Design
Change-Id: I3d69c5fd420e7e6a7d70ebf4a65179af23a70859
Daniel Sandler [Thu, 12 Jan 2012 19:40:43 +0000 (11:40 -0800)]
am
755a967b: Merge "Clean up wifi/mobile indicators in the expanded panel." into ics-mr1
* commit '
755a967bdc2cddb6fbadd10e357f8a5328520061':
Clean up wifi/mobile indicators in the expanded panel.
Daniel Sandler [Thu, 12 Jan 2012 19:38:39 +0000 (11:38 -0800)]
Merge "Clean up wifi/mobile indicators in the expanded panel." into ics-mr1
Scott Main [Thu, 12 Jan 2012 19:35:54 +0000 (11:35 -0800)]
am
cf602dbd: docs: replace "decide for me image" bug:
5860467
* commit '
cf602dbd0b907d113e703cc8e4c8b378dce0a4c4':
docs: replace "decide for me image" bug:
5860467
Scott Main [Thu, 12 Jan 2012 19:30:27 +0000 (11:30 -0800)]
docs: replace "decide for me image"
bug:
5860467
Change-Id: I45f10df561c9392dc5b4621305413d1e7621e05d
Matthew Xie [Thu, 12 Jan 2012 19:29:39 +0000 (11:29 -0800)]
am
1890fa82: am
79d84930: Merge "Set Bluetooth adapter to PowerOff mode when turnoff with airplane on" into ics-mr1
* commit '
1890fa822091ea700b7409ac79a57cf650b55003':
Set Bluetooth adapter to PowerOff mode when turnoff with airplane on
Matthew Xie [Thu, 12 Jan 2012 19:27:10 +0000 (11:27 -0800)]
am
79d84930: Merge "Set Bluetooth adapter to PowerOff mode when turnoff with airplane on" into ics-mr1
* commit '
79d84930cd776c7173330eeb13b3282b6034fc37':
Set Bluetooth adapter to PowerOff mode when turnoff with airplane on
Scott Main [Thu, 12 Jan 2012 19:26:49 +0000 (11:26 -0800)]
am
db4296bd: am
a618eeb5: Merge "docs: update text and image for "let me make it mine" prinicple in design guide bug:
5853519" into ics-mr1
* commit '
db4296bde95352b6bb5614fad3b08ffaa49dd9c3':
docs: update text and image for "let me make it mine" prinicple in design guide bug:
5853519
Scott Main [Thu, 12 Jan 2012 19:24:24 +0000 (11:24 -0800)]
am
a618eeb5: Merge "docs: update text and image for "let me make it mine" prinicple in design guide bug:
5853519" into ics-mr1
* commit '
a618eeb552981d8bca38dbe8c28e2b1b1bffdf5e':
docs: update text and image for "let me make it mine" prinicple in design guide bug:
5853519
Matthew Xie [Thu, 12 Jan 2012 19:24:06 +0000 (11:24 -0800)]
Merge "Set Bluetooth adapter to PowerOff mode when turnoff with airplane on" into ics-mr1
Scott Main [Thu, 12 Jan 2012 19:23:11 +0000 (11:23 -0800)]
am
b2ff327c: am
abfe4cb6: Merge "docs: further clarify the behavior of targetSdkVersion bug:
5854083" into ics-mr1
* commit '
b2ff327cb41185030077189bc3e80376acf11c68':
docs: further clarify the behavior of targetSdkVersion bug:
5854083
Scott Main [Thu, 12 Jan 2012 19:22:24 +0000 (11:22 -0800)]
Merge "docs: update text and image for "let me make it mine" prinicple in design guide bug:
5853519" into ics-mr1
Scott Main [Thu, 12 Jan 2012 19:21:02 +0000 (11:21 -0800)]
am
abfe4cb6: Merge "docs: further clarify the behavior of targetSdkVersion bug:
5854083" into ics-mr1
* commit '
abfe4cb6f0ebd6c901d3210fed719d03db9e80b7':
docs: further clarify the behavior of targetSdkVersion bug:
5854083
Scott Main [Thu, 12 Jan 2012 19:19:08 +0000 (11:19 -0800)]
Merge "docs: further clarify the behavior of targetSdkVersion bug:
5854083" into ics-mr1
Scott Main [Thu, 12 Jan 2012 19:16:35 +0000 (11:16 -0800)]
docs: update text and image for "let me make it mine" prinicple in design guide
bug:
5853519
Change-Id: I7cccbb6d6eb94f29cbad24d3a07c9222a963434c
John Reck [Thu, 12 Jan 2012 19:07:16 +0000 (11:07 -0800)]
John Reck [Thu, 12 Jan 2012 19:03:06 +0000 (11:03 -0800)]
am
baaf136c: am
0a3fcc3e: Fix Apache stack
* commit '
baaf136cd279e22a7ae4b551ebd5fad23b84996d':
Fix Apache stack
John Reck [Thu, 12 Jan 2012 19:00:17 +0000 (11:00 -0800)]
am
0a3fcc3e: Fix Apache stack
* commit '
0a3fcc3eed15ed50bcaa7808b6ccb170fb137210':
Fix Apache stack
Michael Jurka [Thu, 12 Jan 2012 18:41:32 +0000 (10:41 -0800)]
Merge "Fix NPE in Recent Apps"
Mathias Agopian [Thu, 12 Jan 2012 18:37:10 +0000 (10:37 -0800)]
Merge "remove dead/usnused code"
Mathias Agopian [Thu, 12 Jan 2012 18:36:39 +0000 (10:36 -0800)]
Merge "Fix an issue with VSYNC"
Glenn Kasten [Thu, 12 Jan 2012 18:30:28 +0000 (10:30 -0800)]
Merge "Use audio_format_t consistently"
Robert Greenwalt [Thu, 12 Jan 2012 17:29:30 +0000 (09:29 -0800)]
am
1800ccfa: am
4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1
* commit '
1800ccfa647cca6e9c051759312d6af12f134f5a':
Disable wimax when mobile data is in Settings
Robert Greenwalt [Thu, 12 Jan 2012 17:26:48 +0000 (09:26 -0800)]
am
4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1
* commit '
4b1261f17ae2a0180be09b1c987ec7e70b2b46a7':
Disable wimax when mobile data is in Settings
Robert Greenwalt [Thu, 12 Jan 2012 17:25:25 +0000 (09:25 -0800)]
Merge "Ignore case on apn type strings."
Robert Greenwalt [Thu, 12 Jan 2012 17:24:45 +0000 (09:24 -0800)]
Merge "Disable wimax when mobile data is in Settings" into ics-mr1
The Android Open Source Project [Thu, 12 Jan 2012 17:00:21 +0000 (09:00 -0800)]
am
ce77af47: Reconcile with ics-mr1-release
* commit '
ce77af47e979d365155e4003ca2943b639600e73':
The Android Open Source Project [Thu, 12 Jan 2012 16:56:17 +0000 (08:56 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ie242914fa4cfdf35675bbd2777f0817186860526
Marco Nelissen [Thu, 12 Jan 2012 15:49:23 +0000 (07:49 -0800)]
Merge "MediaScanner: Disable bulk insert for settings"
Michael Jurka [Thu, 12 Jan 2012 15:35:43 +0000 (07:35 -0800)]
Merge "Speeding up System UI pressed anim"
Danielle Millett [Thu, 12 Jan 2012 15:33:47 +0000 (07:33 -0800)]
am
63faf6c6: (-s ours) am
2931d8ac: Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1
* commit '
63faf6c66ff129da9e431dbafd1170a14aedb259':
DO NOT MERGE - Cherry picking from master to MR1
Danielle Millett [Thu, 12 Jan 2012 15:31:37 +0000 (07:31 -0800)]
am
2931d8ac: Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1
* commit '
2931d8ace9118bafe08090cd41e235048b6c2eb2':
DO NOT MERGE - Cherry picking from master to MR1
Danielle Millett [Thu, 12 Jan 2012 15:28:24 +0000 (07:28 -0800)]
Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1
Michael Jurka [Thu, 12 Jan 2012 13:48:19 +0000 (05:48 -0800)]
Speeding up System UI pressed anim
No longer saving a layer in KeyButtonView.onDraw,
which prevents a framebuffer readback on some
drivers and cuts ~3ms from render time per frame
(on some frames, up to ~10ms)
Change-Id: I5df56c20098f35c8ae6c25e76c67d81e9b72d1f7
Michael Jurka [Thu, 12 Jan 2012 14:56:39 +0000 (06:56 -0800)]
Fix NPE in Recent Apps
Change-Id: I936e053a806a1cbf9ac98fb5707d34924c94ff60
Brian Colonna [Thu, 12 Jan 2012 14:37:14 +0000 (06:37 -0800)]
am
2cd0a0e5: (-s ours) am
8a1131d7: Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1
* commit '
2cd0a0e58e5da20405d1f16c65c7f9729de57c9a':
DO NOT MERGE cherry-picked FU framework tablet commits
Brian Colonna [Thu, 12 Jan 2012 14:35:27 +0000 (06:35 -0800)]
am
8a1131d7: Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1
* commit '
8a1131d78925756835561c3e19cddd2ddf9dbd99':
DO NOT MERGE cherry-picked FU framework tablet commits
Brian Colonna [Thu, 12 Jan 2012 14:33:49 +0000 (06:33 -0800)]
Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1
Mathias Agopian [Fri, 6 Jan 2012 23:54:37 +0000 (15:54 -0800)]
remove dead/usnused code
Change-Id: I6fa2bc6ee01790abd2c1533f043d61a5e5c8d26e
Mathias Agopian [Tue, 10 Jan 2012 02:19:18 +0000 (18:19 -0800)]
Fix an issue with VSYNC
one-shot VSYNC listeners could miss a VSYNC event if
scheduled while in waitForVsync().
Change-Id: I720485784aecfea6cc7a23c77081d7af3c9c71db
satok [Thu, 12 Jan 2012 05:14:23 +0000 (21:14 -0800)]
Merge "Make public SpellChecker utilities"
satok [Thu, 12 Jan 2012 03:43:44 +0000 (12:43 +0900)]
Make public SpellChecker utilities
Bug:
5639238
Change-Id: Id7dd2263a6305cc6ba0cf8f4d8ad8fb0d39a48ff
Irfan Sheriff [Thu, 12 Jan 2012 04:33:11 +0000 (20:33 -0800)]
Merge "Sync up state with supplicant at start"
Alon Albert [Thu, 12 Jan 2012 02:06:41 +0000 (18:06 -0800)]
Log global autosync on dumpsys
Protect dumpsys from divide by zero
Change-Id: I3474f2f4b41643ef1e95cbcf835c96b66b13de38
Xia Wang [Thu, 12 Jan 2012 01:57:16 +0000 (17:57 -0800)]
am
87badc20: am
4ac4ab4e: Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#:
5737922" into ics-mr1
* commit '
87badc20c7d5462ee27f13adf50acaf6a3232884':
Remove sleep from test acitivity to avoid ANR when key event is injected bug#:
5737922
Xia Wang [Thu, 12 Jan 2012 01:57:14 +0000 (17:57 -0800)]
am
b18a7c3e: am
1446c7b2: Merge "Get average value for image processing test bug#:
5566079" into ics-mr1
* commit '
b18a7c3ef1ff92ee2b8407743ffc4d7fd8b8ba70':
Get average value for image processing test bug#:
5566079
Xia Wang [Thu, 12 Jan 2012 01:53:38 +0000 (17:53 -0800)]
am
4ac4ab4e: Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#:
5737922" into ics-mr1
* commit '
4ac4ab4ef046eed4d1ada7bbb1d54ee0a244d454':
Remove sleep from test acitivity to avoid ANR when key event is injected bug#:
5737922
Xia Wang [Thu, 12 Jan 2012 01:53:36 +0000 (17:53 -0800)]
am
1446c7b2: Merge "Get average value for image processing test bug#:
5566079" into ics-mr1
* commit '
1446c7b2ed41f718afef86787b3ffd3f7b4ee9d7':
Get average value for image processing test bug#:
5566079
Xia Wang [Thu, 12 Jan 2012 01:52:06 +0000 (17:52 -0800)]
Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#:
5737922" into ics-mr1
Xia Wang [Thu, 12 Jan 2012 01:51:48 +0000 (17:51 -0800)]
Merge "Get average value for image processing test bug#:
5566079" into ics-mr1
Scott Main [Wed, 11 Jan 2012 20:14:32 +0000 (12:14 -0800)]
docs: further clarify the behavior of targetSdkVersion
bug:
5854083
Change-Id: I913a245b754604165b4570447f797f7cc66af5f9
Irfan Sheriff [Thu, 12 Jan 2012 00:54:09 +0000 (16:54 -0800)]
Sync up state with supplicant at start
Bug:
5534039
Change-Id: I70b3e03b3039877b3c64167d0d246346f9131fc6
Robert Greenwalt [Tue, 10 Jan 2012 23:49:19 +0000 (15:49 -0800)]
Ignore case on apn type strings.
Found that if the type were not lowercase it wouldn't match.
That's silly. Do case-insensitive compares.
bug:
5525764
Change-Id: Ibfe6be6c34116e00931594ec317fe192e1756ade
Katie McCormick [Thu, 12 Jan 2012 00:45:00 +0000 (16:45 -0800)]
am
3808f8cc: am
6a52c632: Merge "Doc change: Adding Bluetooth HDP info." into ics-mr1
* commit '
3808f8ccec18f7b04ef983d553fb10f3e2983216':
Doc change: Adding Bluetooth HDP info.
Katie McCormick [Thu, 12 Jan 2012 00:42:29 +0000 (16:42 -0800)]
am
6a52c632: Merge "Doc change: Adding Bluetooth HDP info." into ics-mr1
* commit '
6a52c632530fa39de570c9a6630264178c20e58e':
Doc change: Adding Bluetooth HDP info.
Katie McCormick [Thu, 12 Jan 2012 00:40:37 +0000 (16:40 -0800)]
Merge "Doc change: Adding Bluetooth HDP info." into ics-mr1
John Reck [Thu, 12 Jan 2012 00:34:26 +0000 (16:34 -0800)]
Merge "Initial NavCache removal support"
The Android Automerger [Thu, 12 Jan 2012 00:29:04 +0000 (16:29 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Katie McCormick [Wed, 4 Jan 2012 00:32:34 +0000 (16:32 -0800)]
Doc change: Adding Bluetooth HDP info.
Change-Id: Icdc19ed9ea09422ac2ea01c03b4a569d8ae94121
John Wang [Thu, 12 Jan 2012 00:05:14 +0000 (16:05 -0800)]
am
70205788: am
6ad68ba9: Adjust the mapping of LTE signal bars.
* commit '
70205788fa39968b8331085597e3d3b61e271fbe':
Adjust the mapping of LTE signal bars.