Kenny Root
baa71ee642
Merge "Sort the IME list before showing to user"
2010-08-10 15:22:13 -07:00
Jean-Baptiste Queru
3af76d8978
Merge "Fix a bug that prevented the creation of EGL shared contexts."
2010-07-30 11:42:09 -07:00
Jean-Baptiste Queru
9741fdbd05
Merge "Cat: Move Stk imlpementation into Cat folder"
2010-07-30 10:44:00 -07:00
Jean-Baptiste Queru
23667b8dc3
Merge "Ccat: Initial CCAT implementation"
2010-07-30 10:42:15 -07:00
Jamie Gennis
51f65a34e1
Fix a bug that prevented the creation of EGL shared contexts.
...
Change-Id: I6b0ec5ef86abdd4e9083067ba297107cfb094df3
2010-07-29 17:54:14 -07:00
Jean-Baptiste Queru
8c6529efe8
Merge "Replaced /sdcard with Environment.getExternalStorageDirectory()"
2010-07-29 15:01:24 -07:00
Jean-Baptiste Queru
9cf1fb7e84
Merge "Make hasIccCard return true if RUIM card is present."
2010-07-29 14:37:48 -07:00
Romain Guy
eaebbabb7e
Merge "Corrected buffer overflow when parsing /proc/wakelocks"
2010-07-29 14:00:48 -07:00
Romain Guy
64fad241a9
Merge "Fixed a documentation Bug (Issue 9236)"
2010-07-29 14:00:02 -07:00
Jean-Baptiste Queru
91d4d71a04
Merge "move native services under services/"
2010-07-26 10:01:19 -07:00
Jean-Baptiste Queru
9e4acbb6dd
Merge "Fix build."
2010-07-26 09:56:10 -07:00
Jean-Baptiste Queru
ec5506e87a
Merge "Enables writing to USIM phonebook (fixes issue 8976)."
2010-07-23 17:35:13 -07:00
Jean-Baptiste Queru
0e81e1b726
Merge "dependent change for "parse instrumentation result bundles" in sdk"
2010-07-23 15:24:55 -07:00
Romain Guy
410d0ea5a4
Merge "Remove compilation warnings by removing illegal characters"
2010-07-23 14:05:40 -07:00
Jean-Baptiste Queru
b8bd449144
Merge "frameworks/base: Implement Mutual exclusion in BroadcastReceiver"
2010-07-22 15:55:31 -07:00
Mathias Agopian
be48137beb
move native services under services/
...
moved surfaceflinger, audioflinger, cameraservice
all native services should now reside in this location.
Change-Id: Icd7336f7289db35df9c8c1857a5122bb8a6f1c86
2010-07-22 15:28:19 -07:00
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