OSDN Git Service
Brad Fitzpatrick [Thu, 21 Oct 2010 16:10:55 +0000 (09:10 -0700)]
am
15358e14: Merge "Make the base direction of the Arabic error pages RTL"
Merge commit '
15358e145622df90942a444a63ae0006713b636d' into gingerbread-plus-aosp
* commit '
15358e145622df90942a444a63ae0006713b636d':
Make the base direction of the Arabic error pages RTL
Brad Fitzpatrick [Thu, 21 Oct 2010 16:10:47 +0000 (09:10 -0700)]
am
6cf9c394: Merge "Set the base direction of the Hebrew error pages to RTL"
Merge commit '
6cf9c39452c87fe424a0ca125cf797e1c5e0830b' into gingerbread-plus-aosp
* commit '
6cf9c39452c87fe424a0ca125cf797e1c5e0830b':
Set the base direction of the Hebrew error pages to RTL
Brad Fitzpatrick [Thu, 21 Oct 2010 14:18:18 +0000 (07:18 -0700)]
Merge "Make the base direction of the Arabic error pages RTL"
Brad Fitzpatrick [Thu, 21 Oct 2010 14:18:02 +0000 (07:18 -0700)]
Merge "Set the base direction of the Hebrew error pages to RTL"
James Dong [Thu, 21 Oct 2010 04:28:38 +0000 (21:28 -0700)]
am
fa7a87fb: Merge "File writer size estimation improvement" into gingerbread
Merge commit '
fa7a87fb4b3d25b0b6b0985d65848a144d28df26' into gingerbread-plus-aosp
* commit '
fa7a87fb4b3d25b0b6b0985d65848a144d28df26':
File writer size estimation improvement
Mathias Agopian [Thu, 21 Oct 2010 04:28:34 +0000 (21:28 -0700)]
am
2b2da526: Merge "Add a test application to dump all the EGLConfig available" into gingerbread
Merge commit '
2b2da52608303b149d22418865e67c8030c70e73' into gingerbread-plus-aosp
* commit '
2b2da52608303b149d22418865e67c8030c70e73':
Add a test application to dump all the EGLConfig available
Mathias Agopian [Thu, 21 Oct 2010 04:28:29 +0000 (21:28 -0700)]
am
73655bd2: Merge "propagate RS context priority to EGLContext when possible. DO NOT MERGE." into gingerbread
Merge commit '
73655bd2d303f8b3fe5c4bb0d8e4824361647381' into gingerbread-plus-aosp
* commit '
73655bd2d303f8b3fe5c4bb0d8e4824361647381':
propagate RS context priority to EGLContext when possible. DO NOT MERGE.
Mathias Agopian [Thu, 21 Oct 2010 04:28:25 +0000 (21:28 -0700)]
am
583fefc8: Merge "Use the context_priority extension when present." into gingerbread
Merge commit '
583fefc8dcadecc7fc933513d3569dd9c16c100c' into gingerbread-plus-aosp
* commit '
583fefc8dcadecc7fc933513d3569dd9c16c100c':
Use the context_priority extension when present.
James Dong [Thu, 21 Oct 2010 03:07:57 +0000 (20:07 -0700)]
Merge "File writer size estimation improvement" into gingerbread
Mathias Agopian [Thu, 21 Oct 2010 03:05:28 +0000 (20:05 -0700)]
Merge "Add a test application to dump all the EGLConfig available" into gingerbread
Mathias Agopian [Thu, 21 Oct 2010 03:04:52 +0000 (20:04 -0700)]
Merge "propagate RS context priority to EGLContext when possible. DO NOT MERGE." into gingerbread
Mathias Agopian [Thu, 21 Oct 2010 03:04:45 +0000 (20:04 -0700)]
Merge "Use the context_priority extension when present." into gingerbread
Mathias Agopian [Thu, 21 Oct 2010 01:22:17 +0000 (18:22 -0700)]
am
a0795fc9: Merge "software renderer: fix [
3117351] GL driver doesn\'t set the EGL_NATIVE_VISUAL_ID" into gingerbread
Merge commit '
a0795fc9bdf97703780cbf0ec47c06eccb642e72' into gingerbread-plus-aosp
* commit '
a0795fc9bdf97703780cbf0ec47c06eccb642e72':
software renderer: fix [
3117351] GL driver doesn't set the EGL_NATIVE_VISUAL_ID
Jean-Baptiste Queru [Thu, 21 Oct 2010 01:16:57 +0000 (18:16 -0700)]
resolved conflicts for merge of
5d919b43 to gingerbread-plus-aosp
Change-Id: I8b8a8dfdd99052f3d43a0feb47168876b41e336d
Mathias Agopian [Thu, 21 Oct 2010 01:00:43 +0000 (18:00 -0700)]
Merge "software renderer: fix [
3117351] GL driver doesn't set the EGL_NATIVE_VISUAL_ID" into gingerbread
Mathias Agopian [Thu, 21 Oct 2010 00:21:43 +0000 (17:21 -0700)]
software renderer: fix [
3117351] GL driver doesn't set the EGL_NATIVE_VISUAL_ID
Change-Id: I371bc0abfee6065247bc6f04b0e0451645eb2dbf
Dianne Hackborn [Thu, 21 Oct 2010 00:14:59 +0000 (17:14 -0700)]
am
fb2cd0aa: Merge "Fix java doc on FLAG_EXTERNAL." into gingerbread
Merge commit '
fb2cd0aa9d140efdf78f0d920d8e3bb7db39c8de' into gingerbread-plus-aosp
* commit '
fb2cd0aa9d140efdf78f0d920d8e3bb7db39c8de':
Fix java doc on FLAG_EXTERNAL.
Dianne Hackborn [Thu, 21 Oct 2010 00:12:27 +0000 (17:12 -0700)]
Merge "Fix java doc on FLAG_EXTERNAL." into gingerbread
Mathias Agopian [Thu, 21 Oct 2010 00:10:47 +0000 (17:10 -0700)]
Add a test application to dump all the EGLConfig available
Change-Id: Iddf27f2a9dd51733f6b90081a523ca37bfe310fa
Jean-Baptiste Queru [Wed, 20 Oct 2010 23:46:52 +0000 (16:46 -0700)]
Merge "Make disabled TextViews uneditable"
Jean-Baptiste Queru [Wed, 20 Oct 2010 23:45:50 +0000 (16:45 -0700)]
am
5bfef1ba: Merge "BatteryService: Set bool to true if sysfs entry is not 0"
Merge commit '
5bfef1ba0501e237b3a0fa1abe98e5348d8c5b04' into gingerbread-plus-aosp
* commit '
5bfef1ba0501e237b3a0fa1abe98e5348d8c5b04':
BatteryService: Set bool to true if sysfs entry is not 0
Jean-Baptiste Queru [Wed, 20 Oct 2010 23:35:17 +0000 (16:35 -0700)]
Merge "BatteryService: Set bool to true if sysfs entry is not 0"
Jean-Baptiste Queru [Wed, 20 Oct 2010 23:33:51 +0000 (16:33 -0700)]
am
81925e66: Merge "Fix FastScroller overlay position bug after setFastScrollEnabled(false)-->setFastScrollEnabled(true) the overlay shows up at the top-left instead of center"
Merge commit '
81925e665c1e25d04cbc10e7333e793416bdc98f' into gingerbread-plus-aosp
* commit '
81925e665c1e25d04cbc10e7333e793416bdc98f':
Fix FastScroller overlay position bug
Jean-Baptiste Queru [Wed, 20 Oct 2010 23:29:15 +0000 (16:29 -0700)]
Merge "Fix FastScroller overlay position bug after setFastScrollEnabled(false)-->setFastScrollEnabled(true) the overlay shows up at the top-left instead of center"
Dianne Hackborn [Wed, 20 Oct 2010 23:03:37 +0000 (16:03 -0700)]
Fix java doc on FLAG_EXTERNAL.
Change-Id: Ic533b3a6c3300a986dd8d0da04243d723cf393ef
Kenny Root [Wed, 20 Oct 2010 21:13:21 +0000 (14:13 -0700)]
am
ddf8fe50: Merge "Fix isUsbMassStorageConnected() will always return true" into gingerbread
Merge commit '
ddf8fe505636d3b4435cb9952266765aab20b86d' into gingerbread-plus-aosp
* commit '
ddf8fe505636d3b4435cb9952266765aab20b86d':
Fix isUsbMassStorageConnected() will always return true
Dianne Hackborn [Wed, 20 Oct 2010 21:10:29 +0000 (14:10 -0700)]
am
e9e23405: Merge "Fix issue #
3113424: Battery stats don\'t reset on Crespo" into gingerbread
Merge commit '
e9e23405833a5fedb6a1c2dcec87d84e39d1d13d' into gingerbread-plus-aosp
* commit '
e9e23405833a5fedb6a1c2dcec87d84e39d1d13d':
Fix issue #
3113424: Battery stats don't reset on Crespo
Kenny Root [Wed, 20 Oct 2010 21:10:00 +0000 (14:10 -0700)]
Merge "Fix isUsbMassStorageConnected() will always return true" into gingerbread
Dianne Hackborn [Wed, 20 Oct 2010 21:08:26 +0000 (14:08 -0700)]
Merge "Fix issue #
3113424: Battery stats don't reset on Crespo" into gingerbread
Justin Ho [Wed, 20 Oct 2010 21:04:00 +0000 (14:04 -0700)]
am
d5aaff54: Merge "DO NOT MERGE - Updated media playback transport controls (b/
3116268)" into gingerbread
Merge commit '
d5aaff548d62c07fb5fb2d47e58161e77c401616' into gingerbread-plus-aosp
* commit '
d5aaff548d62c07fb5fb2d47e58161e77c401616':
DO NOT MERGE - Updated media playback transport controls (b/
3116268)
Hung-ying Tyan [Wed, 20 Oct 2010 21:03:54 +0000 (14:03 -0700)]
am
4056ab97: Merge "Add permission requirements to SipAudioCall and SipManager javadoc." into gingerbread
Merge commit '
4056ab97be6224dcc00ac70843544790f2d65fb7' into gingerbread-plus-aosp
* commit '
4056ab97be6224dcc00ac70843544790f2d65fb7':
Add permission requirements to SipAudioCall and SipManager javadoc.
Hung-ying Tyan [Wed, 20 Oct 2010 21:03:43 +0000 (14:03 -0700)]
am
6037a056: Fix n-way conf call in SipPhone.
Merge commit '
6037a056ea0dda27a286ddcb527b323b58a1c7c7' into gingerbread-plus-aosp
* commit '
6037a056ea0dda27a286ddcb527b323b58a1c7c7':
Fix n-way conf call in SipPhone.
Jeff Hamilton [Wed, 20 Oct 2010 20:57:26 +0000 (13:57 -0700)]
am
23392a84: Fix the build.
Merge commit '
23392a84bcb961d3fd50142ec40ce6ac6db89018' into gingerbread-plus-aosp
* commit '
23392a84bcb961d3fd50142ec40ce6ac6db89018':
Fix the build.
Hung-ying Tyan [Wed, 20 Oct 2010 20:57:20 +0000 (13:57 -0700)]
am
6fe795ec: Do another contact lookup if the first one fails and...
Merge commit '
6fe795ecd35c4d49822d349424fc71b660577dfc' into gingerbread-plus-aosp
* commit '
6fe795ecd35c4d49822d349424fc71b660577dfc':
Do another contact lookup if the first one fails and...
Hung-ying Tyan [Wed, 20 Oct 2010 20:56:59 +0000 (13:56 -0700)]
am
baced375: Merge "Silently reject a ringing call when another call is dialing/ringing." into gingerbread
Merge commit '
baced375ba5f374445c44a2115700d69693794a0' into gingerbread-plus-aosp
* commit '
baced375ba5f374445c44a2115700d69693794a0':
Silently reject a ringing call when another call is dialing/ringing.
Dianne Hackborn [Wed, 20 Oct 2010 20:56:03 +0000 (13:56 -0700)]
am
74b1ed32: Fix issue #
3113219: NativeActivity using wrong lib path with Java code
Merge commit '
74b1ed3231b8cafcf4e5cb3f03d794acd5080004' into gingerbread-plus-aosp
* commit '
74b1ed3231b8cafcf4e5cb3f03d794acd5080004':
Fix issue #
3113219: NativeActivity using wrong lib path with Java code
Hung-ying Tyan [Wed, 20 Oct 2010 20:54:25 +0000 (13:54 -0700)]
am
1180f2a0: Merge "Remove ringtone API from SipAudioCall." into gingerbread
Merge commit '
1180f2a099a134c40f923c7e4162a5e7d7ca0184' into gingerbread-plus-aosp
* commit '
1180f2a099a134c40f923c7e4162a5e7d7ca0184':
Remove ringtone API from SipAudioCall.
Dirk Dougherty [Wed, 20 Oct 2010 20:54:09 +0000 (13:54 -0700)]
am
3466e1fc: Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread
Merge commit '
3466e1fc6db1fed35e2707c67a9ab17673aaf9de' into gingerbread-plus-aosp
* commit '
3466e1fc6db1fed35e2707c67a9ab17673aaf9de':
Doc change: escape angle brackets in javadoc comment.
Justin Ho [Wed, 20 Oct 2010 20:35:40 +0000 (13:35 -0700)]
Merge "DO NOT MERGE - Updated media playback transport controls (b/
3116268)" into gingerbread
Hung-ying Tyan [Wed, 20 Oct 2010 20:28:02 +0000 (13:28 -0700)]
Merge "Add permission requirements to SipAudioCall and SipManager javadoc." into gingerbread
Hung-ying Tyan [Wed, 20 Oct 2010 14:49:33 +0000 (22:49 +0800)]
Fix n-way conf call in SipPhone.
+ Avoid concurrent modification when forming >3-way conf call.
+ Revise SipConnection.separate() to put the newly separated call to foreground.
Bug:
3114987
Change-Id: If6204e7e3cc05f4a516c33657a368b53a0ad014d
Justin Ho [Wed, 20 Oct 2010 19:44:46 +0000 (12:44 -0700)]
DO NOT MERGE - Updated media playback transport controls (b/
3116268)
Change-Id: Ic496308d4f72e9135e35a1b29bc20feb990c3507
Hung-ying Tyan [Mon, 18 Oct 2010 11:45:59 +0000 (19:45 +0800)]
Add permission requirements to SipAudioCall and SipManager javadoc.
Bug:
3116259
Change-Id: I00a033794e9d3e1c2d2ccfe4e612cd50003ec2ee
Dianne Hackborn [Wed, 20 Oct 2010 19:24:51 +0000 (12:24 -0700)]
Fix issue #
3113424: Battery stats don't reset on Crespo
Change-Id: I38cc3cdfa9cb1466fe3659f001ee57aecf9df179
Jeff Hamilton [Wed, 20 Oct 2010 19:20:29 +0000 (14:20 -0500)]
Fix the build.
Change-Id: Id5bfa0f91e6ec687201a320a1eb4d8a46050875e
Hung-ying Tyan [Wed, 20 Oct 2010 03:12:02 +0000 (11:12 +0800)]
Do another contact lookup if the first one fails and...
it's a SIP call and the peer's username is all numeric. The all-numeric username
could be a PSTN number.
Bug:
3105116 (case #2)
Change-Id: I1de9cfac3aab1c4c89935176264d07693adb5e7d
Hung-ying Tyan [Wed, 20 Oct 2010 18:49:26 +0000 (11:49 -0700)]
Merge "Silently reject a ringing call when another call is dialing/ringing." into gingerbread
Hung-ying Tyan [Tue, 19 Oct 2010 10:35:32 +0000 (18:35 +0800)]
Silently reject a ringing call when another call is dialing/ringing.
http://b/issue?id=
3109483
http://b/issue?id=
3103072
Change-Id: I34f13225319c7f2a41e1ea9e25811866432ab809
Shachar Shemesh [Tue, 19 Oct 2010 13:05:40 +0000 (15:05 +0200)]
Make the base direction of the Arabic error pages RTL
Change-Id: I10df9cb92d18850e8893298b2edfd9e57ca5cfef
Shachar Shemesh [Tue, 19 Oct 2010 13:04:02 +0000 (15:04 +0200)]
Set the base direction of the Hebrew error pages to RTL
Change-Id: I435e724f9638e294b7e03527e7c6244a307f010e
Dianne Hackborn [Wed, 20 Oct 2010 17:22:45 +0000 (10:22 -0700)]
Fix issue #
3113219: NativeActivity using wrong lib path with Java code
Use the same path whether the .apk has dalvik code or not.
Change-Id: I66397d7f7e328d5580565ceb17a941afac0e0f8b
Tony Wu [Mon, 9 Aug 2010 08:49:19 +0000 (16:49 +0800)]
Fix isUsbMassStorageConnected() will always return true
After UMS mounted, isUsbMassStorageConnected() will always return true even if USB is disconnected.
It's because mUmsEnabling will always be ture.
Change-Id: Ib24b2359ea2684eb0a9faeb880f383e87630e6e1
Hung-ying Tyan [Wed, 20 Oct 2010 16:47:45 +0000 (09:47 -0700)]
Merge "Remove ringtone API from SipAudioCall." into gingerbread
Dirk Dougherty [Wed, 20 Oct 2010 16:34:24 +0000 (09:34 -0700)]
Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread
Hung-ying Tyan [Wed, 20 Oct 2010 10:07:01 +0000 (18:07 +0800)]
Remove ringtone API from SipAudioCall.
(watch out auto-merge conflict for SipAudioCall).
Bug:
3113033, related CL: https://android-git/g/#change,75185
Change-Id: Ib48d3b990e229e0b341e47e10e76934e1a50d10f
Hung-ying Tyan [Wed, 20 Oct 2010 06:03:25 +0000 (23:03 -0700)]
am
b595e094: Merge "Return display name in SipConnection.getCnapName()." into gingerbread
Merge commit '
b595e094e3901ff8a224eaf7d4869e7d2e5649dd' into gingerbread-plus-aosp
* commit '
b595e094e3901ff8a224eaf7d4869e7d2e5649dd':
Return display name in SipConnection.getCnapName().
Hung-ying Tyan [Wed, 20 Oct 2010 06:00:16 +0000 (23:00 -0700)]
Merge "Return display name in SipConnection.getCnapName()." into gingerbread
James Dong [Wed, 20 Oct 2010 04:28:47 +0000 (21:28 -0700)]
File writer size estimation improvement
o Do not count the reserved space for moov if the meta data size is small
o Do not count the extra 1KB disturbing small file estimation.
o Reduce the default minimum reserved space from 4 KB to 3 KB.
o Estimate the moov size based on both duration AND file size limit is set
and set it to the smaller estimated value.
low risk change
bug -
3111983
Change-Id: I6ac2adb979d8cc12d6b4f1813d000c989add0199
Hung-ying Tyan [Wed, 20 Oct 2010 02:00:54 +0000 (10:00 +0800)]
Return display name in SipConnection.getCnapName().
Bug:
3105116 (case #1)
Change-Id: Iedf3c8de07213c786cffb861bd52c3b4a768a86c
Mathias Agopian [Wed, 20 Oct 2010 01:26:28 +0000 (18:26 -0700)]
am
f4cd9be0: Merge "fix [
2236865] STOPSHIP: bump soft gl and egl minor version number" into gingerbread
Merge commit '
f4cd9be0390135269e22e42fd2e1fe61fdcf9863' into gingerbread-plus-aosp
* commit '
f4cd9be0390135269e22e42fd2e1fe61fdcf9863':
fix [
2236865] STOPSHIP: bump soft gl and egl minor version number
Mathias Agopian [Wed, 20 Oct 2010 01:23:19 +0000 (18:23 -0700)]
Merge "fix [
2236865] STOPSHIP: bump soft gl and egl minor version number" into gingerbread
Mindy Pereira [Wed, 20 Oct 2010 01:23:18 +0000 (18:23 -0700)]
am
6fbc5d9c: DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.
Merge commit '
6fbc5d9c19388e8f1c9a1833bc0e15fcf6b499f1' into gingerbread-plus-aosp
* commit '
6fbc5d9c19388e8f1c9a1833bc0e15fcf6b499f1':
DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.
Scott Main [Wed, 20 Oct 2010 00:43:37 +0000 (17:43 -0700)]
am
218bf884: am
a6df4b1b: docs: add note to froyo platform doc that not all locales are included in the sdk image
Merge commit '
218bf88446d01fb2f8d79eec3be59bee995f9cb0' into gingerbread-plus-aosp
* commit '
218bf88446d01fb2f8d79eec3be59bee995f9cb0':
docs: add note to froyo platform doc that not all locales are included in the sdk image
Mindy Pereira [Wed, 20 Oct 2010 00:36:01 +0000 (17:36 -0700)]
DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.
Fixes b/
3111778 overscroll glitch in news & weather
Change-Id: Ic255da1f7c4301ea3980acc4fa033c9f17a60dac
Scott Main [Wed, 20 Oct 2010 00:29:29 +0000 (17:29 -0700)]
am
a6df4b1b: docs: add note to froyo platform doc that not all locales are included in the sdk image
Merge commit '
a6df4b1bfdb8de7de9b52bee4d01c65941f2d722' into gingerbread
* commit '
a6df4b1bfdb8de7de9b52bee4d01c65941f2d722':
docs: add note to froyo platform doc that not all locales are included in the sdk image
Scott Main [Tue, 19 Oct 2010 23:40:14 +0000 (16:40 -0700)]
docs: add note to froyo platform doc that not all locales are included in the sdk image
Change-Id: Icf11a14e0db6eeff535ca51de7a664a4829a35ec
Jean-Baptiste Queru [Tue, 19 Oct 2010 22:22:13 +0000 (15:22 -0700)]
am
db723ea0: Merge "jni: Remove duplicated jniThrowException()"
Merge commit '
db723ea0f70392f712542edb1114fc15e782cdb7' into gingerbread-plus-aosp
* commit '
db723ea0f70392f712542edb1114fc15e782cdb7':
jni: Remove duplicated jniThrowException()
Mathias Agopian [Tue, 19 Oct 2010 21:47:08 +0000 (14:47 -0700)]
fix [
2236865] STOPSHIP: bump soft gl and egl minor version number
Change-Id: Ibf46b18d7493348e189f2c93e969a6cac61f68b5
Jean-Baptiste Queru [Tue, 19 Oct 2010 21:42:52 +0000 (14:42 -0700)]
Merge "jni: Remove duplicated jniThrowException()"
Chung-yih Wang [Tue, 19 Oct 2010 21:17:44 +0000 (14:17 -0700)]
am
4944fdd7: Periodically scan wifi when wifi is not connected and wifi lock is grabbed in SipService.
Merge commit '
4944fdd771d2a629b3c1af8097df5eb2de02d9ee' into gingerbread-plus-aosp
* commit '
4944fdd771d2a629b3c1af8097df5eb2de02d9ee':
Periodically scan wifi when wifi is not connected and wifi lock is
Hung-ying Tyan [Tue, 19 Oct 2010 21:14:15 +0000 (14:14 -0700)]
am
0a6e717f: Handle dialing a SIP call to self.
Merge commit '
0a6e717fb6846f66b8dc853e079f2166307bfc60' into gingerbread-plus-aosp
* commit '
0a6e717fb6846f66b8dc853e079f2166307bfc60':
Handle dialing a SIP call to self.
Chung-yih Wang [Tue, 19 Oct 2010 09:39:51 +0000 (17:39 +0800)]
Periodically scan wifi when wifi is not connected and wifi lock is
grabbed in SipService.
bug: http://b/
3077454
Change-Id: I153974325c29e0f927c8eb7fdbc4725aaf10087d
Hung-ying Tyan [Mon, 18 Oct 2010 13:04:18 +0000 (21:04 +0800)]
Handle dialing a SIP call to self.
Reply BUSY HERE response so server may redirect the call to the voice mailbox.
http://b/issue?id=
3103072
http://b/issue?id=
3109479
Change-Id: I81f5dd59ad87298dd9dda87084538ee460eabba8
Brad Fitzpatrick [Tue, 19 Oct 2010 19:44:19 +0000 (12:44 -0700)]
am
59993d9b: Merge "Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX" into gingerbread
Merge commit '
59993d9bc589089e6be55371c6536a42afe21a64' into gingerbread-plus-aosp
* commit '
59993d9bc589089e6be55371c6536a42afe21a64':
Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX
Brad Fitzpatrick [Tue, 19 Oct 2010 19:40:53 +0000 (12:40 -0700)]
Merge "Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX" into gingerbread
Joe Onorato [Tue, 19 Oct 2010 19:29:43 +0000 (12:29 -0700)]
am
bdf1706a: Merge "Reduce logging." into gingerbread
Merge commit '
bdf1706ac680c0fe74765b8d6d34823b8ac05306' into gingerbread-plus-aosp
* commit '
bdf1706ac680c0fe74765b8d6d34823b8ac05306':
Reduce logging.
Brad Fitzpatrick [Tue, 19 Oct 2010 19:25:46 +0000 (12:25 -0700)]
am
987e8d7f: Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread
Merge commit '
987e8d7f9748018d3fee5778645b267a9ee06ff6' into gingerbread-plus-aosp
* commit '
987e8d7f9748018d3fee5778645b267a9ee06ff6':
Fix Vibrator permission CTS test broken earlier.
Joe Onorato [Tue, 19 Oct 2010 19:23:51 +0000 (12:23 -0700)]
Merge "Reduce logging." into gingerbread
Brad Fitzpatrick [Tue, 19 Oct 2010 19:19:41 +0000 (12:19 -0700)]
Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX
Bug:
3110967
Change-Id: I156070956528c8c7d1eb6db5d2e8bb1fe119178d
Brad Fitzpatrick [Tue, 19 Oct 2010 19:12:31 +0000 (12:12 -0700)]
Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread
Joe Onorato [Mon, 18 Oct 2010 23:13:23 +0000 (19:13 -0400)]
Reduce logging.
Remember, the system and main logs are
- Shared resources
- Primarily for recording problems
- To be used only for large grained events during normal operation
Bug:
3104855
Change-Id: I136fbd101917dcbc8ebc3f96f276426b48bde7b7
Chris Tate [Tue, 19 Oct 2010 19:04:44 +0000 (12:04 -0700)]
am
18580319: DO NOT MERGE. Turn down backup logging for release.
Merge commit '
1858031946b3627b599475c5894655362e510351' into gingerbread-plus-aosp
* commit '
1858031946b3627b599475c5894655362e510351':
DO NOT MERGE. Turn down backup logging for release.
Chris Tate [Tue, 19 Oct 2010 18:22:03 +0000 (11:22 -0700)]
DO NOT MERGE. Turn down backup logging for release.
Change-Id: Ib9f4fd15981fcf52b5d5912995c1891836303427
Brad Fitzpatrick [Tue, 19 Oct 2010 16:33:09 +0000 (09:33 -0700)]
Fix Vibrator permission CTS test broken earlier.
Bug:
3106964
Change-Id: I76138780ac64f761fe09ef8ba74382c7ee05d794
Andreas Huber [Tue, 19 Oct 2010 17:08:32 +0000 (10:08 -0700)]
am
52bea277: Merge "If we encounter video stream EOS while seeking we may still need to seek audio." into gingerbread
Merge commit '
52bea277ff92a2a1780e035c82c72082434e7b16' into gingerbread-plus-aosp
* commit '
52bea277ff92a2a1780e035c82c72082434e7b16':
If we encounter video stream EOS while seeking we may still need to seek audio.
Andreas Huber [Tue, 19 Oct 2010 16:59:01 +0000 (09:59 -0700)]
Merge "If we encounter video stream EOS while seeking we may still need to seek audio." into gingerbread
Andreas Huber [Tue, 19 Oct 2010 16:34:44 +0000 (09:34 -0700)]
If we encounter video stream EOS while seeking we may still need to seek audio.
Change-Id: Ie260942247b6810ca94e86328a3725d75b12181d
related-to-bug:
3108724
Kenny Root [Tue, 19 Oct 2010 16:33:30 +0000 (09:33 -0700)]
am
928b0748: Merge "Don\'t symlink native library paths for old apps" into gingerbread
Merge commit '
928b07480bc5372f2b959bce7b4a3b49651b49b8' into gingerbread-plus-aosp
* commit '
928b07480bc5372f2b959bce7b4a3b49651b49b8':
Don't symlink native library paths for old apps
Kenny Root [Tue, 19 Oct 2010 16:28:28 +0000 (09:28 -0700)]
Merge "Don't symlink native library paths for old apps" into gingerbread
Wu-cheng Li [Tue, 19 Oct 2010 15:44:13 +0000 (08:44 -0700)]
am
f73d48d7: Merge "Fix some camera orientation javadoc errors." into gingerbread
Merge commit '
f73d48d754b11f6ed0fba017f5bc8f27acdfbe4f' into gingerbread-plus-aosp
* commit '
f73d48d754b11f6ed0fba017f5bc8f27acdfbe4f':
Fix some camera orientation javadoc errors.
Wu-cheng Li [Tue, 19 Oct 2010 14:54:17 +0000 (07:54 -0700)]
Merge "Fix some camera orientation javadoc errors." into gingerbread
Wu-cheng Li [Fri, 15 Oct 2010 06:42:23 +0000 (14:42 +0800)]
Fix some camera orientation javadoc errors.
bug:
3105659
Change-Id: I0e54f6dd3aa8aeb2494f2596130a5aeb9e1449ba
Chung-yih Wang [Tue, 19 Oct 2010 06:21:11 +0000 (23:21 -0700)]
am
b4116c09: Fix the incorrect environment variable name for the thread pool size.
Merge commit '
b4116c09fb9784551911ea0a10b4dd321ff9aa7d' into gingerbread-plus-aosp
* commit '
b4116c09fb9784551911ea0a10b4dd321ff9aa7d':
Fix the incorrect environment variable name for the thread pool size.
Chung-yih Wang [Tue, 19 Oct 2010 02:20:21 +0000 (10:20 +0800)]
Fix the incorrect environment variable name for the thread pool size.
bug: http://b/
3099715
Change-Id: I531048414f22c8edcd9c4f815c12a0bdd6347640
Sylvain Fonteneau [Tue, 19 Oct 2010 02:13:29 +0000 (19:13 -0700)]
am
dd7341f7: Added missing implementation for NdefRecord.
Merge commit '
dd7341f775ca4d86091f4106d6dfef9214073a7d' into gingerbread-plus-aosp
* commit '
dd7341f775ca4d86091f4106d6dfef9214073a7d':
Added missing implementation for NdefRecord.
Sylvain Fonteneau [Sun, 17 Oct 2010 22:32:33 +0000 (15:32 -0700)]
Added missing implementation for NdefRecord.
Implemented constructor using a byte array to parse.
Added missing exception in method declaration, leading to update api/current.xml
Change-Id: I2660484aef1225e90c2f32a572041a2c3aecf288
Scott Main [Tue, 19 Oct 2010 01:58:06 +0000 (18:58 -0700)]
am
453c6d44: add api level 9 \'since\' flag to docs
Merge commit '
453c6d449b6469dde9aae6044dedfe3be0da76c5' into gingerbread-plus-aosp
* commit '
453c6d449b6469dde9aae6044dedfe3be0da76c5':
add api level 9 'since' flag to docs
Scott Main [Tue, 19 Oct 2010 01:41:52 +0000 (18:41 -0700)]
add api level 9 'since' flag to docs
Change-Id: Ia28ed9b4791cddfa0ee11b86c392dff7caca1dd8
Dianne Hackborn [Tue, 19 Oct 2010 01:41:12 +0000 (18:41 -0700)]
am
3d2818d3: Remove public resource padding.
Merge commit '
3d2818d34feab5a62dfb33452f99f2d3ca667cc8' into gingerbread-plus-aosp
* commit '
3d2818d34feab5a62dfb33452f99f2d3ca667cc8':
Remove public resource padding.
Dianne Hackborn [Mon, 18 Oct 2010 20:10:49 +0000 (13:10 -0700)]
Remove public resource padding.
Change-Id: I8a530a23284a1f2515b1340a1c5e5ed3a0b90780
OSDN Git Service
