James Dong
4576b09a11
Merge "Resilent media time stamp adjustment" into gingerbread
2010-10-04 15:35:40 -07:00
Gilles Debunne
721a4020a7
Merge "Removed icon in Alert dialog header." into gingerbread
2010-10-04 15:34:43 -07:00
Adam Powell
27a0b636ac
Merge "Fix bug 3052686 - ScrollView padding treated incorrectly" into gingerbread
2010-10-04 15:24:29 -07:00
Kenny Root
61ef747e0e
Use pread() in ZipFileRO for Linux
...
AssetManager instances are created by zygote and passed to all its
children so that they don't have to individually open
frameworks-res.apk. This creates a problem for determining the current
file offset when using lseek() on those files, because you can't
guarantee the cross-process locking of a mutex. Luckily, Linux
implements pread() to get around this suckiness.
The problem is that only Linux implements this, so we have to keep the
old locking for use on host builds with aapt and friends. aapt doesn't
have this same problem of sharing file descriptors across forked
processes, so we can keep the local AutoMutex to protect accesses of
those files.
Change-Id: Ibe9f11499a53fe345f50fbaea438815ec0fd363e
2010-10-04 15:17:19 -07:00
Dianne Hackborn
859d08676e
Merge "Fix issue #3041660 : Camera image flips upside down when rotating device" into gingerbread
2010-10-04 14:52:12 -07:00
Gilles Debunne
68a6951696
Merge "New green in assets for battery, download, upload" into gingerbread
2010-10-04 14:43:16 -07:00
Joe Onorato
87304310b0
Merge "implement the number bubbles on the status bar" into gingerbread
2010-10-04 14:41:38 -07:00
Scott Main
200c4ffccf
am ec80d7f3: docs: consistency fixit for the quickview boxes in the dev guide
...
Merge commit 'ec80d7f311b1a0899bb4caf5b380b07027e902d1' into gingerbread
* commit 'ec80d7f311b1a0899bb4caf5b380b07027e902d1':
docs: consistency fixit for the quickview boxes in the dev guide
2010-10-04 14:32:26 -07:00
Patrick Dubroy
68ef68f874
Merge "Fix 2-pixel offset unlock jog tab" into gingerbread
2010-10-04 14:20:39 -07:00
Brad Fitzpatrick
f67f0acc67
Merge "Document Bitmap.createScaledBitmap" into gingerbread
2010-10-04 12:21:14 -07:00
Adam Powell
550801abe4
Merge "Fix bug 3058324" into gingerbread
2010-10-04 12:15:34 -07:00
Gilles Debunne
a2540a0edd
Merge "Bug fixes in Text selection." into gingerbread
2010-10-04 12:06:10 -07:00
Dianne Hackborn
9b631857a8
Merge "Don't write settings multiple times when unmounting." into gingerbread
2010-10-04 11:58:09 -07:00
Chia-chi Yeh
fc4a64540c
Merge "RTP: Add a baseline echo suppressor." into gingerbread
2010-10-04 11:51:45 -07:00
Andreas Huber
4ffa384fbe
Merge "Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up." into gingerbread
2010-10-04 11:45:56 -07:00
Andreas Huber
a4953b9f5d
Merge "Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping." into gingerbread
2010-10-04 11:20:21 -07:00
Dirk Dougherty
96bd7ceaef
am ba944ccd: Doc change: update screens support table and remove outdated density/size metrics.
...
Merge commit 'ba944ccda3d61ccbe6061277fcc50c96fe2643f1' into gingerbread
* commit 'ba944ccda3d61ccbe6061277fcc50c96fe2643f1':
Doc change: update screens support table and remove outdated density/size metrics.
2010-10-04 11:12:07 -07:00
Mindy Pereira
1da40fbd47
Merge "DO NOT MERGE. Fix logic for switching between overscroll and scroll modes." into gingerbread
2010-10-04 10:10:06 -07:00
Daisuke Miyakawa
255f7cb02a
Merge "Refrain warning when not appropriate. Do not merge" into gingerbread
2010-10-04 08:31:56 -07:00
Kenny Root
a2b0e61228
Merge "ZipFileRO: moar logging and wrap close" into gingerbread
2010-10-04 07:28:20 -07:00
Hung-ying Tyan
ae4bfa97ed
Merge "SIP: minor fixes." into gingerbread
2010-10-03 22:43:28 -07:00
Jeff Brown
e8914cec61
Merge "Wait for initial device scan to finish before updating config." into gingerbread
2010-10-01 19:01:11 -07:00
Jeff Brown
f1aa6a1d6c
Merge "Minor logging changes to input dispatcher to help with debugging." into gingerbread
2010-10-01 18:58:32 -07:00
Jeff Brown
1ad00e96fe
Wait for initial device scan to finish before updating config.
...
This change narrows the opportunity for a race condition setting the
resource Configuration while devices are being updated.
Change-Id: I58efa563f4129ab0fce7108511d16a99dff7e451
2010-10-01 18:55:43 -07:00
Kenny Root
dbf6f272a2
ZipFileRO: moar logging and wrap close
...
There is apparently still a race upon reading the entry Local File
Header that can't be tracked down, so move the LFH check inside the
mutex-protected block so we can call lseek again to see where we are
when we log an error.
Also, close() can fail so use TEMP_FAILURE_RETRY on it so we don't
unwittingly leak file descriptors when Mean Mr. EINTR comes a-knocking.
Change-Id: I753abad0bd882fe28f7281c406fa76f64393ef4c
2010-10-01 18:30:59 -07:00
Jeff Brown
2806e381cf
Minor logging changes to input dispatcher to help with debugging.
...
Added dumpsys reporting to EventHub.
Made the formatting a bit clearer.
Added 'Locked' suffix to some internal methods of EventHub.
Change-Id: Ic449560bcce378f6361895d27c66854e9724abb0
2010-10-01 18:05:13 -07:00
James Dong
db193288b2
Merge "Turn off media time adjustment by default" into gingerbread
2010-10-01 17:27:51 -07:00
Dianne Hackborn
5eb17e6029
Merge "Some documentation fixes." into gingerbread
2010-10-01 16:46:29 -07:00
Jeff Brown
5629ea8fda
Merge "Support haptic feedback for virtual keys defined in key layout." into gingerbread
2010-10-01 16:09:58 -07:00
Chia-chi Yeh
533ca9650a
Merge "KeyStore: Update the parameters of generating master keys." into gingerbread
2010-10-01 15:34:43 -07:00
Scott Main
e0033c246d
am 32441bbe: docs: device dashboard update for 10/1
...
Merge commit '32441bbe61e2f02f09a319c00895aef8cfc27ff4' into gingerbread
* commit '32441bbe61e2f02f09a319c00895aef8cfc27ff4':
docs: device dashboard update for 10/1
2010-10-01 15:11:10 -07:00
Jeff Brown
956c0fb238
Support haptic feedback for virtual keys defined in key layout.
...
Change-Id: I83e4108a87332692e03791dc066206becbc7941f
2010-10-01 15:08:56 -07:00
Hung-ying Tyan
aa2d67d4b7
Merge "Add CallManager/Phone.setEchoSuppressionEnabled()." into gingerbread
2010-10-01 14:52:00 -07:00
Adam Powell
0cb6b18839
Merge "DO NOT MERGE Fix bug 3026771, other design/asset fixes." into gingerbread
2010-10-01 14:46:40 -07:00
Kenny Root
45c396e868
Merge "Add "none" for vold and deprecate mkobb -c" into gingerbread
2010-10-01 14:06:46 -07:00
Dianne Hackborn
9e4b567105
Merge "Fix issue #3037083 : Problem report for Pinball" into gingerbread
2010-10-01 13:39:39 -07:00
Steve Howard
87548ede54
Merge "A few additions to the download manager public API documentation" into gingerbread
2010-10-01 13:12:39 -07:00
Andreas Huber
c264c38e19
Merge "Start playing live streams from the start, no the middle..." into gingerbread
2010-10-01 11:35:17 -07:00
Fabrice Di Meglio
e520131959
Merge "Fix bug #3055578 ("adb shell bmgr list sets" generates NPE and cannot be run again when device has no account setup)" into gingerbread
2010-10-01 11:30:50 -07:00
Andreas Huber
16e3e00799
Merge "Remove development-only code." into gingerbread
2010-10-01 11:23:24 -07:00
Erik
b1ab6a8fff
Merge "b/3054044 Make allDay event times format in utc" into gingerbread
2010-10-01 11:08:13 -07:00
Andreas Huber
47ec74b31c
Merge "Squashed commit of the following:" into gingerbread
2010-10-01 11:01:33 -07:00
Dianne Hackborn
6381cf3b9d
Merge "Rub in a little 'ol log-b-gone." into gingerbread
2010-09-30 19:03:38 -07:00
Joe Onorato
f25ba29a5b
Merge "Use the private version of userActivity." into gingerbread
2010-09-30 18:12:24 -07:00
Kenny Root
eba1e0162a
Merge "Being already unmounted is not a failure" into gingerbread
2010-09-30 18:03:25 -07:00
Chia-chi Yeh
ded2f9d4c0
Merge "RTP: Start AudioRecord before AudioTrack to avoid being disabled." into gingerbread
2010-09-30 17:41:09 -07:00
Eric Laurent
2a6277cfd9
Merge "Issue 3032913: improve AudioTrack recovery time" into gingerbread
2010-09-30 17:39:36 -07:00
Hung-ying Tyan
9e03f93304
Merge "SipService: turn off verbose logging" into gingerbread
2010-09-30 17:20:25 -07:00
Steve Howard
77b23794f8
Merge "Avoid NPE when viewing failed legacy download with no local path" into gingerbread
2010-09-30 16:22:58 -07:00
Jake Hamby
514c70a790
Merge "Typo fixes in comments and minor code cleanups." into gingerbread
2010-09-30 15:47:34 -07:00