22096 Commits

Author SHA1 Message Date
The Android Open Source Project
e5a023bfbb merge from open-source master
Change-Id: I8e7ccd470e8b90347686985aa2d8337d0c38900c
2010-06-18 12:40:42 -07:00
The Android Open Source Project
d398e7a493 merge from open-source master
Change-Id: I17a51b7cebe1486103d4b0af00e7297ddccb60b8
2010-06-18 11:36:35 -07:00
Dianne Hackborn
6be61854b1 am 57f4503e: Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
Merge commit '57f4503e1a129d6a648f2378d36a060998a577a0' into froyo-plus-aosp

* commit '57f4503e1a129d6a648f2378d36a060998a577a0':
  Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
2010-06-17 16:58:15 -07:00
Dianne Hackborn
57f4503e1a Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
Modify UIModeManager to not get location updates every thirty minutes.
Instead it gets one once a day, and requests a new update when airplane
mode is turned off or the time zone changes.

Change-Id: I8044c27b5cd77709e4b872e2e8edd352f23e4af1
2010-06-17 15:49:33 -07:00
Scott Main
9e8592b0bc am 5f11e95f: docs: small edits to catchup to edits made in html pushed live
Merge commit '5f11e95f0041e163e8aa9e429aec92c8ee942233' into froyo-plus-aosp

* commit '5f11e95f0041e163e8aa9e429aec92c8ee942233':
  docs: small edits to catchup to edits made in html pushed live
2010-06-17 12:23:58 -07:00
James Dong
a94e11429a am 39e876ad: Merge "When filling the cache, we always time out waiting for a condition that won\'t occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo
Merge commit '39e876ad743f203fe005333947c61383772b0d14' into froyo-plus-aosp

* commit '39e876ad743f203fe005333947c61383772b0d14':
  When filling the cache, we always time out waiting for a condition that won't occur.
2010-06-17 12:23:48 -07:00
Dave Sparks
9883af6a83 am 3242cc27: Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than normal." into fro
Merge commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b' into froyo-plus-aosp

* commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b':
  TimedEventQueue is apparently important for glitch-free media playback, and so
2010-06-17 12:23:44 -07:00
Scott Main
c973909bb8 am 821ca518: docs: edits to resources doc
Merge commit '821ca51857f4d21b231cd9ead786227b771fe759' into froyo-plus-aosp

* commit '821ca51857f4d21b231cd9ead786227b771fe759':
  docs: edits to resources doc
2010-06-17 12:23:35 -07:00
Scott Main
57d1033c39 am bccedb03: docs: update dashboard again
Merge commit 'bccedb03fad4e72c1776d2ab9e918fab4d25f222' into froyo-plus-aosp

* commit 'bccedb03fad4e72c1776d2ab9e918fab4d25f222':
  docs: update dashboard again
2010-06-17 12:23:18 -07:00
Dan Morrill
56a5ee3325 am 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be presumed to require Bluetooth just because they take the permission.
Merge commit '6b22d81aa35d9a9b32670995c002e92588b2fe09' into froyo-plus-aosp

* commit '6b22d81aa35d9a9b32670995c002e92588b2fe09':
  As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
2010-06-17 12:23:03 -07:00
Scott Main
5f11e95f00 docs: small edits to catchup to edits made in html pushed live
Change-Id: I62b3e7dc5fcab881dd09ca897b05425a8c28cb92
2010-06-16 17:29:40 -07:00
James Dong
39e876ad74 Merge "When filling the cache, we always time out waiting for a condition that won't occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo 2010-06-16 16:10:52 -07:00
James Dong
1c8bc7bb99 When filling the cache, we always time out waiting for a condition that won't occur.
We are actually improving the power consumption for streaming applications like Pandora.

Change-Id: Id32bacbc962e8c69c056599479b308d6a07b7a20
2010-06-16 14:12:53 -07:00
Dave Sparks
3242cc2719 Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than normal." into froyo 2010-06-16 14:11:40 -07:00
Scott Main
821ca51857 docs: edits to resources doc
Change-Id: I1dbe5d213d8f85b2ecaeed45ddbe215f199e2c9e
2010-06-16 12:47:11 -07:00
Marco Nelissen
cad5726e3a TimedEventQueue is apparently important for glitch-free media playback, and so
having it inherit its priority from the thread that created it is a bad idea.
Instead, set the priority explicitly, and bump it to slightly higher than normal.

