David Krause
a614b948e1
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
2009-10-09 01:28:12 -07:00
Robert Greenwalt
6105ea00a8
am 98e0b146: Make PhoneStateListeners not call TelephonyManager
...
Merge commit '98e0b146b80670b52805b4b210ef5582dad6bb68' into eclair-plus-aosp
* commit '98e0b146b80670b52805b4b210ef5582dad6bb68':
Make PhoneStateListeners not call TelephonyManager
2009-10-09 01:22:57 -07:00
Robert Greenwalt
2515cf85d5
am 98e0b146: Make PhoneStateListeners not call TelephonyManager
...
Merge commit '98e0b146b80670b52805b4b210ef5582dad6bb68' into eclair-mr2
* commit '98e0b146b80670b52805b4b210ef5582dad6bb68':
Make PhoneStateListeners not call TelephonyManager
2009-10-09 01:22:22 -07:00
Robert Greenwalt
98e0b146b8
Make PhoneStateListeners not call TelephonyManager
...
Since the StatusBarPolicy is run in the System Process and shouldn't therefore call into
the Telephony process we decided to make sure all the needed info was passed along with the
original notifications.
bug: 2173053
2009-10-09 00:54:31 -07:00
Grace Kloba
a1c0506e3f
am 1184313c: Setting WebCore cache limit depending on the memory class.
...
Merge commit '1184313cbea3b34a4596a90be7081551d36f251a' into eclair-mr2
* commit '1184313cbea3b34a4596a90be7081551d36f251a':
Setting WebCore cache limit depending on the memory class.
2009-10-09 00:10:58 -07:00
Grace Kloba
fbe7f6d5ab
am 1184313c: Setting WebCore cache limit depending on the memory class.
...
Merge commit '1184313cbea3b34a4596a90be7081551d36f251a' into eclair-plus-aosp
* commit '1184313cbea3b34a4596a90be7081551d36f251a':
Setting WebCore cache limit depending on the memory class.
2009-10-09 00:10:32 -07:00
Grace Kloba
1184313cbe
Setting WebCore cache limit depending on the memory class.
...
Fix http://b/issue?id=2176656
2009-10-08 21:01:49 -07:00
Dan Egnor
371071c195
am e9d8f545: am 6903d5ce: Merge change Iee649a81 into eclair
...
Merge commit 'e9d8f545bf0ae577733c6aefc0f7cb671f61af5e' into eclair-mr2-plus-aosp
* commit 'e9d8f545bf0ae577733c6aefc0f7cb671f61af5e':
2009-10-08 20:30:42 -07:00
Jeff Sharkey
6815a67c53
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
2009-10-08 20:30:41 -07:00
Dan Egnor
0051660cea
am 6903d5ce: Merge change Iee649a81 into eclair
...
Merge commit '6903d5cedcffa005818c497f672cf16c2dff619c' into eclair-plus-aosp
* commit '6903d5cedcffa005818c497f672cf16c2dff619c':
Add LAST_KMSG_KB variable, used to tune the size of /proc/last_kmsg uploads.
2009-10-08 20:25:10 -07:00
Dan Egnor
e9d8f545bf
am 6903d5ce: Merge change Iee649a81 into eclair
...
Merge commit '6903d5cedcffa005818c497f672cf16c2dff619c' into eclair-mr2
* commit '6903d5cedcffa005818c497f672cf16c2dff619c':
Add LAST_KMSG_KB variable, used to tune the size of /proc/last_kmsg uploads.
2009-10-08 20:24:20 -07:00
Android (Google) Code Review
6903d5cedc
Merge change Iee649a81 into eclair
...
* changes:
Add LAST_KMSG_KB variable, used to tune the size of /proc/last_kmsg uploads. See bug 2177046.
2009-10-08 23:19:03 -04:00
Daisuke Miyakawa
a6a96cf40e
am c93b88cf: Remove redundant comment. As of now, we cannot guarantee anything toward external developers.
...
Merge commit 'c93b88cf5fddb30d3f600cee51dc32a1a602a8b1' into eclair-mr2-plus-aosp
* commit 'c93b88cf5fddb30d3f600cee51dc32a1a602a8b1':
Remove redundant comment. As of now, we cannot guarantee anything toward external developers.
2009-10-08 20:14:13 -07:00
Daisuke Miyakawa
258bc9cb44
am 5a016488: Merge commit \'refs/changes/08/29008/8\' of ssh://dmiyakawa@android-git.corp.google.com:29418/platform/frameworks/base into cleanup_import
...
Merge commit '5a016488da5ff6c1ecdff0b1febd836cc1711531' into eclair-mr2-plus-aosp
* commit '5a016488da5ff6c1ecdff0b1febd836cc1711531':
Develop ContentResolver-based unit tests for vCard importer and fix vCard code
2009-10-08 20:09:31 -07:00
Daisuke Miyakawa
c93b88cf5f
Remove redundant comment. As of now, we cannot guarantee anything toward external developers.
...
Internal issue number: 2160039
2009-10-08 20:06:16 -07:00
Daisuke Miyakawa
5a016488da
Merge commit 'refs/changes/08/29008/8' of ssh://dmiyakawa@android-git.corp.google.com:29418/platform/frameworks/base into cleanup_import
...
Conflicts:
core/java/android/pim/vcard/ContactStruct.java
2009-10-08 19:57:36 -07:00
Dan Egnor
ee649a811b
Add LAST_KMSG_KB variable, used to tune the size of /proc/last_kmsg uploads.
...
See bug 2177046.
2009-10-08 19:51:51 -07:00
Daisuke Miyakawa
5c3e687965
Develop ContentResolver-based unit tests for vCard importer and fix vCard code
...
along with the tests
Make test code not only check the validity of VCardParser but also check
the validity of the data insertion part of ContactStruct class, using
MockContentResolver/MockContentProvider. With these tests, we are now really sure
vCard side appropriately sends vCard data into the resolver.
Fix ContactStruct so that it properly handles ORG property and TITLE property,
though it still does not see Group information. There's no vCard found which
uses Group and ORG and TITLE in convolted orders...
e.g. Current implementation misinterprets the following case, but we're not sure
whether any exporter emits data in this kind of complicated form...
group2.ORG:ComparyA
group1.ORG:CompanyB
group1.TITLE:TitleForA
group2.TITLE:TitleForB
Expected: CompanyA + TitleForA, CompanyB + TitleForB
Actual: CompanyA + TitleForB, CompanyB + TitleForA
Also change the parser part a little, so that some component can be reused via
the other part of vCard code.
Added several additional files for the tests, which ensures that
- ORG/TITLE properties are handled as we expect.
- PREF is appropriately handled and passed to the resolver as "IS_PRIMARY" flag.
-- We discarded the code which ensures that "IS_PRIMARY" is added to only one
field in each type, after the local discussion (the duplication or no primary
state should be handled by the resolver).
Internal Issue number: 2160039
2009-10-08 19:33:33 -07:00
Jim Miller
65f0f97aa7
am b1fdb1d3: am ad60e7fe: Merge change I9485aec1 into eclair
...
Merge commit 'b1fdb1d33600f0b2f199068254900b240572e472' into eclair-mr2-plus-aosp
* commit 'b1fdb1d33600f0b2f199068254900b240572e472':
2009-10-08 19:19:09 -07:00
Dianne Hackborn
43ebb2d915
am 81aaf56f: am 2c6c5e6e: Fix issue #2176944 : Need API so browser, others can determine memory size of device
...
Merge commit '81aaf56f9015f99a18a6578b913276ebae2731d3' into eclair-mr2-plus-aosp
* commit '81aaf56f9015f99a18a6578b913276ebae2731d3':
2009-10-08 19:19:02 -07:00
Dianne Hackborn
198dcc9d6f
am 0c35e6ff: am d10d02f5: Merge change I490e01ba into eclair
...
Merge commit '0c35e6ff1d15716c552af664e67ed390c5def26d' into eclair-mr2-plus-aosp
* commit '0c35e6ff1d15716c552af664e67ed390c5def26d':
2009-10-08 19:18:56 -07:00
Dianne Hackborn
d3332dd113
am 479e8004: am 89becd79: Fix issue #2177262 : Improve animations
...
Merge commit '479e80040f72c1eba4ca222342a8658c545f4ce1' into eclair-mr2-plus-aosp
* commit '479e80040f72c1eba4ca222342a8658c545f4ce1':
2009-10-08 19:18:49 -07:00
James Dong
6195432b6f
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
2009-10-08 19:18:48 -07:00
Jim Miller
de6a2bc053
am ad60e7fe: Merge change I9485aec1 into eclair
...
Merge commit 'ad60e7fe2c9588cd16c1351419af90964beb232d' into eclair-plus-aosp
* commit 'ad60e7fe2c9588cd16c1351419af90964beb232d':
Fix for 2177367: Reduce duration of vibrate in RotaryLockScreen
2009-10-08 19:09:44 -07:00
Dianne Hackborn
93939786f9
am 2c6c5e6e: Fix issue #2176944 : Need API so browser, others can determine memory size of device
...
Merge commit '2c6c5e6e49795e6e24cd089c9018377d837ba931' into eclair-plus-aosp
* commit '2c6c5e6e49795e6e24cd089c9018377d837ba931':
Fix issue #2176944 : Need API so browser, others can determine memory size of device
2009-10-08 19:09:38 -07:00
Jim Miller
b1fdb1d336
am ad60e7fe: Merge change I9485aec1 into eclair
...
Merge commit 'ad60e7fe2c9588cd16c1351419af90964beb232d' into eclair-mr2
* commit 'ad60e7fe2c9588cd16c1351419af90964beb232d':
Fix for 2177367: Reduce duration of vibrate in RotaryLockScreen
2009-10-08 19:09:24 -07:00
Dianne Hackborn
81aaf56f90
am 2c6c5e6e: Fix issue #2176944 : Need API so browser, others can determine memory size of device
...
Merge commit '2c6c5e6e49795e6e24cd089c9018377d837ba931' into eclair-mr2
* commit '2c6c5e6e49795e6e24cd089c9018377d837ba931':
Fix issue #2176944 : Need API so browser, others can determine memory size of device
2009-10-08 19:09:17 -07:00
Android (Google) Code Review
ad60e7fe2c
Merge change I9485aec1 into eclair
...
* changes:
Fix for 2177367: Reduce duration of vibrate in RotaryLockScreen
2009-10-08 22:04:36 -04:00
Jim Miller
9485aec1df
Fix for 2177367: Reduce duration of vibrate in RotaryLockScreen
...
BUG=2177367
2009-10-08 18:49:53 -07:00
Dianne Hackborn
0c35e6ff1d
am d10d02f5: Merge change I490e01ba into eclair
...
Merge commit 'd10d02f53ec00bfa9eb9f5accf6454e4a4bbb6a6' into eclair-mr2
* commit 'd10d02f53ec00bfa9eb9f5accf6454e4a4bbb6a6':
Fix issue #2174566 : HOT STABILITY: NPE in activity manager
2009-10-08 18:44:37 -07:00
Dianne Hackborn
479e80040f
am 89becd79: Fix issue #2177262 : Improve animations
...
Merge commit '89becd79da643421adc2dbb0cdccc547a0611abb' into eclair-mr2
* commit '89becd79da643421adc2dbb0cdccc547a0611abb':
Fix issue #2177262 : Improve animations
2009-10-08 18:44:25 -07:00
Dianne Hackborn
374efe6a96
am d10d02f5: Merge change I490e01ba into eclair
...
Merge commit 'd10d02f53ec00bfa9eb9f5accf6454e4a4bbb6a6' into eclair-plus-aosp
* commit 'd10d02f53ec00bfa9eb9f5accf6454e4a4bbb6a6':
Fix issue #2174566 : HOT STABILITY: NPE in activity manager
2009-10-08 18:43:54 -07:00
Dianne Hackborn
3276e7fde2
am 89becd79: Fix issue #2177262 : Improve animations
...
Merge commit '89becd79da643421adc2dbb0cdccc547a0611abb' into eclair-plus-aosp
* commit '89becd79da643421adc2dbb0cdccc547a0611abb':
Fix issue #2177262 : Improve animations
2009-10-08 18:43:48 -07:00
Dianne Hackborn
2c6c5e6e49
Fix issue #2176944 : Need API so browser, others can determine memory size of device
...
Change-Id: I65d91cdb70df91b67fe84297dd6a94d26a785131
2009-10-08 18:43:47 -07:00
Android (Google) Code Review
d10d02f53e
Merge change I490e01ba into eclair
...
* changes:
Fix issue #2174566 : HOT STABILITY: NPE in activity manager
2009-10-08 21:38:39 -04:00
Dianne Hackborn
89becd79da
Fix issue #2177262 : Improve animations
...
Slower is better.
Change-Id: Id609f253e43814b4c7689ed9b076ef75f4e345a6
2009-10-08 18:34:57 -07:00
Dianne Hackborn
68f857cd44
am dc76d696: am 9e2562b8: Merge change I88c6e267 into eclair
...
Merge commit 'dc76d6966c6bcbe11262802fad2663b8744d241d' into eclair-mr2-plus-aosp
* commit 'dc76d6966c6bcbe11262802fad2663b8744d241d':
2009-10-08 17:54:05 -07:00
Nick Pelly
eb772880e3
am 59778b3c: am db7ae10d: (-s ours) Remove STOPSHIP BT logging.
...
Merge commit '59778b3c19c52aed840ec2350b12f73cc05b92af' into eclair-mr2-plus-aosp
* commit '59778b3c19c52aed840ec2350b12f73cc05b92af':
2009-10-08 17:53:59 -07:00
Nick Pelly
dfb4a75da2
am 65d028ae: am e6ee3be1: BT API security audit: fix a couple of permission mistakes.
...
Merge commit '65d028ae13501c446ecf1abfee085795c153695c' into eclair-mr2-plus-aosp
* commit '65d028ae13501c446ecf1abfee085795c153695c':
2009-10-08 17:53:52 -07:00
Mathias Agopian
d4d7db5346
am 75017f3c: am 846322a9: Merge change Ib96df854 into eclair
...
Merge commit '75017f3c9ef7104244f7265693481c24274b69d2' into eclair-mr2-plus-aosp
* commit '75017f3c9ef7104244f7265693481c24274b69d2':
2009-10-08 17:53:45 -07:00
Eric Fischer
084e062a90
am 9dd00e7a: am aaa6299b: (-s ours) am 24c8645a: (-s ours) Import revised translations. DO NOT MERGE
...
Merge commit '9dd00e7aaae4a728d94b6f41eea380c593853819' into eclair-mr2-plus-aosp
* commit '9dd00e7aaae4a728d94b6f41eea380c593853819':
2009-10-08 17:53:39 -07:00
Jean-Baptiste Queru
d0a513d17c
am 6fc4b1f1: am ea110274: (-s ours) am ac62c84a: (-s ours) DO NOT MERGE merge from donut-gms
...
Merge commit '6fc4b1f1d4718bcd9410078f73e6358b787d76f6' into eclair-mr2-plus-aosp
* commit '6fc4b1f1d4718bcd9410078f73e6358b787d76f6':
2009-10-08 17:53:33 -07:00
Mike Lockwood
b2e9e7dd4e
am d5b090b2: am 348b92bd: Merge change Iee227ace into eclair
...
Merge commit 'd5b090b26b740be890395887b27db8cb2186c3b8' into eclair-mr2-plus-aosp
* commit 'd5b090b26b740be890395887b27db8cb2186c3b8':
2009-10-08 17:53:26 -07:00
Eric Laurent
032d7fed19
am 88bd8c0f: am ff94720b: Merge change I80a6a229 into eclair
...
Merge commit '88bd8c0f793dcd4902f9259323c0e519f61681ab' into eclair-mr2-plus-aosp
* commit '88bd8c0f793dcd4902f9259323c0e519f61681ab':
2009-10-08 17:53:19 -07:00
Jaikumar Ganesh
6e34914069
am 8d6893dc: am 9d5b5899: Merge change Ie5d93b7e into eclair
...
Merge commit '8d6893dc1e489a57602309f341a6d6ad45b11b9d' into eclair-mr2-plus-aosp
* commit '8d6893dc1e489a57602309f341a6d6ad45b11b9d':
2009-10-08 17:53:13 -07:00
John Wang
d4d874ce48
am 2d4b58f2: am 33e21fcc: Control H icon display in Status bar.
...
Merge commit '2d4b58f29eda24fe5ec1dd1850823a9e7bddacc6' into eclair-mr2-plus-aosp
* commit '2d4b58f29eda24fe5ec1dd1850823a9e7bddacc6':
2009-10-08 17:53:06 -07:00
Romain Guy
3f90b7b81d
am 94ee9260: am 3b36ed09: Merge change I95319bde into eclair
...
Merge commit '94ee92600a13f4d58afa61215c69fb60b989f6f3' into eclair-mr2-plus-aosp
* commit '94ee92600a13f4d58afa61215c69fb60b989f6f3':
2009-10-08 17:53:00 -07:00
Daisuke Miyakawa
472a21d84d
am bd3d5b25: am 387e73bd: Merge change Ib977f2bd into eclair
...
Merge commit 'bd3d5b25bff3504b4158dade39dc2384d7aeb77a' into eclair-mr2-plus-aosp
* commit 'bd3d5b25bff3504b4158dade39dc2384d7aeb77a':
2009-10-08 17:52:54 -07:00
Eric Fischer
94f3a36326
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
2009-10-08 17:52:53 -07:00
Dianne Hackborn
dc76d6966c
am 9e2562b8: Merge change I88c6e267 into eclair
...
Merge commit '9e2562b8f97fec7e13e6302678459e99b8cccb2a' into eclair-mr2
* commit '9e2562b8f97fec7e13e6302678459e99b8cccb2a':
Fix issue #2175693 : Add vmallocinfo to dumpstate
2009-10-08 17:36:39 -07:00