summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 7da0abc5: am 62472581: Merge "cherrypick from master - add overview ↵Robert Ly2012-01-130-0/+0
|\ | | | | | | | | | | | | description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62" into ics-mr1 * commit '7da0abc52e3cbdeeb7fae0d22895710254ef9ec4': cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62
| * am 62472581: Merge "cherrypick from master - add overview description for RS ↵Robert Ly2012-01-131-0/+25
| |\ | | | | | | | | | | | | | | | | | | API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62" into ics-mr1 * commit '62472581c30a3202b7bbd86e644b4346d5a4e65c': cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62
| | * Merge "cherrypick from master - add overview description for RS API ↵Robert Ly2012-01-131-0/+25
| | |\ | | | | | | | | | | | | reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62" into ics-mr1
| | | * cherrypick from master - add overview description for RS API reference ↵Robert Ly2012-01-131-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62 Change-Id: Iff4b4bd171818208bb3be46dd3ef7e91b6cbd80f
* | | | Merge "New command to request a sync"Alon Albert2012-01-135-0/+449
|\ \ \ \
| * | | | New command to request a syncAlon Albert2012-01-135-0/+449
| | | | | | | | | | | | | | | | | | | | Change-Id: I523e8ff4814940197d0b9a362a3920e69feae6fd
* | | | | Merge "Move where prop dev.bootcomplete is set"Guang Zhu2012-01-122-1/+1
|\ \ \ \ \
| * | | | | Move where prop dev.bootcomplete is setGuang Zhu2012-01-122-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "Add glyphs for Vertical Text"Bart Sears2012-01-122-0/+0
|\ \ \ \ \ \
| * | | | | | Add glyphs for Vertical TextBart Sears2012-01-122-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge "fix a bug with vsync management"Mathias Agopian2012-01-121-8/+7
|\ \ \ \ \ \ \
| * | | | | | | fix a bug with vsync managementMathias Agopian2012-01-121-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this bug was introduced recently. we were signaling *all* clients regardless of the vsync rate. Change-Id: I2ae8a6c820a390f602382596ba75e8ed737fb2ef
* | | | | | | | Merge "Bring LatinIME's privateImeOptions "forceAscii" to a formal public API"Ken Wakasa2012-01-123-0/+32
|\ \ \ \ \ \ \ \
| * | | | | | | | Bring LatinIME's privateImeOptions "forceAscii" to a formal public APIKen Wakasa2012-01-133-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 5850605 Change-Id: I6ab6076909c735a3e0729b457de68d0b5301184d
* | | | | | | | | Merge "Log global autosync on dumpsys Protect dumpsys from divide by zero"Alon Albert2012-01-121-55/+61
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Log global autosync on dumpsysAlon Albert2012-01-111-55/+61
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Protect dumpsys from divide by zero Change-Id: I3474f2f4b41643ef1e95cbcf835c96b66b13de38
* | | | | | | | | Merge "Separate sniffing from session initialization"James Dong2012-01-1227-79/+231
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Separate sniffing from session initializationJames Dong2012-01-1227-79/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Merge "Getting rid of hack where the wallpaper offset was being deferred"Adam Cohen2012-01-121-22/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Getting rid of hack where the wallpaper offset was being deferredAdam Cohen2012-01-121-22/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -> This was a hack, and with all the work going into vsync etc, it really shouldn't be needed. Change-Id: I59005e2644e0ba08846a6c661e8c4e22640d8e02
* | | | | | | | | | am cea3892b: am 722c8c02: Merge "docs: make AD logo clickable on home page" ↵Scott Main2012-01-121-0/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit 'cea3892bd7fdf605d51a7f99aa0d20dfbea80dd3': docs: make AD logo clickable on home page
| * | | | | | | | | am 722c8c02: Merge "docs: make AD logo clickable on home page" into ics-mr1Scott Main2012-01-121-0/+2
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '722c8c02f1e17c232b041440ea97a2fda336a6e8': docs: make AD logo clickable on home page
| | * | | | | | | | Merge "docs: make AD logo clickable on home page" into ics-mr1Scott Main2012-01-121-0/+2
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | docs: make AD logo clickable on home pageScott Main2012-01-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib8a94280d4183b82bcbc5969f2dff1a67c1ecc53
* | | | | | | | | | | Merge "AccessibilityService description not internationalized."Svetoslav Ganov2012-01-122-8/+47
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | AccessibilityService description not internationalized.Svetoslav Ganov2012-01-032-8/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. AccessibilityServiceInfo loading the description string on creation and using this value. Hence, changing the locale results in reporting incorrectly localized string. Added a new loadDescription method to return the localized version. 2. Deprecated the old method. bug:5807616 Change-Id: Id82bda3c6a90fa6681b035d20da0b8688ed68da3
* | | | | | | | | | | | Merge "Rewrite SQLite database wrappers."Jeff Brown2012-01-1240-5827/+5224
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Rewrite SQLite database wrappers.Jeff Brown2012-01-1240-5827/+5224
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | Merge "Fix indentation and whitespace."Jeff Brown2012-01-121-1058/+1058
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Fix indentation and whitespace.Jeff Brown2012-01-121-1058/+1058
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iccb954fb77f21b230eecb3f06328e11b14611f17
* | | | | | | | | | | | | Merge "Clean up database tests a little bit."Jeff Brown2012-01-1210-74/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Clean up database tests a little bit.Jeff Brown2012-01-1210-74/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib05c699bf59187cb51627b5f352c2a15ad2c28bb
* | | | | | | | | | | | | am 1e9e7f76: am ff321d49: Merge "VPN: silence VPN notifications." into ics-mr1Chia-chi Yeh2012-01-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1e9e7f76d5e6187befaf96eece258c27fd08bdc5': VPN: silence VPN notifications.
| * | | | | | | | | | | | am ff321d49: Merge "VPN: silence VPN notifications." into ics-mr1Chia-chi Yeh2012-01-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ff321d496a6a07fc667112ecfe4d9a107d44147b': VPN: silence VPN notifications.
| | * | | | | | | | | | | Merge "VPN: silence VPN notifications." into ics-mr1Chia-chi Yeh2012-01-121-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | VPN: silence VPN notifications.Chia-chi Yeh2012-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5852859 Change-Id: I269d8de298a1fd69a8d777150ae97927537a5424
* | | | | | | | | | | | | | Merge "Fixed fadingEdge documentation"Gilles Debunne2012-01-121-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fixed fadingEdge documentationGilles Debunne2011-12-221-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nested brackets are not supported in JvaDoc and the resulting link is broken and the rest of the comment ignored. Used an hardcoded 14 value and removed the link. Change-Id: I4982e827d81e06edf0c4dd5bcb20e9ff89455a4d
* | | | | | | | | | | | | | | am 4ecb2633: am aaaafca8: docs: Android design CSS/JS fixesRoman Nurik2012-01-122-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4ecb2633981d0d58421562ca379a5c79adb413a0': docs: Android design CSS/JS fixes
| * | | | | | | | | | | | | | am aaaafca8: docs: Android design CSS/JS fixesRoman Nurik2012-01-122-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'aaaafca8543eaa75f1865d70c801c9b62caa56e2': docs: Android design CSS/JS fixes
| | * | | | | | | | | | | | | docs: Android design CSS/JS fixesRoman Nurik2012-01-122-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | | | | | | | | | | | | am 0786bc73: am baa88ef7: Merge "docs: minor Design Principles fixes for ↵Roman Nurik2012-01-123-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android Design" into ics-mr1 * commit '0786bc734e55b40a16d1a475f311c5460ff55d36': docs: minor Design Principles fixes for Android Design
| * | | | | | | | | | | | | | am baa88ef7: Merge "docs: minor Design Principles fixes for Android Design" ↵Roman Nurik2012-01-123-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit 'baa88ef7d3b4d3b16f97a3c56a3049dcb686baf9': docs: minor Design Principles fixes for Android Design
| | * | | | | | | | | | | | | Merge "docs: minor Design Principles fixes for Android Design" into ics-mr1Roman Nurik2012-01-123-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | docs: minor Design Principles fixes for Android DesignRoman Nurik2012-01-123-1/+1
| | | | |_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3d69c5fd420e7e6a7d70ebf4a65179af23a70859
* | | | | | | | | | | | | | | am 1aff11be: am 7a286d83: Merge "Fix 5620754: don\'t show pattern screen ↵Jim Miller2012-01-121-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after SIM PUK unlock" into ics-mr1 * commit '1aff11be4585d6ddff784d7e74188963050805fa': Fix 5620754: don't show pattern screen after SIM PUK unlock
| * | | | | | | | | | | | | | am 7a286d83: Merge "Fix 5620754: don\'t show pattern screen after SIM PUK ↵Jim Miller2012-01-121-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unlock" into ics-mr1 * commit '7a286d8391a58637e6834f4de296bf66183ce1b2': Fix 5620754: don't show pattern screen after SIM PUK unlock
| | * | | | | | | | | | | | | Merge "Fix 5620754: don't show pattern screen after SIM PUK unlock" into ics-mr1Jim Miller2012-01-121-2/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | Fix 5620754: don't show pattern screen after SIM PUK unlockJim Miller2012-01-101-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug introduced in testing 34a62348. The code now properly invokes the callbacks before returning. Change-Id: I637a8a792838379f0c8b42ef634da82787fcd961
* | | | | | | | | | | | | | | am 66e66e1d: am 755a967b: Merge "Clean up wifi/mobile indicators in the ↵Daniel Sandler2012-01-124-123/+200
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | expanded panel." into ics-mr1 * commit '66e66e1d70bdcf184a29bc5eb8cfdeecffdb799f': Clean up wifi/mobile indicators in the expanded panel.
generated by cgit v1.1 at 2025-02-11 11:41:56 +0000