Irfan Sheriff
748fef57c4
am dad4fb5d: am c741f5c1: am 983faeed: Merge "Fix NPE" into jb-mr1-dev
...
* commit 'dad4fb5de960a7059521d950a4f1a6d2920dff44':
Fix NPE
2012-10-16 15:11:51 -07:00
Irfan Sheriff
dad4fb5de9
am c741f5c1: am 983faeed: Merge "Fix NPE" into jb-mr1-dev
...
* commit 'c741f5c13d5976289289b65ce3c1e7b71be4c266':
Fix NPE
2012-10-16 15:09:13 -07:00
Irfan Sheriff
c741f5c13d
am 983faeed: Merge "Fix NPE" into jb-mr1-dev
...
* commit '983faeed0b8090e12d10a31624e1cf09ff30c20c':
Fix NPE
2012-10-16 15:06:33 -07:00
Irfan Sheriff
983faeed0b
Merge "Fix NPE" into jb-mr1-dev
2012-10-16 15:03:27 -07:00
Raph Levien
886d159aa8
am 17732ff1: am 142155b5: am 3377b404: Merge "Fix for bug 7358703 Gmail ANR when trying to compose a message" into jb-mr1-dev
...
* commit '17732ff107706d1e816d45307594e8b73f8bb01b':
Fix for bug 7358703 Gmail ANR when trying to compose a message
2012-10-16 14:52:03 -07:00
Raph Levien
17732ff107
am 142155b5: am 3377b404: Merge "Fix for bug 7358703 Gmail ANR when trying to compose a message" into jb-mr1-dev
...
* commit '142155b5cec5dfbde4a875828505cd1434df0d2b':
Fix for bug 7358703 Gmail ANR when trying to compose a message
2012-10-16 14:49:29 -07:00
Raph Levien
142155b5ce
am 3377b404: Merge "Fix for bug 7358703 Gmail ANR when trying to compose a message" into jb-mr1-dev
...
* commit '3377b404b82403c4c137c699088eb09c4b806dba':
Fix for bug 7358703 Gmail ANR when trying to compose a message
2012-10-16 14:46:41 -07:00
Raph Levien
3377b404b8
Merge "Fix for bug 7358703 Gmail ANR when trying to compose a message" into jb-mr1-dev
2012-10-16 14:44:18 -07:00
Svetoslav Ganov
88939e5c84
am c53fee3b: am 5ac909f9: am 964629ac: Merge "Occasionally triple tap on the keyboard toggles screen magnification." into jb-mr1-dev
...
* commit 'c53fee3b435f8e84b4608ee4eac5c536210c5c20':
Occasionally triple tap on the keyboard toggles screen magnification.
2012-10-16 14:41:13 -07:00
Chet Haase
ffe661c5d3
am 4b0e8734: am cb6f35f9: am 8db45f0b: Merge "Avoid redundant wallpaper loading/drawing" into jb-mr1-dev
...
* commit '4b0e8734cce56a305e43bde95196a80a32d40027':
Avoid redundant wallpaper loading/drawing
2012-10-16 14:40:54 -07:00
Romain Guy
dbfb2727dd
am 9c198ecc: am 7b852ab3: am 5778cb9a: Merge "Always use the correct pixel store size Bug #7357394 " into jb-mr1-dev
...
* commit '9c198ecc2be5b7d1b8290a35aefa80f31ba8ed59':
Always use the correct pixel store size Bug #7357394
2012-10-16 14:40:50 -07:00
Raph Levien
8b17969c64
Fix for bug 7358703 Gmail ANR when trying to compose a message
...
When deferring scroll to a point, it's possible the text changed between
the time the scroll was requested to the time layout happens. In this
case, it attempts to scroll to a point past the end of the text buffer,
which created an infinite loop.
This patch clamps the scroll offset to the length of the text, so it
just scrolls to the end in that case, rather than crashing.
Change-Id: I53740d119d588560f5a4d9fb80e38f7057faab89
2012-10-16 14:32:47 -07:00
Svetoslav Ganov
c53fee3b43
am 5ac909f9: am 964629ac: Merge "Occasionally triple tap on the keyboard toggles screen magnification." into jb-mr1-dev
...
* commit '5ac909f9e2ab42842c0697c9af31bd95bfc3cb68':
Occasionally triple tap on the keyboard toggles screen magnification.
2012-10-16 14:25:59 -07:00
Svetoslav Ganov
5ac909f9e2
am 964629ac: Merge "Occasionally triple tap on the keyboard toggles screen magnification." into jb-mr1-dev
...
* commit '964629aca8d076826198a21b654ed858618b5619':
Occasionally triple tap on the keyboard toggles screen magnification.
2012-10-16 14:22:59 -07:00
Svetoslav Ganov
964629aca8
Merge "Occasionally triple tap on the keyboard toggles screen magnification." into jb-mr1-dev
2012-10-16 14:20:45 -07:00
Romain Guy
237bae14aa
am 3492ee6d: am 3edb0dda: am 827dde0e: Merge "Support clipping in Canvas.drawBitmapMesh() Bug #7354162 " into jb-mr1-dev
...
* commit '3492ee6d7975e2a40ef0671790a57e5f0ba2812d':
Support clipping in Canvas.drawBitmapMesh() Bug #7354162
2012-10-16 13:58:23 -07:00
Chet Haase
4b0e8734cc
am cb6f35f9: am 8db45f0b: Merge "Avoid redundant wallpaper loading/drawing" into jb-mr1-dev
...
* commit 'cb6f35f9a35d622a791109482a6b967560124933':
Avoid redundant wallpaper loading/drawing
2012-10-16 13:57:46 -07:00
Romain Guy
9c198ecc2b
am 7b852ab3: am 5778cb9a: Merge "Always use the correct pixel store size Bug #7357394 " into jb-mr1-dev
...
* commit '7b852ab384ae420359309c959ec699992c94a86b':
Always use the correct pixel store size Bug #7357394
2012-10-16 13:57:42 -07:00
Chet Haase
cb6f35f9a3
am 8db45f0b: Merge "Avoid redundant wallpaper loading/drawing" into jb-mr1-dev
...
* commit '8db45f0bbf6d9b2fd5a1a884f6e2eaefad0a0b5e':
Avoid redundant wallpaper loading/drawing
2012-10-16 13:56:49 -07:00
Romain Guy
3492ee6d79
am 3edb0dda: am 827dde0e: Merge "Support clipping in Canvas.drawBitmapMesh() Bug #7354162 " into jb-mr1-dev
...
* commit '3edb0dda40ae19653c51beb6c8858825e253f7b7':
Support clipping in Canvas.drawBitmapMesh() Bug #7354162
2012-10-16 13:55:48 -07:00
Craig Mautner
c934ce8613
am b15238dc: am 413c4ba7: am dc9e13b3: Merge "Perform all layouts within first loop." into jb-mr1-dev
...
* commit 'b15238dc75819b8230d441828991adbcf3ac7e7f':
Perform all layouts within first loop.
2012-10-16 13:55:13 -07:00
Romain Guy
7b852ab384
am 5778cb9a: Merge "Always use the correct pixel store size Bug #7357394 " into jb-mr1-dev
...
* commit '5778cb9a98aacd74c7f915b2d02eccc7189d5946':
Always use the correct pixel store size Bug #7357394
2012-10-16 13:55:08 -07:00
Chet Haase
8db45f0bbf
Merge "Avoid redundant wallpaper loading/drawing" into jb-mr1-dev
2012-10-16 13:53:04 -07:00
Romain Guy
3edb0dda40
am 827dde0e: Merge "Support clipping in Canvas.drawBitmapMesh() Bug #7354162 " into jb-mr1-dev
...
* commit '827dde0e1a0452e7aba116aa981a1229dce7038b':
Support clipping in Canvas.drawBitmapMesh() Bug #7354162
2012-10-16 13:53:04 -07:00
Craig Mautner
b15238dc75
am 413c4ba7: am dc9e13b3: Merge "Perform all layouts within first loop." into jb-mr1-dev
...
* commit '413c4ba7d46aaaa59de06a75493096d9ce5a6e1b':
Perform all layouts within first loop.
2012-10-16 13:52:33 -07:00
Romain Guy
5778cb9a98
Merge "Always use the correct pixel store size Bug #7357394 " into jb-mr1-dev
2012-10-16 13:50:54 -07:00
Craig Mautner
413c4ba7d4
am dc9e13b3: Merge "Perform all layouts within first loop." into jb-mr1-dev
...
* commit 'dc9e13b30ab26f8382b7e67dd681dee9b04bdb29':
Perform all layouts within first loop.
2012-10-16 13:49:52 -07:00
Romain Guy
827dde0e1a
Merge "Support clipping in Canvas.drawBitmapMesh() Bug #7354162 " into jb-mr1-dev
2012-10-16 13:49:51 -07:00
Craig Mautner
feb5273117
am 8bb6b77d: am 6dbfc0e9: am 417b0591: Merge "Revert app freeze timeout delay." into jb-mr1-dev
...
* commit '8bb6b77d797a28a851e401b4aa27f249b6d22299':
Revert app freeze timeout delay.
2012-10-16 13:48:46 -07:00
Craig Mautner
dc9e13b30a
Merge "Perform all layouts within first loop." into jb-mr1-dev
2012-10-16 13:46:46 -07:00
Craig Mautner
8bb6b77d79
am 6dbfc0e9: am 417b0591: Merge "Revert app freeze timeout delay." into jb-mr1-dev
...
* commit '6dbfc0e908f0f07f81327510733f64137202c1d1':
Revert app freeze timeout delay.
2012-10-16 13:46:09 -07:00
Craig Mautner
6dbfc0e908
am 417b0591: Merge "Revert app freeze timeout delay." into jb-mr1-dev
...
* commit '417b05912a2eb960d59541d546d1e857f95d906b':
Revert app freeze timeout delay.
2012-10-16 13:43:44 -07:00
Jeff Sharkey
a3ee54fa4b
am 212a8f5e: am 05790a27: am 04876317: Merge "Lock SyncQueue when user starting, copy RSC list." into jb-mr1-dev
...
* commit '212a8f5e9a1a304e7a3505b99c7b1b8764f24505':
Lock SyncQueue when user starting, copy RSC list.
2012-10-16 13:40:44 -07:00
Craig Mautner
417b05912a
Merge "Revert app freeze timeout delay." into jb-mr1-dev
2012-10-16 13:39:47 -07:00
Jeff Sharkey
212a8f5e9a
am 05790a27: am 04876317: Merge "Lock SyncQueue when user starting, copy RSC list." into jb-mr1-dev
...
* commit '05790a276c7c89f6164be5b9a6b7ca7b294a15fb':
Lock SyncQueue when user starting, copy RSC list.
2012-10-16 13:38:16 -07:00
Jeff Sharkey
05790a276c
am 04876317: Merge "Lock SyncQueue when user starting, copy RSC list." into jb-mr1-dev
...
* commit '04876317518b89888ee52e68caec26f6061eb621':
Lock SyncQueue when user starting, copy RSC list.
2012-10-16 13:34:53 -07:00
Jason Sams
7e7b99ca93
am f5e768c4: am 06b9df47: am 61759d99: Merge "Convert one more bind() -> setVar()." into jb-mr1-dev
...
* commit 'f5e768c46dfaa7266a25cf9ea778479b5d493dc1':
Convert one more bind() -> setVar().
2012-10-16 13:33:28 -07:00
Jeff Sharkey
0487631751
Merge "Lock SyncQueue when user starting, copy RSC list." into jb-mr1-dev
2012-10-16 13:32:28 -07:00
Fabrice Di Meglio
4f1e535b8d
am 9e520a6d: am d23b26b6: am b858ecd3: Merge "Fix bug #7345139 : The First Volume Down Click looses its place on the volume slider" into jb-mr1-dev
...
* commit '9e520a6dd4981d9c746b4c5e8f8b6f644570c7d7':
Fix bug #7345139 : The First Volume Down Click looses its place on the volume slider
2012-10-16 13:31:37 -07:00
Jason Sams
f5e768c46d
am 06b9df47: am 61759d99: Merge "Convert one more bind() -> setVar()." into jb-mr1-dev
...
* commit '06b9df47b0e84f85ba606d2783a4d9a0855d8767':
Convert one more bind() -> setVar().
2012-10-16 13:30:53 -07:00
Jason Sams
06b9df47b0
am 61759d99: Merge "Convert one more bind() -> setVar()." into jb-mr1-dev
...
* commit '61759d99e6cbaa68130467990d650edd6f4c74a9':
Convert one more bind() -> setVar().
2012-10-16 13:28:33 -07:00
Fabrice Di Meglio
9e520a6dd4
am d23b26b6: am b858ecd3: Merge "Fix bug #7345139 : The First Volume Down Click looses its place on the volume slider" into jb-mr1-dev
...
* commit 'd23b26b6fded61e91903cf2ff5e92092a93d8c84':
Fix bug #7345139 : The First Volume Down Click looses its place on the volume slider
2012-10-16 13:28:10 -07:00
Jeff Sharkey
a706e2fd00
Lock SyncQueue when user starting, copy RSC list.
...
Document SyncQueue locking policy and protect in onUserStarting()
and clearAllBackoffs(). Return copy of ServiceInfo list from
RegisteredServicesCache instead of exposing locking externally.
Bug: 7357776, 7352537
Change-Id: I6a32ca98a355b639d4207a88bde572179beae359
2012-10-16 13:27:12 -07:00
Fabrice Di Meglio
d23b26b6fd
am b858ecd3: Merge "Fix bug #7345139 : The First Volume Down Click looses its place on the volume slider" into jb-mr1-dev
...
* commit 'b858ecd3a94add574503d4dd21084ad289bc5c27':
Fix bug #7345139 : The First Volume Down Click looses its place on the volume slider
2012-10-16 13:25:51 -07:00
Jason Sams
61759d99e6
Merge "Convert one more bind() -> setVar()." into jb-mr1-dev
2012-10-16 13:25:06 -07:00
Irfan Sheriff
939caef712
Fix NPE
...
Bug: 7357742
Change-Id: I4d12d137b9d5ebf5c6739cbd4405de3f90a3d846
2012-10-16 13:24:19 -07:00
Fabrice Di Meglio
b858ecd3a9
Merge "Fix bug #7345139 : The First Volume Down Click looses its place on the volume slider" into jb-mr1-dev
2012-10-16 13:23:37 -07:00
Chet Haase
2f20081f9f
Avoid redundant wallpaper loading/drawing
...
Switching users causes wallpapers to get recreated 3 times. Other operations
like startup and rotation cause similar redundant load/draw operations. This change
tracks the various attributes that tell us when we really need to reload
and redraw, causing only one of these expensive operation per one of these
switches.
Issue #7334664 Wallpaper draws several times when switching users
Change-Id: Ic3072ef3a7eaf622d8632e87e34f50999f716c39
2012-10-16 13:21:04 -07:00
Stephen Hines
5b4f8f90fd
Convert one more bind() -> setVar().
...
Bug: 7318821
Change-Id: I215c70a99c81e560a73412b2263fed39a0fdae03
2012-10-16 13:19:23 -07:00
Matthew Xie
ec89b98739
am a5b03565: am 8a4dfb9c: am a3d5b688: Merge "Add serial port profile support and allow to connect to rfcomm channel without sdp discovery" into jb-mr1-dev
...
* commit 'a5b03565383f8121bae4a6abe874b2e9249525c5':
Add serial port profile support and allow to connect to rfcomm channel without sdp discovery
2012-10-16 13:05:17 -07:00