10327 Commits

Author SHA1 Message Date
Herb Jellinek
a473394183 BluetoothHeadset.java:
Added ACTION_VENDOR_SPECIFIC_HEADSET_EVENT,
EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_CMD,  EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_ARGS.

BluetoothAssignedNumbers.java (new file):
A home for BT assigned numbers, beginning with the company IDs.

HeadsetBase.java:
Reformatted some code.

AtCommandHandler.java:
Fixed comment typos.

Change-Id: I34d6f248166305d72be66632779fc963b894379c

Added EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_COMPANY_ID.
Fixed a minor comment typo.

Change-Id: I8550692c13510a853c894b2d108bef4520d931c2
2010-08-13 15:23:00 -07:00
Romain Guy
ce3ac5f029 Merge "Corrected buffer overflow when parsing /proc/wakelocks" 2010-07-29 14:00:48 -07:00
Brett Chabot
5f866a4ac3 Make FrameworkCoreHostTests use ddmlib-prebuilt.
Change-Id: Ib6d809353a89e33ed47a5659141ef18dc132cba6
2010-07-28 11:56:50 -07:00
Xavier Ducrohet
f72181c609 Fix hosttests to use the new ddmlib API.
Change-Id: I629876c5baabc1cd8700604c4ebed13cc9e2168d
2010-07-26 10:53:00 -07:00
Jean-Baptiste Queru
c7ab09ede5 Merge "Fix build." 2010-07-26 09:56:10 -07:00
Jean-Baptiste Queru
f5c7310152 Merge "dependent change for "parse instrumentation result bundles" in sdk" 2010-07-23 15:24:55 -07:00
Mac Wang
b080636da6 Remove compilation warnings by removing illegal characters
Change-Id: I8522be88b628a12fbde7825354730de4b4d4635a
2010-07-23 16:34:21 +08:00
Masanori Ogino
708654c0b8 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

Change-Id: I6bf19b8e6e187df8c8e3cb57d9e04278ddfe5055
2010-07-20 23:32:19 +09:00
Christian Mehlmauer
798e2d3d0c Replaced /sdcard with Environment.getExternalStorageDirectory()
Change-Id: Id789f44a8569e307b1b7ab15eb266c9ce7ef2029
2010-07-19 15:54:40 -07:00
Madan Ankapura
ae96f634ec typo fixed
Change-Id: Ie7cff39929ae53ce03409afadcae58548ec22cc8
2010-07-19 15:43:00 -07:00
Romain Guy
4598804045 Merge "Replaced deprecated calls to setButton and setButton2" 2010-07-19 10:30:16 -07:00
Romain Guy
5671b28092 Merge "Replaced deprecated setButton Methodcalls" 2010-07-19 10:29:59 -07:00
Jean-Baptiste Queru
536ff5a6d7 Fix build.
Switch to using public APIs instead of private ones.

Change-Id: Ia3468d94b3dadeb6a000ce419ee08f7e7ba5dc67
2010-07-16 15:30:40 -07:00
Romain Guy
1726cf285f 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
Masanori Ogino
c7d9d2790f 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.

Change-Id: Ia971bb242ceac5e8f9346094009a10f356399ab9
(Reduced duplicated codes and replace TAB to white spaces)

And try to fix compile error.
2010-07-16 09:37:34 +09:00
Romain Guy
3fb33c7262 Merge "Added method getPreferredHttpHost" 2010-07-15 10:49:47 -07:00
Romain Guy
9e7f41e85f Merge "Allow ListPreference summary to use entry" 2010-07-15 09:40:34 -07:00
Romain Guy
c9c987d7e1 Merge "Make HTTP Header class handle multiple cache-control fields." 2010-07-15 09:39:42 -07:00
Andreas Sandblad
2986f858ae Added method getPreferredHttpHost
Added method for returning preferred proxy which takes both
localhost and Wi-Fi into account. This is a convenient method
to clients which only wants to set a correct proxy and don't
want to build in dependency to if Wi-Fi is active or not.
Currently no Wi-Fi proxy is supported by the system, but once
added, this method could return a suitable proxy for Wi-Fi.

