Mathias Agopian
386aa98c4f
Fix an issue where we could wait for a non-existing transaction
...
This fixes the issue:
"Call not sent" dialog takes too long to dismiss after hitting OK"
Note: the system would recover after a 5 second timeout.
Bug: 5534520
Change-Id: Ifa37e594b50581f498479a5858672441b3d7dd87
2011-11-07 21:58:03 -08:00
Mathias Agopian
0462805d1c
am 7f1c94e1: Merge "Fix rotation displays frame N-1 briefly while rotating" into ics-mr1
...
* commit '7f1c94e198e051bf481fd2d286c7b33d00664f9d':
Fix rotation displays frame N-1 briefly while rotating
2011-11-08 05:36:46 +00:00
Mathias Agopian
a5f9676ecc
Merge "Fix rotation displays frame N-1 briefly while rotating" into ics-mr1
2011-11-07 21:33:53 -08:00
Jeff Brown
3401debfe4
Merge "Improve JavaDoc on AtomicFile."
2011-11-07 21:11:36 -08:00
Daniel Sandler
68eb0869e3
am c06669a3: Merge "Fix scaling on notification panel wifi/battery icons." into ics-mr1
...
* commit 'c06669a303f2122a71e83d4813ecf78e6ff2b5a5':
Fix scaling on notification panel wifi/battery icons.
2011-11-08 03:50:34 +00:00
Daniel Sandler
7f65fd6024
Merge "Fix scaling on notification panel wifi/battery icons." into ics-mr1
2011-11-07 19:47:51 -08:00
Dianne Hackborn
c33597741c
am 84b02130: Merge "Update perf tests to always run each test in a fresh process." into ics-mr1
...
* commit '84b02130a9b3327343425cd4edfc1b85f1e9b23d':
Update perf tests to always run each test in a fresh process.
2011-11-08 02:51:40 +00:00
Dianne Hackborn
604823323a
Merge "Update perf tests to always run each test in a fresh process." into ics-mr1
2011-11-07 18:46:54 -08:00
Adam Powell
a98adad8b6
am 13194b16: Merge "Fix bug 5534414 - Unselected tab states for Holo" into ics-mr1
...
* commit '13194b16d071ce70453a49e9462cfbeb7460d633':
Fix bug 5534414 - Unselected tab states for Holo
2011-11-08 01:59:52 +00:00
Adam Powell
bed040b8ea
Merge "Fix bug 5534414 - Unselected tab states for Holo" into ics-mr1
2011-11-07 17:55:17 -08:00
John Wang
f0cbf6f5b1
am 2f99bb5e: Merge "Remain in call audio mode while phone is offhook." into ics-mr1
...
* commit '2f99bb5e4f706fee3dc1e08bdd66f58ea9844b09':
Remain in call audio mode while phone is offhook.
2011-11-08 00:50:36 +00:00
John Wang
30b08ffb38
Merge "Remain in call audio mode while phone is offhook." into ics-mr1
2011-11-07 16:46:11 -08:00
Robert Greenwalt
3ac73363e2
am 2d9ccdb4: am b445362b: Make upstream tether list threadsafe
...
* commit '2d9ccdb4abd393375c5ae99445afbb8b0855d25c':
Make upstream tether list threadsafe
2011-11-07 23:41:20 +00:00
Robert Greenwalt
514f0440c0
am b445362b: Make upstream tether list threadsafe
...
* commit 'b445362bd67cf596cfdd39db2dbe8f42cf9a119a':
Make upstream tether list threadsafe
2011-11-07 23:36:28 +00:00
John Reck
080a327ed3
am 669e1f80: Merge "Remove nativeRecordButtons" into ics-mr1
...
* commit '669e1f80a718dc2a4d259970b4e85b3c66e8ebc1':
Remove nativeRecordButtons
2011-11-07 23:25:13 +00:00
John Reck
f4a9a39b0b
Merge "Remove nativeRecordButtons" into ics-mr1
2011-11-07 15:20:38 -08:00
Andreas Huber
45c8822254
Merge "Use binary search to discover closest sync sample index, replace"
2011-11-07 15:04:56 -08:00
Svetoslav Ganov
0285974144
Merge "NumberPicker does not hide IME when flinged."
2011-11-07 15:03:07 -08:00
Adam Powell
d6022d0569
am b1dbf8e6: Merge "Change the "start deferred" fragment API to "user visible hint"" into ics-mr1
...
* commit 'b1dbf8e605c29ac00dde187579bd8ff8f18d7ba3':
Change the "start deferred" fragment API to "user visible hint"
2011-11-07 23:01:48 +00:00
Adam Powell
4a55b46f07
Merge "Change the "start deferred" fragment API to "user visible hint"" into ics-mr1
2011-11-07 14:56:36 -08:00
Peter Ng
bd76a7854d
am e1aacdfe: Merge "Added focused state to quickcontacts shortcut" into ics-mr1
...
* commit 'e1aacdfe26eabf1ff31a6ddd8590fdea360614db':
Added focused state to quickcontacts shortcut
2011-11-07 22:41:13 +00:00
Peter Ng
f3a601b176
Merge "Added focused state to quickcontacts shortcut" into ics-mr1
2011-11-07 14:37:31 -08:00
Justin Ho
56364bc875
Merge "Merge: Correctly updating Roboto HHEA table to master Bug: 5516773"
2011-11-07 14:33:35 -08:00
Jim Miller
1f3cbf90d6
am 4d8ecc65: Merge "Fix 5231823: PIN/Password polish on lock screen" into ics-mr1
...
* commit '4d8ecc65c5a747f350492b21397d7466ff628900':
Fix 5231823: PIN/Password polish on lock screen
2011-11-07 22:29:08 +00:00
Jim Miller
387b21efed
Merge "Fix 5231823: PIN/Password polish on lock screen" into ics-mr1
2011-11-07 14:24:43 -08:00
Jeff Brown
e22d8ef574
Merge "Fix possible leak in Parcel::writeDupFileDescriptor."
2011-11-07 14:05:22 -08:00
Peter Ng
9f4ac1a0be
am a50c859d: Merge "Color balancing framework assets" into ics-mr1
...
* commit 'a50c859d3f071b9d405bf461e34f11d40f20561e':
Color balancing framework assets
2011-11-07 21:44:33 +00:00
Peter Ng
68d563b546
Merge "Color balancing framework assets" into ics-mr1
2011-11-07 13:40:45 -08:00
Eric Fischer
e0e07988c4
am 08be43a6: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit '08be43a6d912fe1f34596d5e90df6b497424af02':
Import revised translations. DO NOT MERGE
2011-11-07 20:41:00 +00:00
Eric Fischer
16364a0796
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-11-07 12:36:02 -08:00
Jeff Brown
d341c7178f
Fix possible leak in Parcel::writeDupFileDescriptor.
...
Also, check the result of dup() just in case we got EMFILE
or something.
Change-Id: I18e627bd84f4c7941813fe1c2bad2cdd9e5afa83
2011-11-07 12:22:39 -08:00
Amith Yamasani
be37dde787
am 7919bfb1: Merge "Don\'t show the submit button when it isn\'t enabled." into ics-mr1
...
* commit '7919bfb12365b3f84e232235c35df957039995b7':
Don't show the submit button when it isn't enabled.
2011-11-07 19:01:22 +00:00
Amith Yamasani
6532722306
Merge "Don't show the submit button when it isn't enabled." into ics-mr1
2011-11-07 10:57:17 -08:00
Jamie Gennis
766010858e
EGL: use an in-memory the blob cache
...
This change makes the makes the stub EGL_ANDROID_blob_cache callbacks
actually use a BlobCache object.
Bug: 5474671
Change-Id: I5cbaae2dea3aad2fe306c9f57029c3f215a0863a
2011-11-07 10:48:42 -08:00
Winson Chung
009477d633
am 19c86cac: Merge "Fixing screenshot border asset." into ics-mr1
...
* commit '19c86cacb2f0ba04cc93084ba474662afb17d88f':
Fixing screenshot border asset.
2011-11-07 18:24:01 +00:00
Winson Chung
8241bb39c6
Merge "Fixing screenshot border asset." into ics-mr1
2011-11-07 10:20:37 -08:00
Daniel Sandler
656fa46a87
am 010bb273: Merge changes I0da0f04f,I93197665 into ics-mr1
...
* commit '010bb273a58444f907bb82f62f8d7274f9637b49':
Offer the user an option to launch Dreams when docked.
Teach UiModeMgr about high-end and low-end desk docks.
2011-11-07 18:15:30 +00:00
Daniel Sandler
70404410db
Merge changes I0da0f04f,I93197665 into ics-mr1
...
* changes:
Offer the user an option to launch Dreams when docked.
Teach UiModeMgr about high-end and low-end desk docks.
2011-11-07 10:11:52 -08:00
Alex Sakhartchouk
90e26fdf93
Merge "Properly passing an unused variable through."
2011-11-07 09:53:28 -08:00
The Android Open Source Project
a2d9f79b91
Reconcile with ics-mr1-release
...
Change-Id: Ib022135d56532756d171af770d4fae4e94402d9b
2011-11-07 08:30:54 -08:00
The Android Open Source Project
abe7ebb497
am 064975c2: Reconcile with ics-mr0-release ics-factoryrom-2-release
...
* commit '064975c27cbca412e682fa152ce00af14027ab4f':
Fix a leak in Parcel::writeBlob.
DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
2011-11-07 16:28:26 +00:00
The Android Open Source Project
2642a74b99
Reconcile with ics-mr0-release ics-factoryrom-2-release
...
Change-Id: I9de1253d253c7d106862534570cad0c89d2fdaf2
2011-11-07 08:22:56 -08:00
Dianne Hackborn
6ce371d6bb
am 6581043a: am 7311bd4b: Merge "Print out memory info when we get into a low memory situation." into ics-mr0
...
* commit '6581043a44ab46a47f09080eeb7c9fc9d0a2d0c0':
Print out memory info when we get into a low memory situation.
2011-11-07 15:51:38 +00:00
Mathias Agopian
d192bba3f8
am 3f24589e: Merge "workaround to set the WM refresh rate to 48 Hz for tuna devices only" into ics-mr1
...
* commit '3f24589edd860618ccf65d6653b002d13810e78b':
workaround to set the WM refresh rate to 48 Hz for tuna devices only
2011-11-07 15:51:33 +00:00
Jeff Brown
c17f56fdf1
am 88061d6b: am 5462bc63: Fix a leak in Parcel::writeBlob.
...
* commit '88061d6b38cfb4bf374039846b753a3b21ac61e1':
Fix a leak in Parcel::writeBlob.
2011-11-07 15:51:31 +00:00
Steve Block
2d3f094611
Merge changes If1bdd547,Ie43c16ae,I62b45f8b,I32b7fdc0
...
* changes:
Add tests for the fields of objects in the WebView's Java Bridge.
Adds a set of basic test for WebView's Java Bridge
Add tests for returning values from WebView's Java Bridge
Adds a new test for type coercion in WebView's Java Bridge
2011-11-07 07:37:53 -08:00
The Android Automerger
0f41ede842
merge in ics-mr1-release history after reset to ics-mr1
2011-11-06 06:46:10 -08:00
The Android Automerger
0689c381b7
merge in ics-mr0-release history after reset to ics-mr0
2011-11-06 06:28:19 -08:00
Romain Guy
a55886f987
am 2ccc47b8: Merge "Memory optimizations for libhwui Bug #5566149 " into ics-mr1
...
* commit '2ccc47b89868d4f39683e0e2bd057ce95d7d1217':
Memory optimizations for libhwui Bug #5566149
2011-11-05 19:33:49 +00:00
Robert Greenwalt
ffe419babe
am fd900f05: am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0
...
* commit 'fd900f05fb67046b97701f20626f7fd408fd8990':
Start using IP tool for advanced routing.
2011-11-05 19:33:46 +00:00