OSDN Git Service
Jean-Baptiste Queru [Thu, 2 Sep 2010 19:05:33 +0000 (12:05 -0700)]
resolved conflicts for merge of
bd6abed3 to gingerbread-plus-aosp
Change-Id: I5522eaf85b157efede96399856fb67a1f244dd9d
Eric Rowe [Thu, 2 Sep 2010 18:37:51 +0000 (11:37 -0700)]
am
97e58ef4: Merge "DO NOT MERGE Separate utility methods into utility class." into gingerbread
Merge commit '
97e58ef444da53165caab2a7be4fe44c154d5a0e' into gingerbread-plus-aosp
* commit '
97e58ef444da53165caab2a7be4fe44c154d5a0e':
DO NOT MERGE Separate utility methods into utility class.
Eric Rowe [Thu, 2 Sep 2010 18:35:20 +0000 (11:35 -0700)]
Merge "DO NOT MERGE Separate utility methods into utility class." into gingerbread
Xavier Ducrohet [Thu, 2 Sep 2010 18:08:03 +0000 (11:08 -0700)]
Merge "Add a --debug-mode option to aapt."
Chia-chi Yeh [Thu, 2 Sep 2010 15:17:11 +0000 (08:17 -0700)]
am
dc296b0d: Merge "SipService: reduce the usage of javax.sdp.*." into gingerbread
Merge commit '
dc296b0d4bd6fef8764c10fb4cd59c85bc5186f6' into gingerbread-plus-aosp
* commit '
dc296b0d4bd6fef8764c10fb4cd59c85bc5186f6':
SipService: reduce the usage of javax.sdp.*.
Chia-chi Yeh [Thu, 2 Sep 2010 15:13:01 +0000 (08:13 -0700)]
Merge "SipService: reduce the usage of javax.sdp.*." into gingerbread
Hung-ying Tyan [Thu, 2 Sep 2010 12:40:58 +0000 (05:40 -0700)]
am
60264b30: SipProfile: remove outgoingCallAllowed flag.
Merge commit '
60264b306453a3043442719b970f2edb3f46f51b' into gingerbread-plus-aosp
* commit '
60264b306453a3043442719b970f2edb3f46f51b':
SipProfile: remove outgoingCallAllowed flag.
Adam Powell [Thu, 2 Sep 2010 07:31:03 +0000 (00:31 -0700)]
am
79492a0d: Merge "DO NOT MERGE Overscroll continues; asset and behavior tweaks." into gingerbread
Merge commit '
79492a0d75b0b02f11f35500f79dd3fcbc6e2211' into gingerbread-plus-aosp
* commit '
79492a0d75b0b02f11f35500f79dd3fcbc6e2211':
DO NOT MERGE Overscroll continues; asset and behavior tweaks.
Adam Powell [Thu, 2 Sep 2010 07:28:14 +0000 (00:28 -0700)]
Merge "DO NOT MERGE Overscroll continues; asset and behavior tweaks." into gingerbread
Dianne Hackborn [Thu, 2 Sep 2010 06:17:20 +0000 (23:17 -0700)]
am
a1c69e08: Fix a small bug when granting permissions through activity results.
Merge commit '
a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4' into gingerbread-plus-aosp
* commit '
a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4':
Fix a small bug when granting permissions through activity results.
Dianne Hackborn [Thu, 2 Sep 2010 05:51:35 +0000 (22:51 -0700)]
am
d3efa392: Clean up some permissions.
Merge commit '
d3efa3924407da6d38aa5931ac29aa088d9eb986' into gingerbread-plus-aosp
* commit '
d3efa3924407da6d38aa5931ac29aa088d9eb986':
Clean up some permissions.
Dianne Hackborn [Thu, 2 Sep 2010 04:18:31 +0000 (21:18 -0700)]
am
bc5ec2f9: Merge "Improve messages when java process is starting." into gingerbread
Merge commit '
bc5ec2f91a7ed2836df66f1ed98b019ea1192aa1' into gingerbread-plus-aosp
* commit '
bc5ec2f91a7ed2836df66f1ed98b019ea1192aa1':
Improve messages when java process is starting.
Dianne Hackborn [Thu, 2 Sep 2010 04:15:17 +0000 (21:15 -0700)]
Merge "Improve messages when java process is starting." into gingerbread
Jason Chen [Thu, 2 Sep 2010 02:16:41 +0000 (19:16 -0700)]
am
b766ab83: DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml
Merge commit '
b766ab830a714c0b79f64265e681f454865ffe65' into gingerbread-plus-aosp
* commit '
b766ab830a714c0b79f64265e681f454865ffe65':
DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml
Hung-ying Tyan [Thu, 2 Sep 2010 01:01:31 +0000 (18:01 -0700)]
am
3424c02e: Add software features for SIP and VOIP
Merge commit '
3424c02e6b931a8bbd651ae75217bebd008b2605' into gingerbread-plus-aosp
* commit '
3424c02e6b931a8bbd651ae75217bebd008b2605':
Add software features for SIP and VOIP
Andreas Huber [Wed, 1 Sep 2010 22:56:31 +0000 (15:56 -0700)]
am
a2511da9: Merge "Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data." into gingerbread
Merge commit '
a2511da9d65b11be7f59ed3f525f77e85aeb4bef' into gingerbread-plus-aosp
* commit '
a2511da9d65b11be7f59ed3f525f77e85aeb4bef':
Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data.
James Dong [Wed, 1 Sep 2010 22:56:25 +0000 (15:56 -0700)]
am
d3c1bae4: Merge "Make sure that if initialization fails, AudioSource still behaves well." into gingerbread
Merge commit '
d3c1bae4eb78404bd1e17b7acf67087a18c83ef3' into gingerbread-plus-aosp
* commit '
d3c1bae4eb78404bd1e17b7acf67087a18c83ef3':
Make sure that if initialization fails, AudioSource still behaves well.
Andreas Huber [Wed, 1 Sep 2010 22:44:46 +0000 (15:44 -0700)]
Merge "Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data." into gingerbread
James Dong [Wed, 1 Sep 2010 22:41:10 +0000 (15:41 -0700)]
Merge "Make sure that if initialization fails, AudioSource still behaves well." into gingerbread
Dan Morrill [Wed, 1 Sep 2010 22:05:34 +0000 (15:05 -0700)]
am
a800a2ef: Merge "Adding a feature definition corresponding to support for Near-Field Communications (NFC)." into gingerbread
Merge commit '
a800a2efa29d88e198220753f07e7d9ff69ddd9b' into gingerbread-plus-aosp
* commit '
a800a2efa29d88e198220753f07e7d9ff69ddd9b':
Adding a feature definition corresponding to support for Near-Field
Dan Morrill [Wed, 1 Sep 2010 22:03:02 +0000 (15:03 -0700)]
Merge "Adding a feature definition corresponding to support for Near-Field Communications (NFC)." into gingerbread
Nick Kralevich [Wed, 1 Sep 2010 21:59:52 +0000 (14:59 -0700)]
am
05f0382b: When dropping privileges, check return values.
Merge commit '
05f0382bcf11d96760ee8cf9110099a1661eed7c' into gingerbread-plus-aosp
* commit '
05f0382bcf11d96760ee8cf9110099a1661eed7c':
When dropping privileges, check return values.
Andreas Huber [Wed, 1 Sep 2010 21:53:12 +0000 (14:53 -0700)]
am
81f339bc: Merge "Fixing the build." into gingerbread
Merge commit '
81f339bcfeee5dccb284cdeac6941179f91fe08b' into gingerbread-plus-aosp
* commit '
81f339bcfeee5dccb284cdeac6941179f91fe08b':
Fixing the build.
Kenny Root [Wed, 1 Sep 2010 21:52:54 +0000 (14:52 -0700)]
am
7c1bd7fd: Fix logic error in downgrade of system apps
Merge commit '
7c1bd7fdbf9ac539c9832693b403511b2fc7bac7' into gingerbread-plus-aosp
* commit '
7c1bd7fdbf9ac539c9832693b403511b2fc7bac7':
Fix logic error in downgrade of system apps
Andreas Huber [Wed, 1 Sep 2010 21:21:49 +0000 (14:21 -0700)]
Merge "Fixing the build." into gingerbread
Kenny Root [Wed, 1 Sep 2010 21:12:26 +0000 (14:12 -0700)]
am
fca5677a: Merge "Add null check for package settings" into gingerbread
Merge commit '
fca5677aeefc3b9cbaecefbb10d5ccbaff974391' into gingerbread-plus-aosp
* commit '
fca5677aeefc3b9cbaecefbb10d5ccbaff974391':
Add null check for package settings
Kenny Root [Wed, 1 Sep 2010 21:09:01 +0000 (14:09 -0700)]
Merge "Add null check for package settings" into gingerbread
Adam Powell [Wed, 1 Sep 2010 21:01:44 +0000 (14:01 -0700)]
am
e34fe69e: Merge "DO NOT MERGE Integrate edge effects into WebView." into gingerbread
Merge commit '
e34fe69e66d8c9bc76453347ba84261b060300f3' into gingerbread-plus-aosp
* commit '
e34fe69e66d8c9bc76453347ba84261b060300f3':
DO NOT MERGE Integrate edge effects into WebView.
Andreas Huber [Wed, 1 Sep 2010 20:57:44 +0000 (13:57 -0700)]
am
6c33904a: Merge "Now that AmrInputStream no longer relies on opencore, make sure it\'s registered in non-opencore builds." into gingerbread
Merge commit '
6c33904ad948cb64245fbc5950c839e4d9e56de3' into gingerbread-plus-aosp
* commit '
6c33904ad948cb64245fbc5950c839e4d9e56de3':
Now that AmrInputStream no longer relies on opencore, make sure it's registered in non-opencore builds.
Adam Powell [Wed, 1 Sep 2010 20:57:05 +0000 (13:57 -0700)]
Merge "DO NOT MERGE Integrate edge effects into WebView." into gingerbread
Andreas Huber [Wed, 1 Sep 2010 20:54:12 +0000 (13:54 -0700)]
Merge "Now that AmrInputStream no longer relies on opencore, make sure it's registered in non-opencore builds." into gingerbread
Andreas Huber [Wed, 1 Sep 2010 20:42:46 +0000 (13:42 -0700)]
am
412fc7cd: Merge "Keep gtalk video chat specific code consistent with rtsp changes." into gingerbread
Merge commit '
412fc7cdb6a1c4b6afe85b58fcc794fd67271942' into gingerbread-plus-aosp
* commit '
412fc7cdb6a1c4b6afe85b58fcc794fd67271942':
Keep gtalk video chat specific code consistent with rtsp changes.
Andreas Huber [Wed, 1 Sep 2010 20:39:27 +0000 (13:39 -0700)]
Merge "Keep gtalk video chat specific code consistent with rtsp changes." into gingerbread
Andreas Huber [Wed, 1 Sep 2010 20:03:27 +0000 (13:03 -0700)]
am
de2b1615: Merge "Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer." into gingerbread
Merge commit '
de2b1615d27881d98f483fc9158497fbe1fc5f8d' into gingerbread-plus-aosp
* commit '
de2b1615d27881d98f483fc9158497fbe1fc5f8d':
Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer.
Andreas Huber [Wed, 1 Sep 2010 19:59:04 +0000 (12:59 -0700)]
Merge "Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer." into gingerbread
Daniel Sandler [Wed, 1 Sep 2010 18:48:19 +0000 (11:48 -0700)]
am
b1387127: Merge "Fix build (restore deleted assets)." into gingerbread
Merge commit '
b1387127f18b73d7f1038dad6e432329b78264ae' into gingerbread-plus-aosp
* commit '
b1387127f18b73d7f1038dad6e432329b78264ae':
Fix build (restore deleted assets).
Daniel Sandler [Wed, 1 Sep 2010 18:46:16 +0000 (11:46 -0700)]
Merge "Fix build (restore deleted assets)." into gingerbread
Derek Sollenberger [Wed, 1 Sep 2010 18:32:16 +0000 (11:32 -0700)]
am
1614843e: Merge "Fix invalid comment in WebSettings." into gingerbread
Merge commit '
1614843e93d98910147380969d034009ecb23aa2' into gingerbread-plus-aosp
* commit '
1614843e93d98910147380969d034009ecb23aa2':
Fix invalid comment in WebSettings.
Derek Sollenberger [Wed, 1 Sep 2010 18:30:12 +0000 (11:30 -0700)]
Merge "Fix invalid comment in WebSettings." into gingerbread
Daniel Sandler [Wed, 1 Sep 2010 18:24:40 +0000 (11:24 -0700)]
am
8f8fcfa3: Notifications are now light-on-dark in the windowshade.
Merge commit '
8f8fcfa319e0e0af14aa8f8555be58555703af02' into gingerbread-plus-aosp
* commit '
8f8fcfa319e0e0af14aa8f8555be58555703af02':
Notifications are now light-on-dark in the windowshade.
Brian Carlstrom [Wed, 1 Sep 2010 17:44:56 +0000 (10:44 -0700)]
am
17510863: New Java-based SamplingProfiler
Merge commit '
1751086360056bc60d00f2ed2988bc82be9e7bd9' into gingerbread-plus-aosp
* commit '
1751086360056bc60d00f2ed2988bc82be9e7bd9':
New Java-based SamplingProfiler
Derek Sollenberger [Wed, 1 Sep 2010 13:12:16 +0000 (06:12 -0700)]
am
73ef5d4e: DO NOT MERGE. CHERRY-PICKED GERRIT CHANGE 60365.
Merge commit '
73ef5d4e2bcbf28ccb84580439f2f79d5cea1ec7' into gingerbread-plus-aosp
* commit '
73ef5d4e2bcbf28ccb84580439f2f79d5cea1ec7':
DO NOT MERGE. CHERRY-PICKED GERRIT CHANGE 60365.
Jesse Wilson [Wed, 1 Sep 2010 05:59:11 +0000 (22:59 -0700)]
am
795b8aa4: Merge "Removing AWT. See bug
2732079" into gingerbread
Merge commit '
795b8aa4a3d668627901b27870cddce67c239774' into gingerbread-plus-aosp
* commit '
795b8aa4a3d668627901b27870cddce67c239774':
Removing AWT. See bug
2732079
Jesse Wilson [Wed, 1 Sep 2010 05:50:31 +0000 (22:50 -0700)]
Merge "Removing AWT. See bug
2732079" into gingerbread
Chung-yih Wang [Wed, 1 Sep 2010 02:07:31 +0000 (19:07 -0700)]
am
042e9bd9: Add SIP related settings in the Settings.System.
Merge commit '
042e9bd989d9c78e23ed29011b6532743f510625' into gingerbread-plus-aosp
* commit '
042e9bd989d9c78e23ed29011b6532743f510625':
Add SIP related settings in the Settings.System.
Dianne Hackborn [Wed, 1 Sep 2010 02:03:36 +0000 (19:03 -0700)]
am
361199b5: Add PackageManager API to get information about a provider component.
Merge commit '
361199b5e742c6635d4d7a03de6cf37b31cf442c' into gingerbread-plus-aosp
* commit '
361199b5e742c6635d4d7a03de6cf37b31cf442c':
Add PackageManager API to get information about a provider component.
Dianne Hackborn [Wed, 1 Sep 2010 01:58:47 +0000 (18:58 -0700)]
am
22cd420b: Merge "Improve debug output when an ANR happens." into gingerbread
Merge commit '
22cd420bfa431b4ad55e699afadf109dcc54f201' into gingerbread-plus-aosp
* commit '
22cd420bfa431b4ad55e699afadf109dcc54f201':
Improve debug output when an ANR happens.
Dianne Hackborn [Wed, 1 Sep 2010 01:56:30 +0000 (18:56 -0700)]
Merge "Improve debug output when an ANR happens." into gingerbread
Jesse Wilson [Tue, 31 Aug 2010 23:56:51 +0000 (16:56 -0700)]
Removing AWT. See bug
2732079
Change-Id: I0f29d1edbb90b081d743807605682cb64b53b1bc
Gilles Debunne [Tue, 31 Aug 2010 23:22:54 +0000 (16:22 -0700)]
am
d2fbabad: Merge "Fixed single line state on TextView." into gingerbread
Merge commit '
d2fbabad1e1fa8de1f0809ec5a2653f8af25dbb3' into gingerbread-plus-aosp
* commit '
d2fbabad1e1fa8de1f0809ec5a2653f8af25dbb3':
Fixed single line state on TextView.
Gilles Debunne [Tue, 31 Aug 2010 23:18:06 +0000 (16:18 -0700)]
Merge "Fixed single line state on TextView." into gingerbread
Jeff Brown [Tue, 31 Aug 2010 22:49:39 +0000 (15:49 -0700)]
am
307ed31c: Merge "Remove incomplete input device enumeration NDK API." into gingerbread
Merge commit '
307ed31c93f16dd3d34348c92cb22d81ddeba6c0' into gingerbread-plus-aosp
* commit '
307ed31c93f16dd3d34348c92cb22d81ddeba6c0':
Remove incomplete input device enumeration NDK API.
Eric Laurent [Tue, 31 Aug 2010 22:46:41 +0000 (15:46 -0700)]
am
f560ceab: Merge "Audio Effects: fix problems in volume control." into gingerbread
Merge commit '
f560ceabe11b4f541c568bead61a5ec8f527151c' into gingerbread-plus-aosp
* commit '
f560ceabe11b4f541c568bead61a5ec8f527151c':
Audio Effects: fix problems in volume control.
Jeff Brown [Tue, 31 Aug 2010 22:45:32 +0000 (15:45 -0700)]
Merge "Remove incomplete input device enumeration NDK API." into gingerbread
Eric Laurent [Tue, 31 Aug 2010 22:43:36 +0000 (15:43 -0700)]
Merge "Audio Effects: fix problems in volume control." into gingerbread
Jeff Brown [Tue, 31 Aug 2010 22:20:28 +0000 (15:20 -0700)]
Remove incomplete input device enumeration NDK API.
Change-Id: I32de74ff5fcf0e29179a2aee03ddabd22fa485bb
Joe Onorato [Tue, 31 Aug 2010 22:22:04 +0000 (15:22 -0700)]
am
47471175: Can\'t have two rules building the stubs and public.xml!
Merge commit '
47471175c9d19a00d06a77aa316dcda08be97deb' into gingerbread-plus-aosp
* commit '
47471175c9d19a00d06a77aa316dcda08be97deb':
Can't have two rules building the stubs and public.xml!
Brad Fitzpatrick [Tue, 31 Aug 2010 22:02:21 +0000 (15:02 -0700)]
am
63070856: Merge "Don\'t propagate StrictMode over one-way Binder calls." into gingerbread
Merge commit '
63070856d034a2819a26560bc7f2881e501c78b7' into gingerbread-plus-aosp
* commit '
63070856d034a2819a26560bc7f2881e501c78b7':
Don't propagate StrictMode over one-way Binder calls.
Brad Fitzpatrick [Tue, 31 Aug 2010 21:58:26 +0000 (14:58 -0700)]
Merge "Don't propagate StrictMode over one-way Binder calls." into gingerbread
Andreas Huber [Tue, 31 Aug 2010 21:57:56 +0000 (14:57 -0700)]
am
48ac68e1: Merge "Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr." into gingerbread
Merge commit '
48ac68e1b117b6b55f06daced7d9d5d550853306' into gingerbread-plus-aosp
* commit '
48ac68e1b117b6b55f06daced7d9d5d550853306':
Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr.
Andreas Huber [Tue, 31 Aug 2010 21:54:37 +0000 (14:54 -0700)]
Merge "Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr." into gingerbread
Andreas Huber [Tue, 31 Aug 2010 21:45:07 +0000 (14:45 -0700)]
am
99fa510e: Merge "Better detection of connection problems - timeout if no rtcp packets arrive within a certain time, not a final frame (which may take longer)" into gingerbread
Merge commit '
99fa510e67cb973b45fc216c75bdc817421e14ae' into gingerbread-plus-aosp
* commit '
99fa510e67cb973b45fc216c75bdc817421e14ae':
Better detection of connection problems - timeout if no rtcp packets arrive within a certain time, not a final frame (which may take longer)
Jake Hamby [Tue, 31 Aug 2010 21:42:22 +0000 (14:42 -0700)]
am
6659284d: Allow Bluetooth radio to be toggled in Airplane mode.
Merge commit '
6659284d68bb04539891456700c8da2d0bae7d09' into gingerbread-plus-aosp
* commit '
6659284d68bb04539891456700c8da2d0bae7d09':
Allow Bluetooth radio to be toggled in Airplane mode.
Andreas Huber [Tue, 31 Aug 2010 21:41:51 +0000 (14:41 -0700)]
Merge "Better detection of connection problems - timeout if no rtcp packets arrive within a certain time, not a final frame (which may take longer)" into gingerbread
Xavier Ducrohet [Tue, 31 Aug 2010 21:32:53 +0000 (14:32 -0700)]
am
23827557: Merge "Add a --debug-mode option to aapt." into gingerbread
Merge commit '
2382755730206da52b64bf7bd2fad421f9a6fd0d' into gingerbread-plus-aosp
* commit '
2382755730206da52b64bf7bd2fad421f9a6fd0d':
Add a --debug-mode option to aapt.
Xavier Ducrohet [Tue, 31 Aug 2010 21:30:03 +0000 (14:30 -0700)]
Merge "Add a --debug-mode option to aapt." into gingerbread
Jean-Baptiste Queru [Tue, 31 Aug 2010 21:19:20 +0000 (14:19 -0700)]
Ignore changes from open-source master that are already here
Change-Id: I5b560ab81c5188e6a28aa6feb0be13f970e0add4
Mike Lockwood [Tue, 31 Aug 2010 20:56:00 +0000 (13:56 -0700)]
Merge "GPS: Initialize XTRA support when GPS is enabled"
Mike Lockwood [Tue, 31 Aug 2010 20:55:39 +0000 (13:55 -0700)]
Merge "GPS: Don't set XTRA download pending flag at boot time."
James Dong [Tue, 31 Aug 2010 20:25:42 +0000 (13:25 -0700)]
am
6aacad66: Merge "Add some encoding parameters for the "record" utility" into gingerbread
Merge commit '
6aacad66eba2b51251f7e2dfb8c005b5242326ca' into gingerbread-plus-aosp
* commit '
6aacad66eba2b51251f7e2dfb8c005b5242326ca':
Add some encoding parameters for the "record" utility
Joe Onorato [Tue, 31 Aug 2010 20:25:27 +0000 (13:25 -0700)]
am
54901c9e: fix the build. will revisit this change in a minute
Merge commit '
54901c9e8497b33bab1462245864e9dd119bb64c' into gingerbread-plus-aosp
* commit '
54901c9e8497b33bab1462245864e9dd119bb64c':
fix the build. will revisit this change in a minute
Brad Fitzpatrick [Mon, 30 Aug 2010 23:01:16 +0000 (16:01 -0700)]
Don't propagate StrictMode over one-way Binder calls.
This was causing stack stitching problems where a one-way call with
violations followed by a two-way call without violations was getting
the previous one-way call's violation stack stitched on to the second
caller's stack.
The solution is a little more indirect than I would've liked
(preserving the binder's onTransact flags until enforceInterface) but
was seemingly necessary to work without changing the AIDL compiler.
It should also be sufficiently cheap, since no new calls to
thread-local IPCThreadState lookups were required. The additional
work is just same-thread getter/setters on the existing
IPCThreadState.
Change-Id: I4b6db1d445c56e868e6d0d7be3ba6849f4ef23ae
James Dong [Tue, 31 Aug 2010 20:13:18 +0000 (13:13 -0700)]
Merge "Add some encoding parameters for the "record" utility" into gingerbread
Jean-Baptiste Queru [Tue, 31 Aug 2010 19:45:02 +0000 (12:45 -0700)]
am
d3e803ae: Revert "Shutdown when capacity is 0% and no charging or when battery is dead"
Merge commit '
d3e803ae28c369996f9acf6036ea99af5561949c' into gingerbread-plus-aosp
* commit '
d3e803ae28c369996f9acf6036ea99af5561949c':
Revert "Shutdown when capacity is 0% and no charging or when battery is dead"
Joe Onorato [Tue, 31 Aug 2010 19:12:27 +0000 (12:12 -0700)]
am
77881293: DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Merge commit '
77881293ad9a68dfa1c1da4b466f7b2b6465b342' into gingerbread-plus-aosp
* commit '
77881293ad9a68dfa1c1da4b466f7b2b6465b342':
DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Jeff Brown [Tue, 31 Aug 2010 06:32:40 +0000 (23:32 -0700)]
am
6eb5ac9c: Fix doc link in InputDevice.
Merge commit '
6eb5ac9ceeb3ff67d38c7ead54b4247e762f278d' into gingerbread-plus-aosp
* commit '
6eb5ac9ceeb3ff67d38c7ead54b4247e762f278d':
Fix doc link in InputDevice.
Chia-chi Yeh [Tue, 31 Aug 2010 05:06:39 +0000 (22:06 -0700)]
am
12006013: fixedfft: Only includes cpu-features.h when __arm__ is defined.
Merge commit '
12006013cc2cd0a076855ed068f5f782b24631c3' into gingerbread-plus-aosp
* commit '
12006013cc2cd0a076855ed068f5f782b24631c3':
fixedfft: Only includes cpu-features.h when __arm__ is defined.
Adam Powell [Tue, 31 Aug 2010 02:19:37 +0000 (19:19 -0700)]
am
0a77ce27: New edge effects for scrolling widgets (overscroll)
Merge commit '
0a77ce277c6ed2aa25bbea5f8cd5687c0720cb68' into gingerbread-plus-aosp
* commit '
0a77ce277c6ed2aa25bbea5f8cd5687c0720cb68':
New edge effects for scrolling widgets (overscroll)
Adam Powell [Tue, 31 Aug 2010 01:35:58 +0000 (18:35 -0700)]
am
4c72ad75: Merge "Fix bug
2918587 Infinite loop and memory leak in AdapterView" into gingerbread
Merge commit '
4c72ad75cfb413f54cb59d413a232e77c7260ef2' into gingerbread-plus-aosp
* commit '
4c72ad75cfb413f54cb59d413a232e77c7260ef2':
Fix bug
2918587 Infinite loop and memory leak in AdapterView
Adam Powell [Tue, 31 Aug 2010 01:33:20 +0000 (18:33 -0700)]
Merge "Fix bug
2918587 Infinite loop and memory leak in AdapterView" into gingerbread
Jeff Brown [Tue, 31 Aug 2010 01:22:32 +0000 (18:22 -0700)]
am
8d60866e: Input device calibration and capabilities.
Merge commit '
8d60866e2100db70ecf0502c14768a384514d7e9' into gingerbread-plus-aosp
* commit '
8d60866e2100db70ecf0502c14768a384514d7e9':
Input device calibration and capabilities.
Brad Fitzpatrick [Tue, 31 Aug 2010 01:18:54 +0000 (18:18 -0700)]
am
bb660d7e: Merge "Renaming SharedPreferences.startCommit to apply" into gingerbread
Merge commit '
bb660d7e1bed3a07a1804bd9641d9634bfaa4972' into gingerbread-plus-aosp
* commit '
bb660d7e1bed3a07a1804bd9641d9634bfaa4972':
Renaming SharedPreferences$Editor.startCommit to apply
Jeff Brown [Mon, 30 Aug 2010 10:02:23 +0000 (03:02 -0700)]
Input device calibration and capabilities.
Finished the input device capability API.
Added a mechanism for calibrating touch devices to obtain more
accurate information about the touch contact area.
Improved pointer location to show new coordinates and capabilities.
Optimized pointer location display and formatting to avoid allocating large
numbers of temporary objects. The GC churn was causing the application to
stutter very badly when more than a couple of fingers were down).
Added more diagnostics.
Change-Id: Ie25380278ed6f16c5b04cd9df848015850383498
Brad Fitzpatrick [Tue, 31 Aug 2010 01:14:44 +0000 (18:14 -0700)]
Merge "Renaming SharedPreferences$Editor.startCommit to apply" into gingerbread
Andreas Huber [Mon, 30 Aug 2010 23:16:03 +0000 (16:16 -0700)]
am
68ae91cb: Merge "Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we\'re ignoring timestamps for gtalk videochat but we still have to have a placeholder." into gingerbread
Merge commit '
68ae91cbd20939e48ad15c15405048e7ff9fe2f8' into gingerbread-plus-aosp
* commit '
68ae91cbd20939e48ad15c15405048e7ff9fe2f8':
Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we're ignoring timestamps for gtalk videochat but we still have to have a placeholder.
Andreas Huber [Mon, 30 Aug 2010 23:12:46 +0000 (16:12 -0700)]
Merge "Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we're ignoring timestamps for gtalk videochat but we still have to have a placeholder." into gingerbread
Andreas Huber [Mon, 30 Aug 2010 22:46:58 +0000 (15:46 -0700)]
am
abb8398e: Merge "Instead of closing the connection altogether if no UDP packets arrive after a certain time, try changing transports (to interleaved TCP). Also properly close the sockets on disconnection." into gingerbread
Merge commit '
abb8398e5ab40a3078902c5333126a0743ba2458' into gingerbread-plus-aosp
* commit '
abb8398e5ab40a3078902c5333126a0743ba2458':
Instead of closing the connection altogether if no UDP packets arrive after a certain time, try changing transports (to interleaved TCP). Also properly close the sockets on disconnection.
Andreas Huber [Mon, 30 Aug 2010 22:43:41 +0000 (15:43 -0700)]
Merge "Instead of closing the connection altogether if no UDP packets arrive after a certain time, try changing transports (to interleaved TCP). Also properly close the sockets on disconnection." into gingerbread
Mattias Falk [Mon, 30 Aug 2010 22:21:55 +0000 (15:21 -0700)]
am
12dbee82: Avoid NullPointerException in BrowserFrame
Merge commit '
12dbee827353ecdb690d27c3f52e26afc71e0774' into gingerbread-plus-aosp
* commit '
12dbee827353ecdb690d27c3f52e26afc71e0774':
Avoid NullPointerException in BrowserFrame
Jean-Baptiste Queru [Mon, 30 Aug 2010 22:21:51 +0000 (15:21 -0700)]
am
1d22e122: Merge "Fix a monkey crash when the new WebView is destroyed."
Merge commit '
1d22e122a6f278a432519673a8ad3e4853934461' into gingerbread-plus-aosp
* commit '
1d22e122a6f278a432519673a8ad3e4853934461':
Fix a monkey crash when the new WebView is destroyed.
Kenny Root [Mon, 30 Aug 2010 22:21:17 +0000 (15:21 -0700)]
am
2e86809b: Merge "Native libraries on SD" into gingerbread
Merge commit '
2e86809b6c79375d23c0975914efc3b66e89ac90' into gingerbread-plus-aosp
* commit '
2e86809b6c79375d23c0975914efc3b66e89ac90':
Native libraries on SD
Kenny Root [Mon, 30 Aug 2010 22:16:10 +0000 (15:16 -0700)]
Merge "Native libraries on SD" into gingerbread
Eric Laurent [Mon, 30 Aug 2010 22:04:48 +0000 (15:04 -0700)]
am
ae6bdc23: Merge "Fix issue
2952766." into gingerbread
Merge commit '
ae6bdc23bd3fc74416985b93c995c54ea588d349' into gingerbread-plus-aosp
* commit '
ae6bdc23bd3fc74416985b93c995c54ea588d349':
Fix issue
2952766.
Jean-Baptiste Queru [Mon, 30 Aug 2010 22:03:06 +0000 (15:03 -0700)]
Merge "Fix a monkey crash when the new WebView is destroyed."
Eric Laurent [Mon, 30 Aug 2010 22:02:06 +0000 (15:02 -0700)]
Merge "Fix issue
2952766." into gingerbread
Wu-cheng Li [Mon, 30 Aug 2010 20:48:07 +0000 (13:48 -0700)]
am
7ec7b997: Remove camera metering mode API.
Merge commit '
7ec7b9970cc3a6311bf043e228991adf24c43523' into gingerbread-plus-aosp
* commit '
7ec7b9970cc3a6311bf043e228991adf24c43523':
Remove camera metering mode API.
Jean-Baptiste Queru [Mon, 30 Aug 2010 20:20:57 +0000 (13:20 -0700)]
am
55a2df8c: Merge "Telephony: Control operator selection using EF_CSP data."
Merge commit '
55a2df8c773f2b0af02d0a47fa5be4f14fcbf419' into gingerbread-plus-aosp
* commit '
55a2df8c773f2b0af02d0a47fa5be4f14fcbf419':
Telephony: Control operator selection using EF_CSP data.
Jean-Baptiste Queru [Mon, 30 Aug 2010 20:20:41 +0000 (13:20 -0700)]
am
f470ed86: Merge "Support surrogate pairs when layouting text"
Merge commit '
f470ed8630e9e648727443b065b9f1c69fee34d6' into gingerbread-plus-aosp
* commit '
f470ed8630e9e648727443b065b9f1c69fee34d6':
Support surrogate pairs when layouting text
Andreas Huber [Mon, 30 Aug 2010 20:06:55 +0000 (13:06 -0700)]
am
681c5ff2: Merge "Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore." into gingerbread
Merge commit '
681c5ff2085a08835c08b97641ebdc1b37489943' into gingerbread-plus-aosp
* commit '
681c5ff2085a08835c08b97641ebdc1b37489943':
Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore.
Andreas Huber [Mon, 30 Aug 2010 20:04:21 +0000 (13:04 -0700)]
Merge "Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore." into gingerbread
OSDN Git Service
