OSDN Git Service
Nick Pelly [Tue, 5 Oct 2010 01:21:57 +0000 (18:21 -0700)]
Merge "New API stubs: NdefMessage and NdefRecord." into gingerbread
Kenny Root [Tue, 5 Oct 2010 00:08:26 +0000 (17:08 -0700)]
Merge "Use pread() in ZipFileRO for Linux" into gingerbread
Gilles Debunne [Mon, 4 Oct 2010 23:42:40 +0000 (16:42 -0700)]
Merge "DO NOT MERGE. Select word no longer selects spaces between words." into gingerbread
Scott Main [Mon, 4 Oct 2010 23:31:47 +0000 (16:31 -0700)]
am
46ffeb21: docs: update homepage with more countries for market announcement
Merge commit '
46ffeb218859a543540a70b3229a48d2d96cbb4a' into gingerbread
* commit '
46ffeb218859a543540a70b3229a48d2d96cbb4a':
docs: update homepage with more countries for market announcement
Scott Main [Mon, 4 Oct 2010 22:39:24 +0000 (15:39 -0700)]
am
6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
Merge commit '
6ef33cb3b8c9ec8f6c2bb387d9a61affea64ec0d' into gingerbread
* commit '
6ef33cb3b8c9ec8f6c2bb387d9a61affea64ec0d':
docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
James Dong [Mon, 4 Oct 2010 22:35:40 +0000 (15:35 -0700)]
Merge "Resilent media time stamp adjustment" into gingerbread
Gilles Debunne [Mon, 4 Oct 2010 22:34:43 +0000 (15:34 -0700)]
Merge "Removed icon in Alert dialog header." into gingerbread
Adam Powell [Mon, 4 Oct 2010 22:24:29 +0000 (15:24 -0700)]
Merge "Fix bug
3052686 - ScrollView padding treated incorrectly" into gingerbread
Kenny Root [Mon, 4 Oct 2010 21:20:14 +0000 (14:20 -0700)]
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
Dianne Hackborn [Mon, 4 Oct 2010 21:52:12 +0000 (14:52 -0700)]
Merge "Fix issue #
3041660: Camera image flips upside down when rotating device" into gingerbread
Gilles Debunne [Mon, 4 Oct 2010 21:43:16 +0000 (14:43 -0700)]
Merge "New green in assets for battery, download, upload" into gingerbread
Joe Onorato [Mon, 4 Oct 2010 21:41:38 +0000 (14:41 -0700)]
Merge "implement the number bubbles on the status bar" into gingerbread
Scott Main [Mon, 4 Oct 2010 21:32:26 +0000 (14:32 -0700)]
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
Patrick Dubroy [Mon, 4 Oct 2010 21:20:39 +0000 (14:20 -0700)]
Merge "Fix 2-pixel offset unlock jog tab" into gingerbread
Brad Fitzpatrick [Mon, 4 Oct 2010 19:21:14 +0000 (12:21 -0700)]
Merge "Document Bitmap.createScaledBitmap" into gingerbread
Adam Powell [Mon, 4 Oct 2010 19:15:34 +0000 (12:15 -0700)]
Merge "Fix bug
3058324" into gingerbread
Gilles Debunne [Mon, 4 Oct 2010 19:06:10 +0000 (12:06 -0700)]
Merge "Bug fixes in Text selection." into gingerbread
Dianne Hackborn [Mon, 4 Oct 2010 18:58:09 +0000 (11:58 -0700)]
Merge "Don't write settings multiple times when unmounting." into gingerbread
Chia-chi Yeh [Mon, 4 Oct 2010 18:51:45 +0000 (11:51 -0700)]
Merge "RTP: Add a baseline echo suppressor." into gingerbread
Andreas Huber [Mon, 4 Oct 2010 18:45:56 +0000 (11:45 -0700)]
Merge "Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up." into gingerbread
Andreas Huber [Mon, 4 Oct 2010 18:20:21 +0000 (11:20 -0700)]
Merge "Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping." into gingerbread
Dirk Dougherty [Mon, 4 Oct 2010 18:12:07 +0000 (11:12 -0700)]
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.
Mindy Pereira [Mon, 4 Oct 2010 17:10:06 +0000 (10:10 -0700)]
Merge "DO NOT MERGE. Fix logic for switching between overscroll and scroll modes." into gingerbread
Daisuke Miyakawa [Mon, 4 Oct 2010 15:31:56 +0000 (08:31 -0700)]
Merge "Refrain warning when not appropriate. Do not merge" into gingerbread
Kenny Root [Mon, 4 Oct 2010 14:28:20 +0000 (07:28 -0700)]
Merge "ZipFileRO: moar logging and wrap close" into gingerbread
Hung-ying Tyan [Mon, 4 Oct 2010 05:43:28 +0000 (22:43 -0700)]
Merge "SIP: minor fixes." into gingerbread
Jeff Brown [Sat, 2 Oct 2010 02:01:11 +0000 (19:01 -0700)]
Merge "Wait for initial device scan to finish before updating config." into gingerbread
Jeff Brown [Sat, 2 Oct 2010 01:58:32 +0000 (18:58 -0700)]
Merge "Minor logging changes to input dispatcher to help with debugging." into gingerbread
Jeff Brown [Sat, 2 Oct 2010 01:55:43 +0000 (18:55 -0700)]
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
Kenny Root [Sat, 2 Oct 2010 01:28:28 +0000 (18:28 -0700)]
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
Jeff Brown [Sat, 2 Oct 2010 00:46:21 +0000 (17:46 -0700)]
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
James Dong [Sat, 2 Oct 2010 00:27:51 +0000 (17:27 -0700)]
Merge "Turn off media time adjustment by default" into gingerbread
Dianne Hackborn [Fri, 1 Oct 2010 23:46:29 +0000 (16:46 -0700)]
Merge "Some documentation fixes." into gingerbread
Jeff Brown [Fri, 1 Oct 2010 23:09:58 +0000 (16:09 -0700)]
Merge "Support haptic feedback for virtual keys defined in key layout." into gingerbread
Chia-chi Yeh [Fri, 1 Oct 2010 22:34:43 +0000 (15:34 -0700)]
Merge "KeyStore: Update the parameters of generating master keys." into gingerbread
Scott Main [Fri, 1 Oct 2010 22:11:10 +0000 (15:11 -0700)]
am
32441bbe: docs: device dashboard update for 10/1
Merge commit '
32441bbe61e2f02f09a319c00895aef8cfc27ff4' into gingerbread
* commit '
32441bbe61e2f02f09a319c00895aef8cfc27ff4':
docs: device dashboard update for 10/1
Jeff Brown [Fri, 1 Oct 2010 21:55:30 +0000 (14:55 -0700)]
Support haptic feedback for virtual keys defined in key layout.
Change-Id: I83e4108a87332692e03791dc066206becbc7941f
Hung-ying Tyan [Fri, 1 Oct 2010 21:52:00 +0000 (14:52 -0700)]
Merge "Add CallManager/Phone.setEchoSuppressionEnabled()." into gingerbread
Adam Powell [Fri, 1 Oct 2010 21:46:40 +0000 (14:46 -0700)]
Merge "DO NOT MERGE Fix bug
3026771, other design/asset fixes." into gingerbread
Kenny Root [Fri, 1 Oct 2010 21:06:46 +0000 (14:06 -0700)]
Merge "Add "none" for vold and deprecate mkobb -c" into gingerbread
Dianne Hackborn [Fri, 1 Oct 2010 20:39:39 +0000 (13:39 -0700)]
Merge "Fix issue #
3037083: Problem report for Pinball" into gingerbread
Steve Howard [Fri, 1 Oct 2010 20:12:39 +0000 (13:12 -0700)]
Merge "A few additions to the download manager public API documentation" into gingerbread
Andreas Huber [Fri, 1 Oct 2010 18:35:17 +0000 (11:35 -0700)]
Merge "Start playing live streams from the start, no the middle..." into gingerbread
Fabrice Di Meglio [Fri, 1 Oct 2010 18:30:50 +0000 (11:30 -0700)]
Merge "Fix bug #
3055578 ("adb shell bmgr list sets" generates NPE and cannot be run again when device has no account setup)" into gingerbread
Andreas Huber [Fri, 1 Oct 2010 18:23:24 +0000 (11:23 -0700)]
Merge "Remove development-only code." into gingerbread
Erik [Fri, 1 Oct 2010 18:08:13 +0000 (11:08 -0700)]
Merge "b/
3054044 Make allDay event times format in utc" into gingerbread
Andreas Huber [Fri, 1 Oct 2010 18:01:33 +0000 (11:01 -0700)]
Merge "Squashed commit of the following:" into gingerbread
Dianne Hackborn [Fri, 1 Oct 2010 02:03:38 +0000 (19:03 -0700)]
Merge "Rub in a little 'ol log-b-gone." into gingerbread
Joe Onorato [Fri, 1 Oct 2010 01:12:24 +0000 (18:12 -0700)]
Merge "Use the private version of userActivity." into gingerbread
Kenny Root [Fri, 1 Oct 2010 01:03:25 +0000 (18:03 -0700)]
Merge "Being already unmounted is not a failure" into gingerbread
Chia-chi Yeh [Fri, 1 Oct 2010 00:41:09 +0000 (17:41 -0700)]
Merge "RTP: Start AudioRecord before AudioTrack to avoid being disabled." into gingerbread
Eric Laurent [Fri, 1 Oct 2010 00:39:36 +0000 (17:39 -0700)]
Merge "Issue
3032913: improve AudioTrack recovery time" into gingerbread
Hung-ying Tyan [Fri, 1 Oct 2010 00:20:25 +0000 (17:20 -0700)]
Merge "SipService: turn off verbose logging" into gingerbread
Steve Howard [Thu, 30 Sep 2010 23:22:58 +0000 (16:22 -0700)]
Merge "Avoid NPE when viewing failed legacy download with no local path" into gingerbread
Jake Hamby [Thu, 30 Sep 2010 22:47:34 +0000 (15:47 -0700)]
Merge "Typo fixes in comments and minor code cleanups." into gingerbread
Jeff Brown [Thu, 30 Sep 2010 22:46:00 +0000 (15:46 -0700)]
Merge "Move verbose logging of device capabilities to dumpsys." into gingerbread
Eric Fischer [Thu, 30 Sep 2010 22:44:54 +0000 (15:44 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Jeff Brown [Thu, 30 Sep 2010 21:33:04 +0000 (14:33 -0700)]
Move verbose logging of device capabilities to dumpsys.
Change-Id: I5d55eaebfdf049bd1ac1e7bab2758886cfefc9d7
Kenny Root [Thu, 30 Sep 2010 21:27:15 +0000 (14:27 -0700)]
Merge "Fix location of gdbserver upon installation" into gingerbread
Mike Lockwood [Thu, 30 Sep 2010 20:07:06 +0000 (13:07 -0700)]
Merge "location: rebind to network location and geocoder services after package update" into gingerbread
Dianne Hackborn [Thu, 30 Sep 2010 19:40:52 +0000 (12:40 -0700)]
Merge "Fix night/notnight resource folder handling." into gingerbread
Steve Howard [Thu, 30 Sep 2010 18:11:16 +0000 (11:11 -0700)]
Merge "Have download manager give more details when downloads are paused" into gingerbread
Chia-chi Yeh [Thu, 30 Sep 2010 17:27:34 +0000 (01:27 +0800)]
KeyStore: Update the parameters of generating master keys.
To improve the security, the parameters to generate the master key has
been changed. Special cares has been taken to prevent from permanent
damages of the existing data during the transition process.
Change-Id: I0c93f3de28a9fcd314932675ccfb65a7f11fa3ff
Chia-chi Yeh [Thu, 30 Sep 2010 09:44:16 +0000 (02:44 -0700)]
Merge "KeyStore: Initialize IV correctly." into gingerbread
Chia-chi Yeh [Thu, 30 Sep 2010 09:28:01 +0000 (17:28 +0800)]
KeyStore: Initialize IV correctly.
Change-Id: Idbf207dfcc11b92e606cbf4fd3732ed7a8aa3416
Chia-chi Yeh [Thu, 30 Sep 2010 07:39:32 +0000 (00:39 -0700)]
Merge "KeyStore: Fix the return value when send() or recv() has an error." into gingerbread
Chia-chi Yeh [Thu, 30 Sep 2010 07:17:58 +0000 (15:17 +0800)]
KeyStore: Fix the return value when send() or recv() has an error.
Change-Id: I20a63c76bd29b1a9f8959a6c4fe5a5b8a9a971b4
Hung-ying Tyan [Thu, 30 Sep 2010 07:05:58 +0000 (00:05 -0700)]
Merge "Add uri field to SipManager.ListenerRelay" into gingerbread
Chia-chi Yeh [Thu, 30 Sep 2010 06:24:32 +0000 (23:24 -0700)]
Merge "RTP: Adjust the jitter buffer to 512ms." into gingerbread
Adam Powell [Thu, 30 Sep 2010 04:05:12 +0000 (21:05 -0700)]
Merge "Fix text anchors" into gingerbread
Robert Greenwalt [Thu, 30 Sep 2010 02:48:57 +0000 (19:48 -0700)]
Merge "Change the 0_fully signal icon to the new style" into gingerbread
Jeff Brown [Thu, 30 Sep 2010 02:08:02 +0000 (19:08 -0700)]
Merge "PointerLocationView: Display orientation correctly." into gingerbread
Chia-chi Yeh [Thu, 30 Sep 2010 01:32:24 +0000 (18:32 -0700)]
Merge "RTP: Enable AMR codec." into gingerbread
Hung-ying Tyan [Thu, 30 Sep 2010 01:12:12 +0000 (18:12 -0700)]
Merge "SIP: misc fixes." into gingerbread
Gilles Debunne [Thu, 30 Sep 2010 00:05:26 +0000 (17:05 -0700)]
Merge "New assets for status bar data_edge and overscroll" into gingerbread
Ying Wang [Wed, 29 Sep 2010 23:13:21 +0000 (16:13 -0700)]
Merge "Fix proguard flag file dependency." into gingerbread
Joe Onorato [Wed, 29 Sep 2010 21:25:15 +0000 (14:25 -0700)]
Merge "AnimatedImageView: Stop the animation when we're not visible." into gingerbread
David Brown [Wed, 29 Sep 2010 21:08:31 +0000 (14:08 -0700)]
Merge "Implement contacts lookup (caller-id) for incoming SIP calls." into gingerbread
Doug Zongker [Wed, 29 Sep 2010 20:41:00 +0000 (13:41 -0700)]
Merge "don't delete /cache/recovery/last_log on boot" into gingerbread
Jaikumar Ganesh [Wed, 29 Sep 2010 20:24:53 +0000 (13:24 -0700)]
Merge "Update local cache before sending intent." into gingerbread
Gilles Debunne [Wed, 29 Sep 2010 19:15:51 +0000 (12:15 -0700)]
Merge "New assets: wifi signal 1, no sim card." into gingerbread
Eric Fischer [Wed, 29 Sep 2010 19:14:10 +0000 (12:14 -0700)]
Merge "Split strings with SD card references into variations." into gingerbread
Chia-chi Yeh [Wed, 29 Sep 2010 19:12:51 +0000 (12:12 -0700)]
Merge "RTP: Enable GSM-EFR codec." into gingerbread
Chia-chi Yeh [Wed, 29 Sep 2010 18:50:16 +0000 (11:50 -0700)]
Merge "RTP: Revise the workaround of private addresses and fix bugs." into gingerbread
Joe Onorato [Wed, 29 Sep 2010 18:00:14 +0000 (11:00 -0700)]
Merge "Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""" into gingerbread
Roy West [Wed, 29 Sep 2010 17:37:11 +0000 (10:37 -0700)]
Merge "Partial fix to bug
2992589: Edit dev admin strings." into gingerbread
Kenny Root [Wed, 29 Sep 2010 14:40:32 +0000 (07:40 -0700)]
Merge "Move all the permissions check up for unmount" into gingerbread
Chia-chi Yeh [Wed, 29 Sep 2010 04:11:27 +0000 (21:11 -0700)]
Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into gingerbread
Mike Lockwood [Wed, 29 Sep 2010 03:15:55 +0000 (20:15 -0700)]
Merge "Revert "Check for the DEVICE_POWER permission in userActivity."" into gingerbread
Chia-chi Yeh [Wed, 29 Sep 2010 02:40:59 +0000 (19:40 -0700)]
Merge changes Iae1913fb,I38dbefef into gingerbread
* changes:
RTP: Enable GSM codec.
RTP: Refactor out G711 codecs into another file.
Dianne Hackborn [Wed, 29 Sep 2010 01:16:58 +0000 (18:16 -0700)]
Merge "Remove old location classes." into gingerbread
Joe Onorato [Wed, 29 Sep 2010 00:19:37 +0000 (17:19 -0700)]
Merge "Check for the DEVICE_POWER permission in userActivity." into gingerbread
Joe Onorato [Wed, 29 Sep 2010 00:18:59 +0000 (17:18 -0700)]
Merge "Fix
3041579 overscroll effect in notification area looks strange" into gingerbread
Dianne Hackborn [Wed, 29 Sep 2010 00:12:44 +0000 (17:12 -0700)]
Merge "Add location shared library for location provider APIs." into gingerbread
Eric Laurent [Tue, 28 Sep 2010 23:38:22 +0000 (16:38 -0700)]
Merge "Fix several audio effects problems." into gingerbread
Ying Wang [Tue, 28 Sep 2010 22:06:10 +0000 (15:06 -0700)]
Merge "Call functions to calculate deps and classes.jar" into gingerbread
Chia-chi Yeh [Tue, 28 Sep 2010 21:41:18 +0000 (14:41 -0700)]
Merge "RTP: Delay the initialization of AudioTrack and AudioRecord." into gingerbread
Jeff Brown [Tue, 28 Sep 2010 20:27:37 +0000 (13:27 -0700)]
Merge "Fix bug in split touches." into gingerbread
Jeff Brown [Tue, 28 Sep 2010 20:24:41 +0000 (13:24 -0700)]
Fix bug in split touches.
Change-Id: I808c2201a06938f82817058059f4ddcc9b1a9ae2
Andreas Huber [Tue, 28 Sep 2010 20:23:26 +0000 (13:23 -0700)]
Merge "Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content." into gingerbread