Jean-Baptiste Queru
661d13b9e5
Merge "Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE"
2010-07-22 12:22:56 -07:00
Jean-Baptiste Queru
11b9e7d766
Merge "Correct VM number updation during MBDN refresh."
2010-07-22 11:38:05 -07:00
Jean-Baptiste Queru
6c980fe9dd
Merge "Shoud specify the Resource class instance as an argument of the method newDrawable and change the name from 'DrawableCacheClear' to 'clearDrawableCache' (additional changes for ID:15815) https://review.source.android.com/#change,15815 "
2010-07-20 11:22:45 -07:00
Romain Guy
f00404a78e
Merge "replaced deprecated setButton Methods"
2010-07-20 11:11:20 -07:00
Romain Guy
499bcdb41c
Merge "Replaced deprecated calls to setButton and setButton2"
2010-07-19 10:30:16 -07:00
Romain Guy
7b2e5b69d9
Merge "Replaced deprecated setButton Methodcalls"
2010-07-19 10:29:59 -07:00
Romain Guy
beca03b99c
Merge "Fix the problem that color drawable cache key conflicts another drawable one. The cache key of a color drawable resource may be the same as another drawable resource's value."
2010-07-15 18:24:02 -07:00
Romain Guy
a812513c65
Merge "Added method getPreferredHttpHost"
2010-07-15 10:49:47 -07:00
Romain Guy
efa6e7060a
Merge "Allow ListPreference summary to use entry"
2010-07-15 09:40:34 -07:00
Romain Guy
923b231245
Merge "Make HTTP Header class handle multiple cache-control fields."
2010-07-15 09:39:42 -07:00
Romain Guy
012a3c2908
Merge "Makes PhoneNumberUtils support international numbers after a CLIR command."
2010-07-15 09:39:19 -07:00
Jean-Baptiste Queru
022164b58e
Merge "Start app with several activities with intent filter [Main, Launcher] was broken"
2010-07-14 09:03:30 -07:00
Jean-Baptiste Queru
cd39a755a5
Merge "Telephony: Process MT SMS with MTI set to 3"
2010-07-13 16:20:30 -07:00
Romain Guy
3e57d20b63
Merge "Fixed a Documentation Error in the AsyncTask Contstructor"
2010-07-12 11:35:31 -07:00
Jean-Baptiste Queru
4d360bae07
Merge "Fix hang when error in SIM card communication"
2010-07-12 11:14:56 -07:00
Jean-Baptiste Queru
8b620f3457
Merge "Reduced Warnings by adding Type Arguments and removing unused imports"
2010-07-12 10:54:11 -07:00
Jean-Baptiste Queru
34cc65ebb4
Merge "Documentation Bug (Issue 9557)"
2010-07-12 10:43:17 -07:00
Jean-Baptiste Queru
57c87d26a8
Merge "Improved logging when there's an error creating the directories in getFilesDir()"
2010-07-09 14:06:38 -07:00
Jean-Baptiste Queru
e02daf9c05
Merge "update 404'd source.android.com URLs"
2010-07-08 16:25:03 -07:00
Jean-Baptiste Queru
dc932feef0
Merge "Fix missing NL"
2010-07-01 13:46:03 -07:00
Scott Main
fe2871079b
am 337b0873: docs: update backup guide and bmgr tool elaborate the guide to testing a backup agent and add links between the docs
...
Merge commit '337b0873f43eac5f23483bec94bd8729f79d47ec' into froyo-plus-aosp
* commit '337b0873f43eac5f23483bec94bd8729f79d47ec':
docs: update backup guide and bmgr tool
2010-06-28 15:31:11 -07:00
Bruce Beare
a1a79197c0
Fix missing NL
...
Change-Id: I323f0c01d2e9ad4c9f07cad24bf6b63edc28ad62
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-06-25 09:08:12 -07:00
Scott Main
68a41d7f56
am 56c778e6: Merge "docs: Remove the TOS from download flow and remove TOS entirely because it\'s no longer relevant to the SDK download package" into froyo
...
Merge commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8' into froyo-plus-aosp
* commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8':
docs: Remove the TOS from download flow and remove TOS entirely because
2010-06-24 18:14:06 -07:00
Scott Main
29d8e66ce0
Merge "docs: Remove the TOS from download flow and remove TOS entirely because it's no longer relevant to the SDK download package" into froyo
2010-06-24 18:10:41 -07:00
Dianne Hackborn
ab32c11fd2
am 5827d3ea: Merge "Properly note the current active restore set\'s token" into froyo
...
Merge commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6' into froyo-plus-aosp
* commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6':
Properly note the current active restore set's token
2010-06-24 16:02:03 -07:00
Dianne Hackborn
2f90b21533
Merge "Properly note the current active restore set's token" into froyo
2010-06-24 16:00:06 -07:00
Nick Pelly
b7687fd9a6
am d19c397b: Merge "Do not log AT command traffic by default." into froyo
...
Merge commit 'd19c397b04f485e0af5990f3541e703934869290' into froyo-plus-aosp
* commit 'd19c397b04f485e0af5990f3541e703934869290':
Do not log AT command traffic by default.
2010-06-24 11:55:56 -07:00
Nick Pelly
7ed4deb035
Merge "Do not log AT command traffic by default." into froyo
2010-06-24 11:52:39 -07:00
Scott Main
62415f95f0
am 753e5609: Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo
...
Merge commit '753e56090ed5acc0d2173a8e9ab1a9b96528720b' into froyo-plus-aosp
* commit '753e56090ed5acc0d2173a8e9ab1a9b96528720b':
docs: update backup dev guide with Android Backup Service registration info
2010-06-23 10:08:45 -07:00
Scott Main
0d168d31d4
Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo
2010-06-23 09:57:46 -07:00
Dirk Dougherty
b38d6045c8
am 17ae6465: Merge "Doc change: Fix description of certificate matching requirement for app updates." into froyo
...
Merge commit '17ae646586663c59ad360bb72884beded7475687' into froyo-plus-aosp
* commit '17ae646586663c59ad360bb72884beded7475687':
Doc change: Fix description of certificate matching requirement for app updates.
2010-06-22 11:24:01 -07:00
Dirk Dougherty
0f63401fb8
Merge "Doc change: Fix description of certificate matching requirement for app updates." into froyo
2010-06-22 11:13:48 -07:00
Kenny Root
f50f465b02
am 30cf330f: Import revised translations
...
Merge commit '30cf330fae137587d51aa4c026459db146705ba9' into froyo-plus-aosp
* commit '30cf330fae137587d51aa4c026459db146705ba9':
Import revised translations
2010-06-21 11:16:25 -07:00
Kenny Root
9c4ff3a239
am c4e38577: Import revised translations
...
Merge commit 'c4e38577f46a3b7953fffbb01b08eebc401fbc17' into froyo-plus-aosp
* commit 'c4e38577f46a3b7953fffbb01b08eebc401fbc17':
Import revised translations
2010-06-21 09:15:29 -07:00
The Android Open Source Project
5292755e6e
merge from open-source master
...
Change-Id: If7ae0c5629d1b3c540cacfa517425c2e6b5822d1
2010-06-18 12:46:16 -07:00
The Android Open Source Project
16df15b777
merge from open-source master
...
Change-Id: I05e4c26c902f3cfe0dd99107f518768b246562f7
2010-06-18 12:44:20 -07:00
The Android Open Source Project
de3f19a220
merge from open-source master
...
Change-Id: I8e7ccd470e8b90347686985aa2d8337d0c38900c
2010-06-18 12:40:42 -07:00
The Android Open Source Project
2045f4b3c5
merge from open-source master
...
Change-Id: I17a51b7cebe1486103d4b0af00e7297ddccb60b8
2010-06-18 11:36:35 -07:00
Dianne Hackborn
5b3e5cf106
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
Scott Main
d64fcd75c2
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
73d1a539e7
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
25b5fc3cdf
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
fa56cb4e72
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
3eee82d740
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
02c719bc78
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
James Dong
748ad2b542
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
Dave Sparks
e9a36f1e11
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
2de01b8ef6
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
b7310b28e2
Merge "docs: update dashboard" into froyo
2010-06-15 19:33:03 -07:00
Ying Wang
bcc354a08b
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