Change-Id: I01843f24905790ce2e2cde5d11a99346cfbf968d
2010-06-16 11:09:01 -07:00
Scott Main
bccedb03fa docs: update dashboard again
Change-Id: Ia3ae9149879e355d15d42ac612e6a758c83b59f6
2010-06-16 10:22:53 -07:00
Dan Morrill
6b22d81aa3 As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be
presumed to require Bluetooth just because they take the permission.

Change-Id: Ia629e9ef0425a577e4e14f9b348f5aa2b39c1e74
2010-06-15 21:57:33 -07:00
Scott Main
b846393dc9 am cdeae439: Merge "docs: update dashboard" into froyo
Merge commit 'cdeae439a3637062dc0701654a1cb7874bfd1ae8' into froyo-plus-aosp

* commit 'cdeae439a3637062dc0701654a1cb7874bfd1ae8':
  docs: update dashboard
2010-06-15 19:43:19 -07:00
Scott Main
cdeae439a3 Merge "docs: update dashboard" into froyo 2010-06-15 19:33:03 -07:00
Ying Wang
51047cc060 am 6567adf8: Move android-common to framework/ex
Merge commit '6567adf8b637c36817625cd38d64cd4b8510b097' into froyo-plus-aosp

* commit '6567adf8b637c36817625cd38d64cd4b8510b097':
  Move android-common to framework/ex
2010-06-15 15:32:36 -07:00
Ying Wang
6567adf8b6 Move android-common to framework/ex
This is one necessary step by unbundling.

Change-Id: I9d922a52374ad6331fa2e39fa4b5e16ad7d108fa
2010-06-15 15:28:42 -07:00
Jean-Baptiste Queru
6b9a1a5124 Merge "Fixing counting the number of days in call log screen." 2010-06-15 15:11:34 -07:00
Joe Onorato
2c1295c275 am 27357fc0: Merge "Use the droidcore goal with dist-for-goals." into froyo
Merge commit '27357fc08802d796a6b6a1111ac5534d75fc8be7' into froyo-plus-aosp

* commit '27357fc08802d796a6b6a1111ac5534d75fc8be7':
  Use the droidcore goal with dist-for-goals.
2010-06-15 14:24:58 -07:00
Joe Onorato
d6e3b20428 am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an apps-only build, so don\'t try to build them." into froyo
Merge commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a' into froyo-plus-aosp

* commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a':
  The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
2010-06-15 14:24:51 -07:00
Joe Onorato
27357fc088 Merge "Use the droidcore goal with dist-for-goals." into froyo 2010-06-15 13:59:10 -07:00
Joe Onorato
9d71860e8c Merge "The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them." into froyo 2010-06-15 13:58:33 -07:00
Martin Nordholts
e429c5ec9d Support custom themes with AlertDialog.Builder
Add a constructor to AlertDialog.Builder with a 'theme' parameter so
that e.g. the buttons in a dialog built with AlertDialog.Builder can
be themed.

Change-Id: Ie1b1c9706ad2146c8b64dd91fe249c6855c6ac65
2010-06-15 12:05:17 -07:00
Romain Guy
e82ff9ed14 Merge "fillWindow's start position must be smaller than getCount value" 2010-06-15 11:47:02 -07:00
Romain Guy
893e2b626f Merge "Change in media scanner to set correct date" 2010-06-15 11:46:42 -07:00
The Android Open Source Project
3ff1a5928f merge from open-source master
Change-Id: Ib9ec3f3b7418d064b643577156d7d16688b3048d
2010-06-15 11:44:09 -07:00
The Android Open Source Project
7d10df4e24 merge from open-source master
Change-Id: I0684cac9eb230d864614aef0634c072f4e3ef6a3
2010-06-15 11:37:17 -07:00
The Android Open Source Project
20374b6045 merge from open-source master
Change-Id: I12af4b88c1881a6a120031459bc63d87b1dd4956
2010-06-15 11:34:57 -07:00
Scott Main
4e8a2ddf4b am 457738e6: Merge "docs: add information about known issues in resource matching for screen density and system version. Add section about providing compatibility for multiple devices" into froyo
Merge commit '457738e628ee4d165014996bcf4e8d1983ac5929' into froyo-plus-aosp

