summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix NPE in setTransparentRegion."Craig Mautner2012-04-102-2/+4
|\
| * Fix NPE in setTransparentRegion.Craig Mautner2012-04-102-2/+4
| | | | | | | | | | | | | | | | Check for null Surface before using it. Fixes bug 6312835. Change-Id: Iaaac2a5d88e81b88e369815e09818c268085e4b7
* | Merge "Don't reuse StringBuilder outside of lock when dumping ANR."Jeff Brown2012-04-101-1/+1
|\ \
| * | Don't reuse StringBuilder outside of lock when dumping ANR.Jeff Brown2012-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The ANR dumping code was reusing the shared StringBuilder while not holding the ActivityManagerService lock. As a result, other threads could sweep in and clobber the ANR information. We don't want to hold the lock here, so just create a new StringBuilder. Change-Id: I0d91af55f5c123102cfab2cd97035491efed59c0
* | | Merge "Fix IndexOutOfBoundsException."Craig Mautner2012-04-101-4/+8
|\ \ \
| * | | Fix IndexOutOfBoundsException.Craig Mautner2012-04-101-4/+8
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | This fix resolves an exception thrown when the snapshot ArrayList has no entries. Fixes bug 6311207. Change-Id: I84383417116a4a62eb2842792ed04096aebc8ee2
* | | Merge "Revert "Revert "Keep selection handles in edit fields."""George Mount2012-04-103-32/+58
|\ \ \
| * | | Revert "Revert "Keep selection handles in edit fields.""George Mount2012-04-103-32/+58
| | | | | | | | | | | | This reverts commit 90c08eafad72454a31282fd887ec23d357c904a4
* | | | Merge "Import translations. DO NOT MERGE"Eric Fischer2012-04-1018-586/+301
|\ \ \ \
| * | | | Import translations. DO NOT MERGEEric Fischer2012-04-1018-586/+301
| | | | | | | | | | | | | | | | | | | | Change-Id: I988480b6b1ff1b745b4126ef89ee57b97513d6e2
* | | | | Merge "Notify monitor waiters when changing mSurfaceIsBad value."Jack Palevich2012-04-101-2/+9
|\ \ \ \ \
| * | | | | Notify monitor waiters when changing mSurfaceIsBad value.Jack Palevich2012-04-101-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise the waiters might not wake up, leading to ANRs. Bug: 6307843 Change-Id: I0646b4e8368f80dbff46342f75709992796973fd
* | | | | | Merge "Move to Android-specific NTP pool."Jeff Sharkey2012-04-101-1/+1
|\ \ \ \ \ \
| * | | | | | Move to Android-specific NTP pool.Jeff Sharkey2012-04-101-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use "2.android.pool.ntp.org" since it returns both IPv4 and IPv6 addresses. Verified that NTP client works correctly on both. Change-Id: I0187ef4a6d3b353cfcc77957b1303ca01c67cbe9
* | | | | | Merge "Removed exception from SpannableStringBuilder"Gilles Debunne2012-04-101-9/+7
|\ \ \ \ \ \
| * | | | | | Removed exception from SpannableStringBuilderGilles Debunne2012-04-101-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6312196 Change-Id: I9cece36b40d8948e0e85bd433954818991009ad5
* | | | | | | Merge "audio preprocessing: added static factory method"Eric Laurent2012-04-104-23/+136
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | audio preprocessing: added static factory methodEric Laurent2012-04-104-23/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added static methods to check availability and create audio preprocessing effects. Change-Id: I945e97fe41912ff8880befacaba162a08b5a1267
* | | | | | | Merge "Revert "Keep selection handles in edit fields.""George Mount2012-04-103-58/+32
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Revert "Keep selection handles in edit fields."George Mount2012-04-103-58/+32
| | | | | | | | | | | | | | | | | | | | | This reverts commit 5d84368a7577c5d53ce885cd2d095cc5ba40d924
* | | | | | | Merge "Reduce load on CPU when animating rotation."Craig Mautner2012-04-102-10/+16
|\ \ \ \ \ \ \
| * | | | | | | Reduce load on CPU when animating rotation.Craig Mautner2012-04-102-10/+16
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change keeps requestTraversalLocked from being called on virtually every call to animate while rotating. Change-Id: I6d2db37db3bb82f4f9ecc84b17dbf121819a6c1b
* | | | | | | Merge "Keep selection handles in edit fields."George Mount2012-04-103-32/+58
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | / / / | |_|_|/ / / |/| | | | |
| * | | | | Keep selection handles in edit fields.George Mount2012-04-093-32/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6264769 Webkit Change: Ie937a8c55da0f8aef66cfcee11beb961669b7168 Change-Id: I9ee89f8b1d4e6954092b8c4d677fb75b79354b36
* | | | | | Merge "Faster and simpler replace in SSB, take two"Gilles Debunne2012-04-102-90/+70
|\ \ \ \ \ \
| * | | | | | Faster and simpler replace in SSB, take twoGilles Debunne2012-04-092-90/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a new version of CL 179343 which had to be reverted. This problem of the previous CL is that the ComposingSpan that was part of the replacement text was correctly added during the replace but was immediately removed because it had a zero-length size. Swapping the add and remove blocks solves the problem. The new non-zero length enforcement also revealed a bug in the spell checker where we were creating useless range spans. Change-Id: I59cebd4708af3becc7ab625ae41bc36837f1a1cf
* | | | | | | Merge "Hide the optional permission stuff, not making it in to JB."Dianne Hackborn2012-04-105-14/+11
|\ \ \ \ \ \ \
| * | | | | | | Hide the optional permission stuff, not making it in to JB.Dianne Hackborn2012-04-065-14/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also lock down the rest of the development tools permissions to be development permissions that must be granted through an explicit shell command. Change-Id: I1ba216fffe1aab4bb9f83fcef108efc504f892f4
* | | | | | | | am 6e32ebdf: (-s ours) am bbc46ae7: am 544f89ae: Update SurfaceTexture ↵Teng-Hui Zhu2012-04-100-0/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interface for forward compatibility * commit '6e32ebdff1365d754ad3ad8e156aa941d162d129': Update SurfaceTexture interface for forward compatibility
| * \ \ \ \ \ \ \ am bbc46ae7: am 544f89ae: Update SurfaceTexture interface for forward ↵Teng-Hui Zhu2012-04-102-2/+9
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compatibility * commit 'bbc46ae7499bc0fa67612c67dd23c1758336c935': Update SurfaceTexture interface for forward compatibility
| | * \ \ \ \ \ \ \ am 544f89ae: Update SurfaceTexture interface for forward compatibilityTeng-Hui Zhu2012-04-102-2/+9
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '544f89aece46e8f4bbe4eed93116c8736e68ac07': Update SurfaceTexture interface for forward compatibility
| | | * | | | | | | | Update SurfaceTexture interface for forward compatibilityTeng-Hui Zhu2012-04-102-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I32d224428c0127800714a976b4d7bb68cc7c2464
* | | | | | | | | | | Merge "Passing useLiveliness flag to FUL in startUi call"Brian Colonna2012-04-102-2/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Passing useLiveliness flag to FUL in startUi callBrian Colonna2012-04-092-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because of changes in support of multi-user functionaity, the FUL 'eye blink' checkbox was no longer enabling liveliness detection. It no longer makes sense to check the biometric flags (such as the liveliness flag) inside of the Face Unlock service. Instead, that flag is now passed in from lockscreen via the aidl interface when startUi is called. Change-Id: I591cf1924fbb24da7d54b94ef29824e5197d3b20
* | | | | | | | | | | Merge "New Android Dreams architecture, disabled for now."Daniel Sandler2012-04-1015-85/+808
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | New Android Dreams architecture, disabled for now.Daniel Sandler2012-04-0915-85/+808
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than normal Activities (which have a host of problems when used for this purpose), screen savers are now a special kind of Service that can add views to its own special window (TYPE_DREAM, in the SCREENSAVER layer). Dreams are now launched by the power manager; whenever it is about to turn the screen off, it asks the window manager if it wants to run a screen saver instead. (http://b/5677408) Also, the new config_enableDreams bool allows the entire feature to be switched on or off in one place. It is currently switched off (and the APIs are all @hidden). Change-Id: Idfe9d430568471d15f4b463cb70586a899a331f7
* | | | | | | | | | | | am 37250468: am be36ea9e: am a5894871: Merge "docs: Add 101 class about ↵Scott Main2012-04-090-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | supporting various devices" into ics-mr1 * commit '372504684fa0f74c290e0eaf7134979a55118fea':
| * | | | | | | | | | | am be36ea9e: am a5894871: Merge "docs: Add 101 class about supporting ↵Scott Main2012-04-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | various devices" into ics-mr1 * commit 'be36ea9e04df8f3b97dec7793e37fa1d1465922b':
| | * \ \ \ \ \ \ \ \ \ \ am a5894871: Merge "docs: Add 101 class about supporting various devices" ↵Scott Main2012-04-094-0/+501
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit 'a5894871b2a64f8ef80089a8ca962227c4d77155': docs: Add 101 class about supporting various devices
* | | \ \ \ \ \ \ \ \ \ \ \ Merge "Avoid waking EGL in getInitCount"Jesse Hall2012-04-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Avoid waking EGL in getInitCountJesse Hall2012-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5e0423b090c27fa4262e2a76ce4d232f8fbb8755
* | | | | | | | | | | | | | | Merge "Release the scratch pbuffer surface after use"Jesse Hall2012-04-091-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Release the scratch pbuffer surface after useJesse Hall2012-04-051-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icf010969d19b20c3ddf64b44a78a115ac92f7ea5
* | | | | | | | | | | | | | | Merge "Fix issue #6309296: Framework returns ↵Dianne Hackborn2012-04-091-14/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configuration.SCREENLAYOUT_SIZE_LARGE for Xoom"
| * | | | | | | | | | | | | | | Fix issue #6309296: Framework returns Configuration.SCREENLAYOUT_SIZE_LARGE ↵Dianne Hackborn2012-04-091-14/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for Xoom Change-Id: I5882e6f6ab249232b69bdc4b8e692716f2fe5efa
* | | | | | | | | | | | | | | | am 2f133265: am b92851d8: am a5894871: Merge "docs: Add 101 class about ↵Scott Main2012-04-090-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | supporting various devices" into ics-mr1 * commit '2f133265d0eb601885a608114b6bbc5b8a710f16':
| * | | | | | | | | | | | | | | am b92851d8: am a5894871: Merge "docs: Add 101 class about supporting ↵Scott Main2012-04-094-0/+501
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | various devices" into ics-mr1 * commit 'b92851d850a778d1a2e5a797c2ddd315b61b15f9': docs: Add 101 class about supporting various devices
| | * | | | | | | | | | | | | | am a5894871: Merge "docs: Add 101 class about supporting various devices" ↵Scott Main2012-04-094-0/+501
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit 'a5894871b2a64f8ef80089a8ca962227c4d77155': docs: Add 101 class about supporting various devices
* | | | | | | | | | | | | | | | am 14d3b807: am a5894871: Merge "docs: Add 101 class about supporting ↵Scott Main2012-04-094-0/+501
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | various devices" into ics-mr1 * commit '14d3b807b730e04d90d6dd9c9569decdf12cc9cb': docs: Add 101 class about supporting various devices
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a5894871: Merge "docs: Add 101 class about supporting various devices" ↵Scott Main2012-04-094-0/+501
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit 'a5894871b2a64f8ef80089a8ca962227c4d77155': docs: Add 101 class about supporting various devices
generated by cgit v1.1 at 2025-02-05 11:43:40 +0000