drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,431 Commits 1 Branch 0 Tags
Commit Graph

10431 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nick Pelly
59778b3c19 am db7ae10d: (-s ours) Remove STOPSHIP BT logging. 
Merge commit 'db7ae10d6b8e86ff5311512de45afa65a1b0a738' into eclair-mr2

* commit 'db7ae10d6b8e86ff5311512de45afa65a1b0a738':
  Remove STOPSHIP BT logging.
 2009-10-08 17:36:25 -07:00
Nick Pelly
65d028ae13 am e6ee3be1: BT API security audit: fix a couple of permission mistakes. 
Merge commit 'e6ee3be1c254404dad842298f6f56c11cc6c7ac8' into eclair-mr2

* commit 'e6ee3be1c254404dad842298f6f56c11cc6c7ac8':
  BT API security audit: fix a couple of permission mistakes.
 2009-10-08 17:36:19 -07:00
Mathias Agopian
75017f3c9e am 846322a9: Merge change Ib96df854 into eclair 
Merge commit '846322a9ae5ef8155cca0059d3f64d718516ca13' into eclair-mr2

* commit '846322a9ae5ef8155cca0059d3f64d718516ca13':
  add a way to easily catch and log GL errors (compile time flag)
 2009-10-08 17:36:06 -07:00
Eric Fischer
9dd00e7aaa am aaa6299b: (-s ours) am 24c8645a: (-s ours) Import revised translations. DO NOT MERGE 
Merge commit 'aaa6299bcd1a44f5f066ef48fb99cc0a704cbd0f' into eclair-mr2

* commit 'aaa6299bcd1a44f5f066ef48fb99cc0a704cbd0f':
  Import revised translations.  DO NOT MERGE
 2009-10-08 17:32:43 -07:00
Jean-Baptiste Queru
6fc4b1f1d4 am ea110274: (-s ours) am ac62c84a: (-s ours) DO NOT MERGE merge from donut-gms 
Merge commit 'ea11027401a6b0e8fc351b7585d929e8fdb3fd08' into eclair-mr2

* commit 'ea11027401a6b0e8fc351b7585d929e8fdb3fd08':
  Import revised translations.  DO NOT MERGE
 2009-10-08 17:32:37 -07:00
Mike Lockwood
d5b090b26b am 348b92bd: Merge change Iee227ace into eclair 
Merge commit '348b92bd513087369ac682e29620d7829fa1381b' into eclair-mr2

* commit '348b92bd513087369ac682e29620d7829fa1381b':
  GPS: Fix problem with SUPL when SUPL APN is already active.
 2009-10-08 17:32:31 -07:00
Eric Laurent
88bd8c0f79 am ff94720b: Merge change I80a6a229 into eclair 
Merge commit 'ff94720b8bf9f83f326197cb0cb27576168e9448' into eclair-mr2

* commit 'ff94720b8bf9f83f326197cb0cb27576168e9448':
  Fix issue 2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device.
 2009-10-08 17:31:22 -07:00
Jaikumar Ganesh
8d6893dc1e am 9d5b5899: Merge change Ie5d93b7e into eclair 
Merge commit '9d5b58991ef90e91b3c942c80ae3502ed62d10aa' into eclair-mr2

* commit '9d5b58991ef90e91b3c942c80ae3502ed62d10aa':
  Set the Bond State to NONE when we receive a Agent Cancel.
 2009-10-08 17:30:34 -07:00
John Wang
2d4b58f29e am 33e21fcc: Control H icon display in Status bar. 
Merge commit '33e21fcc99dd91061ea245984c4e9a1544cb943f' into eclair-mr2

* commit '33e21fcc99dd91061ea245984c4e9a1544cb943f':
  Control H icon display in Status bar.
 2009-10-08 17:30:12 -07:00
Romain Guy
94ee92600a am 3b36ed09: Merge change I95319bde into eclair 
Merge commit '3b36ed09293965e7e5dc20dfa514422388e796d6' into eclair-mr2

* commit '3b36ed09293965e7e5dc20dfa514422388e796d6':
  Fixes #2175599. Prevents an NPE when AttachInfo is null.
 2009-10-08 17:29:39 -07:00
Daisuke Miyakawa
bd3d5b25bf am 387e73bd: Merge change Ib977f2bd into eclair 
Merge commit '387e73bd8fbecae0b95e3005ca8187ddbda1aff7' into eclair-mr2

* commit '387e73bd8fbecae0b95e3005ca8187ddbda1aff7':
  Make vCard import Photo from vCard file :(
 2009-10-08 17:29:32 -07:00
Dianne Hackborn
90d6cf74d2 am 9e2562b8: Merge change I88c6e267 into eclair 
Merge commit '9e2562b8f97fec7e13e6302678459e99b8cccb2a' into eclair-plus-aosp

* commit '9e2562b8f97fec7e13e6302678459e99b8cccb2a':
  Fix issue #2175693: Add vmallocinfo to dumpstate
 2009-10-08 16:58:20 -07:00
Android (Google) Code Review
9e2562b8f9 Merge change I88c6e267 into eclair 
* changes:
  Fix issue #2175693: Add vmallocinfo to dumpstate
 2009-10-08 19:52:35 -04:00
Nick Pelly
899f5f7bba am db7ae10d: Remove STOPSHIP BT logging. 
Merge commit 'db7ae10d6b8e86ff5311512de45afa65a1b0a738' into eclair-plus-aosp

* commit 'db7ae10d6b8e86ff5311512de45afa65a1b0a738':
  Remove STOPSHIP BT logging.
 2009-10-08 16:47:19 -07:00
Nick Pelly
eb93eb127e am e6ee3be1: BT API security audit: fix a couple of permission mistakes. 
Merge commit 'e6ee3be1c254404dad842298f6f56c11cc6c7ac8' into eclair-plus-aosp

* commit 'e6ee3be1c254404dad842298f6f56c11cc6c7ac8':
  BT API security audit: fix a couple of permission mistakes.
 2009-10-08 16:47:13 -07:00
Nick Pelly
db7ae10d6b Remove STOPSHIP BT logging. 
Do not merge.

Change-Id: I428bc0fc67030f24112f2e9c865824dfaea4897d
DrNo: eastham
Bug: 2089423
Joke: Why was Tigger looking in the toilet? To find Pooh
 2009-10-09 01:35:11 +02:00
Nick Pelly
e6ee3be1c2 BT API security audit: fix a couple of permission mistakes. 
Make functions that are meant to be BLUETOOTH_ADMIN really
BLUETOOTH_ADMIN.

Add some missing javadoc for permissions.

The only functional change here is the BLUETOOTH->BLUETOOTH_ADMIN
changes. This is super safe because every system app that uses BT
has both permissions.

Change-Id: Iddc61f9fd5d81fe0171358665a0fa52f2fa02871
DrNo: eastham
Joke: How do you catch a rabbit? Hide behind a tree and make carrott noises.
 2009-10-09 01:35:10 +02:00
Dianne Hackborn
b80b8d5637 Fix issue #2175693: Add vmallocinfo to dumpstate 
Change-Id: I88c6e2679919e56f581fcf79dbe683393dd8ce27
 2009-10-08 16:33:30 -07:00