Wu-cheng Li
3c2dc49b88
Merge "Add javadoc for display orientation." into gingerbread
2010-10-07 05:49:27 -07:00
Hung-ying Tyan
6a046de26f
Merge "Make SipService broadcast SIP_SERVICE_UP when it's up." into gingerbread
2010-10-06 23:11:09 -07:00
Eric Fischer
3237326c9d
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2010-10-06 17:32:17 -07:00
Xavier Ducrohet
32bafef825
Merge "Parser is optional in obtainStyledAttributes." into gingerbread
2010-10-06 17:32:10 -07:00
Hung-ying Tyan
bca588d6fc
Merge "SIP: Fix busy authentication loop." into gingerbread
2010-10-06 17:29:28 -07:00
Dianne Hackborn
98fd36fe24
Merge "Make Activity.removeDialog() less strict." into gingerbread
2010-10-06 17:26:16 -07:00
Kenny Root
a135d25422
Merge "Add MountService tests and fix a bug it found" into gingerbread
2010-10-06 16:59:23 -07:00
Dianne Hackborn
84a43e7e1c
Merge "Work on issue #3062691 : GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider" into gingerbread
2010-10-06 16:56:02 -07:00
Dianne Hackborn
f1598c5442
Merge "Make USB mass storage hide keyguard when shown." into gingerbread
2010-10-06 11:19:51 -07:00
Chung-yih Wang
6bc2795c1c
Merge "Misc fixes for sim-eng build." into gingerbread
2010-10-06 01:50:25 -07:00
Fred Chung
9211b05c40
am 30264c9b: Merge "Doc change: Adding new docs for Device Admin API." into froyo
...
Merge commit '30264c9b85109ae58c1e472a747bf47464cc1632' into gingerbread
* commit '30264c9b85109ae58c1e472a747bf47464cc1632':
Doc change: Adding new docs for Device Admin API.
2010-10-05 23:39:23 -07:00
Fred Chung
0a95ad1e3b
Merge "Doc change: Adding new docs for Device Admin API." into froyo
2010-10-05 23:26:41 -07:00
Dianne Hackborn
544360db82
Merge "Fix NPE if there is no accelerometer." into gingerbread
2010-10-05 19:02:52 -07:00
Dianne Hackborn
736a4e9d21
Merge "Fix issue #3001368 : API REVIEW: android.app.Activity" into gingerbread
2010-10-05 18:56:54 -07:00
Hung-ying Tyan
824bf846ca
Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread
2010-10-05 18:33:22 -07:00
Gilles Debunne
ae6260ea5e
Merge "Fix for IndexOutOfBounds in text pasting." into gingerbread
2010-10-05 18:11:09 -07:00
Eric Laurent
2732651b34
Merge "Fixed AudioFlinger not always pausing tracks" into gingerbread
2010-10-05 17:06:16 -07:00
Adam Powell
dd81078e6c
Merge "DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll" into gingerbread
2010-10-05 16:39:24 -07:00
Dianne Hackborn
0202e358cf
Merge "Fix issue #3056500 : Problem report for ASTRO" into gingerbread
2010-10-05 14:42:04 -07:00
Joe Onorato
ade00a09c4
Merge "PowerManagerService needs yet another flag..." into gingerbread
2010-10-05 14:41:16 -07:00
Andreas Huber
ec2c1c8d2c
Merge "Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out." into gingerbread
2010-10-05 14:09:32 -07:00
Kenny Root
2daafa5af9
Merge "Remove lingering system app native libs in /data" into gingerbread
2010-10-05 14:04:26 -07:00
Jeff Brown
1a727bd085
Merge "Make secure views tolerate IME overlays." into gingerbread
2010-10-05 13:06:05 -07:00
Kenny Root
0f85f28b21
Merge "Get correct native library path on reinstall" into gingerbread
2010-10-05 12:48:46 -07:00
Dianne Hackborn
d39316d69e
Merge "DO NOT MERGE: Get rid of status bar's dim during night." into gingerbread
2010-10-05 12:48:40 -07:00
Mike Lockwood
5bf21bce37
Merge changes Ic5551c94,I0207f7f7 into gingerbread
...
* changes:
GPS: Clean up GPS API extension initialization in JNI code.
GPS: Add support for AGpsRilInterface.
2010-10-05 12:36:34 -07:00
Jeff Brown
35cf0e9854
Make secure views tolerate IME overlays.
...
Change-Id: I3cf09b9d91045f4d9c558b4aace482a7b0bbd3d8
2010-10-05 12:26:23 -07:00
Robert Greenwalt
3a6f070d32
Merge "Add supporting MCC=450(Korea)" into gingerbread
2010-10-05 11:46:12 -07:00
Brett Chabot
5e848fd6e8
Merge "Failing test cleanup." into gingerbread
2010-10-05 11:00:07 -07:00
Hung-ying Tyan
e1fd7ab671
Merge "SIP: add SERVER_UNREACHABLE error code." into gingerbread
2010-10-04 23:03:26 -07:00
Hung-ying Tyan
8ab7523752
Merge "SipService: supply PendingIntent when open a profile." into gingerbread
2010-10-04 23:02:55 -07:00
Dianne Hackborn
de5ce1388d
Merge "Make it easier to figure out whether an app can go on sd card." into gingerbread
2010-10-04 23:00:25 -07:00
Neal Nguyen
f39ed4b552
Merge "Fixing some flakiness of some DL Manager tests." into gingerbread
2010-10-04 21:07:37 -07:00
Mathias Agopian
46b489f3d4
Merge "fix [2835280] Add support for cancelling buffers to ANativeWindow" into gingerbread
2010-10-04 20:17:25 -07:00
Mathias Agopian
19957553cb
fix [2835280] Add support for cancelling buffers to ANativeWindow
...
There is a new ANativeWindow::cancelBuffer() API that can be used to
cancel any dequeued buffer, BEFORE it's been enqueued. The buffer is
returned to the list of availlable buffers. dequeue and cancel are not
mutually thread safe, they must be called from the same thread or
external synchronization must be used.
Change-Id: I86cc7985bace8b6a93ad2c75d2bef5c3c2cb4d61
2010-10-04 20:10:11 -07:00
Mathias Agopian
566b728c93
Merge "refactored screenshot code" into gingerbread
2010-10-04 20:04:42 -07:00
Mathias Agopian
7b8fda505e
Merge "new screencap command" into gingerbread
2010-10-04 20:04:37 -07:00
Adam Powell
e9a5488e1a
Merge "Fix bug 3061769" into gingerbread
2010-10-04 19:56:49 -07:00
Mathias Agopian
bfdc35dd45
Merge "fix [3008290] passion GB surface does not send surfaceChanged notification after size change." into gingerbread
2010-10-04 19:50:16 -07:00
Elliott Hughes
58db5f304d
Merge "Manually revert a single-line error inserted by OpenJDK." into gingerbread
2010-10-04 18:51:38 -07:00
James Dong
e044dfb1de
Merge "Fixed an issue where the reserved free space in the file writer was larger than intended" into gingerbread
2010-10-04 18:37:48 -07:00
Nick Pelly
377bf20f79
Merge "New API stubs: NdefMessage and NdefRecord." into gingerbread
2010-10-04 18:21:57 -07:00
Mathias Agopian
df85c455c3
refactored screenshot code
...
the core screenshot function now can capture the screen at any lower resolution
performing bilinear filtering.
we also now have some client code to interface with the screenshot service.
it's now possible to request a screenshot at a lower resolution.
Change-Id: I33689bba98507ab928d0898b21596d0d2fe4b953
2010-10-04 17:36:17 -07:00
Kenny Root
085996210c
Merge "Use pread() in ZipFileRO for Linux" into gingerbread
2010-10-04 17:08:26 -07:00
Gilles Debunne
250b2c9c16
Merge "DO NOT MERGE. Select word no longer selects spaces between words." into gingerbread
2010-10-04 16:42:40 -07:00
Scott Main
37c5dc049c
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
2010-10-04 16:31:47 -07:00
Scott Main
72f5d5b949
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
2010-10-04 15:39:24 -07:00
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