Change-Id: I8c9c2879351fd25a20ea82a2cb000f226248c357
2010-07-14 08:49:46 +02:00
Henrik Baard
c692e8c4da Make HTTP Header class handle multiple cache-control fields.
The HTTP specification states the following about the fields:
Multiple message-header fields with the same field-name MAY be present
in a message if and only if the entire field-value for that header field
is defined as a comma-separated list [i.e., #(values)]. It MUST be
possible to combine the multiple header fields into one "field-name:
field-value" pair, without changing the semantics of the message, by
appending each subsequent field-value to the first, each separated by a
comma. The order in which header fields with the same field-name are
received is therefore significant to the interpretation of the combined
field value, and thus a proxy MUST NOT change the order of these field
values when a message is forwarded.

Change-Id: I1a6fe5cc8f541f8e80d559641d270d09eac9d85c
2010-07-14 08:20:40 +02:00
Johan Erlandsson
df4cfa3664 Start app with several activities with intent filter [Main, Launcher] was broken
When an application have more than one activities with intent filter
[Main, Launcher], then the intent with ResolverActivity wasn't created correct.

Change-Id: I2617122e07c35284862d2e0643888966ec0f7221
2010-07-13 14:48:46 -07:00
Martin Sjolin
e74e7e2a08 Remove top panel in alert dialog if empty.
Remove the topPanel in the alert dialog if it is empty and
therefore invisible. This gives the dialog content more space, and it
makes dialog positioning on the screen correct.

Change-Id: I8ffd9bd9b2360b0ad4338c32c21ab69c055d66a0
2010-07-13 10:47:26 -07:00
Kenny Root
ba636df784 Allow ListPreference summary to use entry
Currently when ListPreferences are used in a PreferenceActivity, the summary
values are set to the same as the current index in mEntryValue. This patch
adds the ability for a string substitution to be used in the summary
which points to the corresponding entry in mEntries to aid in
localization.

For example a preference may be named "color" with the following attributes
in the locale "de" (German):

mEntryValues = { "red", "green", "blue" }
mEntries = { "rot", "grün", "blau" }
mSummary = "Die Farbe ist %1$s."

getSummary() returns "Die Farbe ist grün."

Change-Id: Iea169ac3d1c9d6290d853fc7c67a7c4c8a11bb90
2010-07-13 10:28:44 -07:00
Guang Zhu
abcdecc017 dependent change for "parse instrumentation result bundles" in sdk
Change-Id: Ie3708d30620a703909829c32f5599816cc52b3f6
2010-07-12 15:00:36 -07:00
Jean-Baptiste Queru
f0565ce75a Merge "Reduced Warnings by adding Type Arguments and removing unused imports" 2010-07-12 10:54:11 -07:00
Jean-Baptiste Queru
ac95a25409 Merge "Documentation Bug (Issue 9557)" 2010-07-12 10:43:17 -07:00
Jean-Baptiste Queru
eb678fb63d Merge "Improved logging when there's an error creating the directories in getFilesDir()" 2010-07-09 14:06:38 -07:00
Christian Mehlmauer
0df10e9b4e Documentation Bug (Issue 9557)
There was an issue in the Time.toMillis example.
Also removed some whitespaces so the file
applies to the Android coding Styleguide

Change-Id: Ic1383e506b30ff181c6e14a12f675b52e5c8ccbc
2010-07-06 20:42:22 +02:00
Johannes Carlsson
3372f2e259 Corrected buffer overflow when parsing /proc/wakelocks
The android_os_Process_parseProcLineArray in android_util_Process.cpp
writes up to buffer[endIndex]. This sometimes caused an assert to be
triggered in NewStringUTF when the output from /proc/wakelocks was
larger than 4096 bytes. The buffer was also increased in order to be
able to parse all wakelocks completely.

Change-Id: Idf8e66d61ad979377569048f59c3eee278b146db
2010-07-02 10:20:55 +02:00
Christian Mehlmauer
10c543da2f Reduced Warnings by adding Type Arguments and removing unused imports
Change-Id: I42f8f9f9a6a6b271eaeb1a02f6d6567a630936ea
2010-06-25 21:29:34 +02:00
Christian Mehlmauer
a47130783b Replaced deprecated calls to setButton and setButton2
Change-Id: Ifcc3f3afc1689406a3298dab7b00a8edb83c115e
2010-06-25 20:03:42 +02:00
Christian Mehlmauer
e8db3a3f40 Replaced deprecated setButton Methodcalls
Change-Id: I8358b2dce25c6d5024550c54d98b4891f41b2a40
2010-06-25 20:01:03 +02:00
Christian Mehlmauer
5f5acca334 Improved logging when there's an error creating the directories in getFilesDir()
Improved logging when there's an error creating the
directories in getFilesDir();

Due to mkdirs() only returns false on errors,
it's better to output the directory path so the dev
knows the path that can not be created
See also Issue 8886
http://code.google.com/p/android/issues/detail?id=8886

Change-Id: I44d6adc8508ef9ca57f000b5d7bceeb0cfa3ed13
2010-06-25 19:06:18 +02:00
Nick Pelly
cb2555ebb6 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
801dbe26ee Do not log AT command traffic by default.
Bug: 2792732
Change-Id: I0ef25f38f38685291af6680cf653046eb391da5a
2010-06-24 11:48:54 -07:00
Kenny Root
584bd35aba 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
30cf330fae Import revised translations
Change-Id: I4b91aea9c53332569a7123fdb32141530ede6d3d
2010-06-21 11:03:50 -07:00
Kenny Root
e364122555 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
Kenny Root
c4e38577f4 Import revised translations
Change-Id: Ife82312cc21acc144a70718f79afcafbdd7eda7a
2010-06-20 18:54:45 -07:00
The Android Open Source Project
f1f33c4eb2 merge from open-source master
Change-Id: If7ae0c5629d1b3c540cacfa517425c2e6b5822d1
2010-06-18 12:46:16 -07:00
The Android Open Source Project
766d1b7458 merge from open-source master
Change-Id: I05e4c26c902f3cfe0dd99107f518768b246562f7
2010-06-18 12:44:20 -07:00
The Android Open Source Project
e5a023bfbb merge from open-source master
Change-Id: I8e7ccd470e8b90347686985aa2d8337d0c38900c
2010-06-18 12:40: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
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
The Android Open Source Project
7d10df4e24 merge from open-source master
Change-Id: I0684cac9eb230d864614aef0634c072f4e3ef6a3
2010-06-15 11:37:17 -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
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
4138677a72 merge from open-source master
Change-Id: I405069e9495e43fdcdedc41efce77d43a291272c
2010-06-15 09:30:31 -07:00