* commit '457738e628ee4d165014996bcf4e8d1983ac5929':
  docs: add information about known issues in resource matching
2010-06-15 10:45:55 -07:00
Scott Main
b860fd11e9 am 322e7e47: Merge "docs: fix markup error" into froyo
Merge commit '322e7e477d89aca18d65cbd289343e716c45a699' into froyo-plus-aosp

* commit '322e7e477d89aca18d65cbd289343e716c45a699':
  docs: fix markup error
2010-06-15 10:45:50 -07:00
Scott Main
b102a5e8c2 docs: update dashboard
Change-Id: If8d1ad8aa99d93f707635631a44e6c359895302a
2010-06-15 10:42:10 -07:00
Jean-Baptiste Queru
879becf570 Merge "Fix that InputDeviceReaderThread that got killed during startup" 2010-06-15 10:40:51 -07:00
Scott Main
457738e628 Merge "docs: add information about known issues in resource matching for screen density and system version. Add section about providing compatibility for multiple devices" into froyo 2010-06-15 10:36:27 -07:00
Scott Main
322e7e477d Merge "docs: fix markup error" into froyo 2010-06-15 10:36:14 -07:00
Szymon Jakubczak
9bf3bb21c0 - updates NetUtils to use new libnetutils headers
- updates WifiStateTracker to track net.XXX.dnsX properties for name servers
- removes dhcp from WifiNative (use NetworkUtils instead)

Change-Id: Ic69ff253e8784cad34e9291e7970ee38bfa235b9
2010-06-15 10:22:25 -07:00
The Android Open Source Project
a191eb013a Fix build
This file was brought back to life by mistaken when merging from
a branch where it was modified into a branch where it had been
deleted

Change-Id: I406c6ced978abfdd59684f14bc9dd53ee7968aae
2010-06-15 09:59:15 -07:00
The Android Open Source Project
9629d42c19 merge from open-source master
Change-Id: I4d7b0ec9895d8b090e0cdf2efb6731358a5d087c
2010-06-15 09:32:37 -07:00
The Android Open Source Project
4138677a72 merge from open-source master
Change-Id: I405069e9495e43fdcdedc41efce77d43a291272c
2010-06-15 09:30:31 -07:00
The Android Open Source Project
fa804aa367 merge from open-source master
Change-Id: I227bf1b5f1de8f858df72d58a4463aed5cc09cbc
2010-06-15 09:27:48 -07:00
Jean-Baptiste Queru
77dcdc9cda Merge "Use stride for source and target buffers when copybit is enabled." 2010-06-15 07:49:05 -07:00
Jean-Baptiste Queru
8942a31f13 Merge "Replaced deprecated String Constructor" 2010-06-14 16:23:58 -07:00
Christian Mehlmauer
e6af73e18e Replaced deprecated Inten.toURI method
Change-Id: Iff3200294edbc1cac188502219bfe481133a5d8e
2010-06-14 15:47:15 -07:00
Kenny
baccb91ece Fix the ssid display issue
Reproduce steps:
1. Set a special AP name that contains "=" (looks like "-=^-^=-");
2. Connect to this AP;
3. The display of ssid will be incorrect;

Change-Id: Idc7433a42cf59932f5fb147f5500e0175f745399
2010-06-14 14:51:26 -07:00
The Android Open Source Project
3149ad13e5 merge from open-source master
Change-Id: I381f1faaa26a7e52e9882976f32f703fc2aa9c75
2010-06-14 14:28:18 -07:00
The Android Open Source Project
c8e2cbd31a merge from open-source master
Change-Id: Ia8a5ab84bb9957b4a3daf92a9a21905212867a95
2010-06-14 14:18:32 -07:00