OSDN Git Service
Dmitri Plotnikov [Sat, 30 Jan 2010 01:37:05 +0000 (17:37 -0800)]
Merge "Adding system preferences for contacts: sort order and display order."
Dianne Hackborn [Fri, 29 Jan 2010 18:38:29 +0000 (10:38 -0800)]
More device policy work: clarify password modes, monkeying.
Clarifies what the password modes mean, renaming them to "quality"
and updating their documentation and the implementation to follow.
Also adds a facility to find out if a monkey is running, which I
need for the api demo to avoid letting it wipe the device.
Oscar Montemayor [Sat, 30 Jan 2010 00:50:21 +0000 (16:50 -0800)]
Merge "Apps on SD card project. Refactored recommendAppInstallLocation(..) method in PackageManager by making it an instance method. Since PackageManager has only abstarct instance methods, moved implementation to ApplicationContext.ApplicationPackageManager class, in line with the rest of the method implementations. Tah way, chage is consistent with best coding practices. Also MockPackageManager received the additional method."
Neal Nguyen [Sat, 30 Jan 2010 00:38:53 +0000 (16:38 -0800)]
Merge "Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources."
Andy McFadden [Sat, 30 Jan 2010 00:33:19 +0000 (16:33 -0800)]
Merge "Added dumpHprofDataDdms() call."
Chris Tate [Sat, 30 Jan 2010 00:28:19 +0000 (16:28 -0800)]
Merge "Don't crash on transport unregistration if there is no current transport"
Christopher Tate [Sat, 30 Jan 2010 00:27:04 +0000 (16:27 -0800)]
Don't crash on transport unregistration if there is no current transport
Change-Id: Icd0962254ba224a7be27d408dffb25b634f67863
Chris Tate [Sat, 30 Jan 2010 00:21:01 +0000 (16:21 -0800)]
Merge "Fix build: javadoc @link pointers need HTML-style #refname"
Christopher Tate [Fri, 29 Jan 2010 23:57:34 +0000 (15:57 -0800)]
Fix build: javadoc @link pointers need HTML-style #refname
Change-Id: I0e061516fce2bcf5dea401f58180f2ff396482ab
Dirk Balfanz [Wed, 20 Jan 2010 01:39:26 +0000 (17:39 -0800)]
adding OAuth library
Oscar Montemayor [Fri, 29 Jan 2010 23:27:00 +0000 (15:27 -0800)]
Apps on SD card project.
Refactored recommendAppInstallLocation(..) method in PackageManager by making it an instance method.
Since PackageManager has only abstarct instance methods, moved implementation to ApplicationContext.ApplicationPackageManager class, in line with the rest of the method
implementations. Tah way, chage is consistent with best coding practices.
Also MockPackageManager received the additional method.
Mathias Agopian [Fri, 29 Jan 2010 23:07:05 +0000 (15:07 -0800)]
Merge "Simplify the MemoryDealer implementation"
Andreas Huber [Fri, 29 Jan 2010 23:05:08 +0000 (15:05 -0800)]
Merge "Apparently the generic mpeg4 file header does not describe the actual samplerate and channel count of the content in the case of mpeg4 audio, instead the 'ESDS' atom must be consulted."
Chris Tate [Fri, 29 Jan 2010 23:02:03 +0000 (15:02 -0800)]
Merge "Make backup/restore asynchronous and enforce timeouts"
Andreas Huber [Fri, 29 Jan 2010 22:54:15 +0000 (14:54 -0800)]
Merge "Support 24-bit LE PCM wave files in stagefright."
Mathias Agopian [Tue, 26 Jan 2010 03:00:00 +0000 (19:00 -0800)]
Simplify the MemoryDealer implementation
At some point the implementation became complicated because of
SurfaceFlinger's special needs, since we are now relying on gralloc
we can go back to much simpler MemoryDealer.
Removed HeapInterface and AllocatorInterface, since those don't need
to be paramterized anymore. Merged SimpleMemory and Allocation.
Made SimplisticAllocator non virtual.
Removed MemoryDealer flags (READ_ONLY, PAGE_ALIGNED)
Removed a lot of unneeded code.
Andreas Huber [Fri, 29 Jan 2010 22:46:59 +0000 (14:46 -0800)]
Apparently the generic mpeg4 file header does not describe the actual samplerate and channel count of the content in the case of mpeg4 audio, instead the 'ESDS' atom must be consulted.
related-to-bug:
2407094
Ray Chen [Tue, 26 Jan 2010 22:43:35 +0000 (14:43 -0800)]
Unhide ThumbnailUtils to support Camera unbundling.
http://b/
2375978
Jack Palevich [Fri, 29 Jan 2010 22:28:36 +0000 (14:28 -0800)]
Merge "Implement the GL11ExtensionPack APIs."
Mike Lockwood [Fri, 29 Jan 2010 22:21:38 +0000 (14:21 -0800)]
Merge "Support for triggering the lockscreen while the screen is on:"
Chris Tate [Fri, 29 Jan 2010 22:15:14 +0000 (14:15 -0800)]
Merge "Add a method to IBackupTransport to get the current backup set token"
Andreas Huber [Fri, 29 Jan 2010 21:23:55 +0000 (13:23 -0800)]
Support 24-bit LE PCM wave files in stagefright.
related-to-bug:
2300197
Andreas Huber [Fri, 29 Jan 2010 22:08:56 +0000 (14:08 -0800)]
Merge "Properly forward errors returned by AudioTrack up to the player."
Christopher Tate [Thu, 28 Jan 2010 01:15:49 +0000 (17:15 -0800)]
Make backup/restore asynchronous and enforce timeouts
Callouts to app backup agents are now asynchronous, and timeouts are applied if
they take too long, hang, etc. The initial timeouts are set to 15 seconds on
backup, 60 seconds on restore. These operations typically run at background
priority, so it's necessary to give them ample time to run.
As part of setting up this asynchronicity, the Backup Manager's internal thread
management has been overhauled. It now spins off a single HandlerThread at
startup, and runs backup/restore/etc operations *synchronously* in that thread,
applying timeouts as appropriate. This means we're no longer spinning up new
threads all the time, and furthermore it ensures that we can never have more
than one operation in flight at once. Later CLs will remove the now-redundant
logic that previously ensured that operations didn't stomp on each other.
Bug:
2053560
Change-Id: Ie4315c219c7ff6dd8f51f2ad6c0872595b18cff1
Christopher Tate [Fri, 29 Jan 2010 20:48:20 +0000 (12:48 -0800)]
Add a method to IBackupTransport to get the current backup set token
This will be used to specifically manage restores of last-known-good data
generated from the current device during its normal provisioned lifetime.
Mike Lockwood [Wed, 27 Jan 2010 22:51:34 +0000 (17:51 -0500)]
Support for triggering the lockscreen while the screen is on:
Add new ALLOW_LOCK_WHILE_SCREEN_ON window manager flag, which when set
causes the window manager to put up the lockscreen after the
normal screen timeout has elapsed.
Add plumbing to pass PowerManager.userActivity() to the window manager policy.
Change-Id: I05adc52bad39c56031a08e8ec3cbcf5c2d9b9827
Signed-off-by: Mike Lockwood <lockwood@android.com>
Scott Main [Fri, 29 Jan 2010 21:52:30 +0000 (13:52 -0800)]
am
1076ea0a: am
9800adf2: Merge "docs: update web page debugging with info about page and line numbering in the log." into eclair
Merge commit '
1076ea0abe3cace6629063d63ee1242a5a7588a2'
* commit '
1076ea0abe3cace6629063d63ee1242a5a7588a2':
docs: update web page debugging with info about page and line
Dirk Dougherty [Fri, 29 Jan 2010 21:52:20 +0000 (13:52 -0800)]
am
aa86da9d: am
196ec566: Merge "SDK doc change: Increment the platform version var used in doc footer and elsewhere." into eclair
Merge commit '
aa86da9d14d08ee39ca3e3fcabba01560c64f37d'
* commit '
aa86da9d14d08ee39ca3e3fcabba01560c64f37d':
SDK doc change: Increment the platform version var used in doc footer and elsewhere.
Andreas Huber [Fri, 29 Jan 2010 21:51:33 +0000 (13:51 -0800)]
Merge "The AVC software decoder always aligns the decoded dimensions to 16 pixel boundaries, report this properly to callers."
Scott Main [Fri, 29 Jan 2010 21:47:40 +0000 (13:47 -0800)]
am
9800adf2: Merge "docs: update web page debugging with info about page and line numbering in the log." into eclair
Merge commit '
9800adf2a4d78d1e3e44dbef6aecf2b2b738c9c8' into eclair-plus-aosp
* commit '
9800adf2a4d78d1e3e44dbef6aecf2b2b738c9c8':
docs: update web page debugging with info about page and line
Dirk Dougherty [Fri, 29 Jan 2010 21:47:28 +0000 (13:47 -0800)]
am
196ec566: Merge "SDK doc change: Increment the platform version var used in doc footer and elsewhere." into eclair
Merge commit '
196ec566b39340942f146ce4a9af775f4c648d2d' into eclair-plus-aosp
* commit '
196ec566b39340942f146ce4a9af775f4c648d2d':
SDK doc change: Increment the platform version var used in doc footer and elsewhere.
Scott Main [Fri, 29 Jan 2010 21:40:53 +0000 (13:40 -0800)]
Merge "docs: update web page debugging with info about page and line numbering in the log." into eclair
Neal Nguyen [Wed, 13 Jan 2010 18:42:43 +0000 (10:42 -0800)]
Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources.
Most of these are file moves; a couple notable exceptions are the changes due to the move, and fixing up test code:
- database/DatabaseCursorTest.java
- database/DatabaseStatementTest.java
- net/UriTest.java
Andy McFadden [Fri, 29 Jan 2010 00:54:37 +0000 (16:54 -0800)]
Added dumpHprofDataDdms() call.
This adds a hidden dumpHprofDataDdms() method, which initiates an hprof
dump that sends its data directly to DDMS.
Andreas Huber [Fri, 29 Jan 2010 21:28:48 +0000 (13:28 -0800)]
The AVC software decoder always aligns the decoded dimensions to 16 pixel boundaries, report this properly to callers.
Oscar Montemayor [Fri, 29 Jan 2010 21:28:46 +0000 (13:28 -0800)]
Merge "Apps on SD card project. This class implements heuristics to determine best app install location, without looking at the package flags (pre-parsing stage)."
Andreas Huber [Fri, 29 Jan 2010 21:24:58 +0000 (13:24 -0800)]
Properly forward errors returned by AudioTrack up to the player.
related-to-bug:
2300197
Vasu Nori [Wed, 27 Jan 2010 22:31:24 +0000 (14:31 -0800)]
make SqliteDatabase ConflictAlgorithm and associated methods public.
SQLiteDatabase.java has ConflictAlgorithm which allows callers to specify
actions to take when insert or update causes constraint violations.
These actions are documented at http://www.sqlite.org/lang_conflict.html.
why make these public? usecase is the following:
Gmail has a table with a column "_id" being the integer primary key and
they let sqlite assign key values to the column.
but there is another UNIQUE key column (message_id) in the table.
so an insert could fail due to constraint violation on the message_id column
(i.e., not on the primary key). and when that happens, they would like to
get the value of _id that caused constraint violation.
currently hidden method insertOnConflict() already provides the above
functionality. that means exposing ConflictAlgorithm also.
Scott Main [Fri, 29 Jan 2010 18:28:18 +0000 (10:28 -0800)]
docs: update web page debugging with info about page and line
numbering in the log.
Maryam Garrett [Fri, 29 Jan 2010 19:33:24 +0000 (11:33 -0800)]
Merge "Move LoggingEvents.java to android-common & add UserHappiness"
Maryam Garrett [Tue, 26 Jan 2010 15:41:51 +0000 (10:41 -0500)]
Move LoggingEvents.java to android-common & add UserHappiness
The LoggingEvents move will allow Gmail, Voice Search and other apps to
access the LoggingEvents needed. This file will replace
packages/inputmethods/LatinIMEsrc/com/android/inputmethod/voice/LoggingEvents.java
vendor/google/apps/VoiceSearch/apps/VoiceSearch/src/com/google/android/voicesearch/logging/LoggingEvents.java
In addition to moving the file, I have added 3 new fields:
TIMESTAMP, IME_TEXT_ACCEPTED, CALLING_APP_NAME. I needed to
create CALLING_APP_NAME b/c I can't re-use EXTRA_APP_NAME
because that is reserved for one of two values: voice
search or voice IME.
I added another file to android-common: UserHappinessSignals
This can be imported by different applications to broadcast
various user happiness metrics. It is currently used by Gmail's
CompseActivity.java to indicate that a user "accepted" the IME
text when they pressed the send button.
Change-Id: Ia859140facb7fb66a12706735d5132ba9eaa5ea0
Andreas Huber [Fri, 29 Jan 2010 18:25:01 +0000 (10:25 -0800)]
Merge "Make sure the OMX component is synchronously shutdown before we try to instantiate another one. Also properly cleanup the software AVC decoder to avoid leaking memory."
Andreas Huber [Fri, 29 Jan 2010 18:10:22 +0000 (10:10 -0800)]
Make sure the OMX component is synchronously shutdown before we try to instantiate another one. Also properly cleanup the software AVC decoder to avoid leaking memory.
related-to-bug:
2404786
Andreas Huber [Fri, 29 Jan 2010 18:04:01 +0000 (10:04 -0800)]
Merge "For mpeg4 files streamed through HTTP, cache the entire sampletable metadata chunk in memory if possible."
Bjorn Bringert [Fri, 29 Jan 2010 17:23:05 +0000 (09:23 -0800)]
Merge "Update search source selector assets"
Suchi Amalapurapu [Fri, 29 Jan 2010 16:45:39 +0000 (08:45 -0800)]
Merge "Fix StringIndexOutOfBoundsException in PackageManagerService"
Bjorn Bringert [Fri, 29 Jan 2010 16:15:36 +0000 (16:15 +0000)]
Update search source selector assets
Change-Id: Id56e2ac195e1d1f8dcfe2fbe07025f3527396bba
Daniel Sandler [Fri, 29 Jan 2010 15:06:53 +0000 (10:06 -0500)]
Fix build.
(Broken in change Ib94f795c.)
San Mehat [Thu, 28 Jan 2010 16:03:44 +0000 (08:03 -0800)]
framework: os: Introduce IMountServiceObserver
Signed-off-by: San Mehat <san@google.com>
Daniel Sandler [Fri, 29 Jan 2010 14:22:33 +0000 (06:22 -0800)]
Merge "New full-screen activity for USB mass storage interaction."
Bjorn Bringert [Fri, 29 Jan 2010 12:11:30 +0000 (12:11 +0000)]
Fix StringIndexOutOfBoundsException in PackageManagerService
The method packageManagerService.getNextCodePath(String oldCodePath,
String prefix, String suffix) threw StringIndexOutOfBoundsException if
oldCodePath does not contain prefix, and prefix is longer than
oldCodePath, or if the preix and suffix overlap.
Fixes http://b/issue?id=
2404232
Change-Id: Ib8abb16f8bfd08f607476d9289f46d170c43a076
Chia-chi Yeh [Fri, 29 Jan 2010 08:26:28 +0000 (16:26 +0800)]
WifiService: allow EAP variables to be unset using empty strings.
Adam Powell [Fri, 29 Jan 2010 05:24:10 +0000 (21:24 -0800)]
Merge "Don't bounce programmatic scrolls of ScrollView and HorizontalScrollView."
Oscar Montemayor [Thu, 28 Jan 2010 20:01:44 +0000 (12:01 -0800)]
Apps on SD card project.
This class implements heuristics to determine best app install location, without looking at the package flags (pre-parsing stage).
Irfan Sheriff [Wed, 27 Jan 2010 23:45:27 +0000 (15:45 -0800)]
Handle error strings from monitor connection
Bug:
2399119
Change-Id: I481cfbfb11fb453659134004aafa3df236ba050b
Irfan Sheriff [Fri, 29 Jan 2010 04:46:25 +0000 (20:46 -0800)]
Merge "Blacklist APs instead of disable"
Dirk Dougherty [Fri, 29 Jan 2010 01:59:24 +0000 (17:59 -0800)]
Merge "SDK doc change: Increment the platform version var used in doc footer and elsewhere." into eclair
Dirk Dougherty [Fri, 29 Jan 2010 01:50:10 +0000 (17:50 -0800)]
SDK doc change: Increment the platform version var used in doc footer and elsewhere.
Bug:
2160782
Change-Id: I6e7721bca95cdc6565f3200d7609a4ea9b45cf9b
Adam Powell [Fri, 29 Jan 2010 01:24:56 +0000 (17:24 -0800)]
Don't bounce programmatic scrolls of ScrollView and HorizontalScrollView.
Tom Taylor [Thu, 28 Jan 2010 23:54:15 +0000 (15:54 -0800)]
Remove MMS from the framework
The MMS code has been moved into the mms-common library.
Move SqliteWrapper (and make it hidden) into the database
directory because Telephony.java depends on it. Create a mmscommon
library similar to androidcommon for a number of files used both
by the telephony layer, by mms, and by myfaves.
Change-Id: I2e23e87c4961b87c42a4c8a63f812fa9e0e44dec
Dirk Dougherty [Fri, 29 Jan 2010 00:52:43 +0000 (16:52 -0800)]
am
b574cf87: am
7b00a8ae: Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair
Merge commit '
b574cf876e64d8a9330b052d48dcc64c5abdd70a'
* commit '
b574cf876e64d8a9330b052d48dcc64c5abdd70a':
SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features.
Dirk Dougherty [Fri, 29 Jan 2010 00:46:54 +0000 (16:46 -0800)]
am
7b00a8ae: Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair
Merge commit '
7b00a8ae71c5964cb96e1663b778658eaa069b3e' into eclair-plus-aosp
* commit '
7b00a8ae71c5964cb96e1663b778658eaa069b3e':
SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features.
Dirk Dougherty [Fri, 29 Jan 2010 00:40:56 +0000 (16:40 -0800)]
Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair
Dirk Dougherty [Sat, 23 Jan 2010 00:52:34 +0000 (16:52 -0800)]
SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features.
Bug:
2160782
Change-Id: I8560f32b04a4044f58b8f7dd678aec781d56b9d9
Jean-Baptiste Queru [Thu, 28 Jan 2010 23:14:57 +0000 (15:14 -0800)]
resolved conflicts for merge of
bb074ef9 to master
Change-Id: I2d78d1280b56928f65517203348ddbd403fa9eae
Dirk Dougherty [Thu, 28 Jan 2010 23:10:19 +0000 (15:10 -0800)]
am
67a65856: am
965f4a6b: Merge "doc change only: Update announcement and mwc redirect to point to microsite." into eclair
Merge commit '
67a658567a6bad898c097e615f8efcb3c91fa50d'
* commit '
67a658567a6bad898c097e615f8efcb3c91fa50d':
doc change only: Update announcement and mwc redirect to point to microsite.
Eric Laurent [Thu, 28 Jan 2010 23:01:42 +0000 (15:01 -0800)]
Merge "Remove verbose log from AudioPolicyManagerBase."
Jim Miller [Thu, 28 Jan 2010 22:57:03 +0000 (14:57 -0800)]
am
fbf977be: am
9985867a: Fix
2397617: Right-align carrier text in lock screen and add carrier text to PINunlock in landscape mode.
Merge commit '
fbf977be5471a81b664bfc0a048497f268688a17'
* commit '
fbf977be5471a81b664bfc0a048497f268688a17':
Fix
2397617: Right-align carrier text in lock screen and add carrier text to PINunlock in landscape mode.
Robert Greenwalt [Thu, 28 Jan 2010 22:46:55 +0000 (14:46 -0800)]
am
3e229076: am
cc4b4016: Fix the reporting of NO_CONNECTIVITY.
Merge commit '
3e229076203cd8cfee0adac44cd3c930dfa0e59c'
* commit '
3e229076203cd8cfee0adac44cd3c930dfa0e59c':
Fix the reporting of NO_CONNECTIVITY.
Andreas Huber [Thu, 28 Jan 2010 22:27:37 +0000 (14:27 -0800)]
For mpeg4 files streamed through HTTP, cache the entire sampletable metadata chunk in memory if possible.
related-to-bug:
2295438
Andreas Huber [Thu, 28 Jan 2010 22:18:19 +0000 (14:18 -0800)]
Merge "Support the specification of additional HTTP headers in the creation of a DataSource."
Adam Powell [Thu, 28 Jan 2010 22:03:15 +0000 (14:03 -0800)]
Merge "ScrollView and HorizontalScrollView now will spring back if smoothScrollBy scrolls out of bounds. Tweaked bounce physics for OverScroller."
Jesse Wilson [Thu, 28 Jan 2010 22:00:48 +0000 (14:00 -0800)]
Merge "Fix the broken compile of a currently-not-being-compiled AWT class."
Adam Powell [Thu, 28 Jan 2010 21:52:24 +0000 (13:52 -0800)]
ScrollView and HorizontalScrollView now will spring back if smoothScrollBy scrolls out of bounds. Tweaked bounce physics for OverScroller.
Robert Greenwalt [Thu, 28 Jan 2010 21:44:45 +0000 (13:44 -0800)]
am
6d626d41: am
5381e4ef: Merge "Refine fix I53e91db7 to apply only to wifi network" into eclair
Merge commit '
6d626d41e9db62a0eadb61ccb2aa4081a8b9f6d0'
* commit '
6d626d41e9db62a0eadb61ccb2aa4081a8b9f6d0':
Refine fix I53e91db7 to apply only to wifi network
Scott Main [Thu, 28 Jan 2010 21:44:35 +0000 (13:44 -0800)]
am
9985feca: am
d243bc71: Merge "docs: reference the history JS file with docRoot in order to make offline doc searches work. (I think this was a regression due to a missed merge.) Bug:
1909300" into eclair
Merge commit '
9985fecaa0bf32e94695f49bb495c9d0cd41e174'
* commit '
9985fecaa0bf32e94695f49bb495c9d0cd41e174':
docs: reference the history JS file with docRoot in order to
Eric Laurent [Thu, 28 Jan 2010 21:42:59 +0000 (13:42 -0800)]
Remove verbose log from AudioPolicyManagerBase.
Mike Reed [Thu, 28 Jan 2010 21:42:31 +0000 (13:42 -0800)]
am
b2244690: (-s ours) am
f904be16: Merge "disable high-quality filtering during scrolling, until I can cached the scaled images." into eclair
Merge commit '
b22446901c477f40863132a9617368852d358f64'
* commit '
b22446901c477f40863132a9617368852d358f64':
disable high-quality filtering during scrolling, until I can cached the scaled images.
Jean-Baptiste Queru [Thu, 28 Jan 2010 21:19:56 +0000 (13:19 -0800)]
Merge "resolved conflicts for merge of
33ca1f32 to master"
Daniel Sandler [Thu, 28 Jan 2010 20:12:04 +0000 (15:12 -0500)]
New full-screen activity for USB mass storage interaction.
Still TODO: patch into forthcoming callbacks from
MountService so the USB storage activity always shows the
correct state of the device. (Right now it only refreshes
its display onResume.)
Bug:
2299129
Kenny Root [Thu, 28 Jan 2010 21:15:56 +0000 (13:15 -0800)]
resolved conflicts for merge of
33ca1f32 to master
Change-Id: If5344c23c4fd727c0ad684859126337de6ca1d9f
Dianne Hackborn [Thu, 28 Jan 2010 03:23:59 +0000 (19:23 -0800)]
More device admin.
- Clean up device policy manager APIs.
- Implement lockNow(). For now this just turns the screen off to lock the device.
Andreas Huber [Thu, 28 Jan 2010 00:49:05 +0000 (16:49 -0800)]
Support the specification of additional HTTP headers in the creation of a DataSource.
related-to-bug:
2393577
Andreas Huber [Thu, 28 Jan 2010 20:56:17 +0000 (12:56 -0800)]
Merge "API Extension: Support for optionally specifying a map of extra request headers when specifying the uri of media data to be played."
Dirk Dougherty [Thu, 28 Jan 2010 20:37:21 +0000 (12:37 -0800)]
am
99988b6e: am
84207956: Merge "SDK doc change: Misc small fixes." into eclair
Merge commit '
99988b6ee6c18b3e12f73635467e1fb4ee9aa43a'
* commit '
99988b6ee6c18b3e12f73635467e1fb4ee9aa43a':
SDK doc change: Misc small fixes.
Dirk Dougherty [Thu, 28 Jan 2010 20:37:10 +0000 (12:37 -0800)]
am
43d5a09f: am
c5de95bf: Merge "SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager." into eclair
Merge commit '
43d5a09f4626d6cc865b7ef138a1cd828363b8f8'
* commit '
43d5a09f4626d6cc865b7ef138a1cd828363b8f8':
SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager.
Brian Carlstrom [Thu, 28 Jan 2010 20:33:27 +0000 (12:33 -0800)]
Merge "Issue 1597: browser crash possibly related to invalid SSL certificate"
Jesse Wilson [Thu, 28 Jan 2010 20:30:19 +0000 (12:30 -0800)]
Fix the broken compile of a currently-not-being-compiled AWT class.
I intend to remove AWT entirely, but doing so is a large project and
this stopgap will remove several errors from Eclipse projects.
Kenny Root [Thu, 28 Jan 2010 20:03:49 +0000 (12:03 -0800)]
resolved conflicts for merge of
b0903104 to master
Change-Id: Iff20980c44d42b41ae411c4201e0927cee19d415
Andreas Huber [Thu, 28 Jan 2010 19:19:57 +0000 (11:19 -0800)]
API Extension: Support for optionally specifying a map of extra request headers when specifying the uri of media data to be played.
related-to-bug:
2393577
Original change by Andrei Popescu <andreip@google.com>
Irfan Sheriff [Thu, 14 Jan 2010 20:37:49 +0000 (12:37 -0800)]
Blacklist APs instead of disable
We currently disable networks upon too many reconnects. This leads to asking
the user input for reconnects. Blacklist it instead.
Bug:
2129037
Change-Id: I23d69daf3964c066ed7f70d32fefb81016f19aa2
Brian Carlstrom [Wed, 27 Jan 2010 07:07:42 +0000 (23:07 -0800)]
Issue 1597: browser crash possibly related to invalid SSL certificate
Dirk Dougherty [Thu, 28 Jan 2010 18:48:15 +0000 (10:48 -0800)]
am
97ca28cd: am
5d14cb34: Merge "doc change: add announce for developer lab at mwc. move adc to carousel." into eclair
Merge commit '
97ca28cdd9b12e1c9e9ae57967010b60e61d6bf9'
* commit '
97ca28cdd9b12e1c9e9ae57967010b60e61d6bf9':
doc change: add announce for developer lab at mwc. move adc to carousel.
John Wang [Thu, 28 Jan 2010 18:47:27 +0000 (10:47 -0800)]
am
89fec7b1: am
098295a5: Merge "Updated emergency string when locale changes." into eclair
Merge commit '
89fec7b155981d6e99eb1e05793f343a5d04aa59'
* commit '
89fec7b155981d6e99eb1e05793f343a5d04aa59':
Updated emergency string when locale changes.
Grace Kloba [Thu, 28 Jan 2010 18:47:15 +0000 (10:47 -0800)]
Eric Laurent [Thu, 28 Jan 2010 18:09:09 +0000 (10:09 -0800)]
am
131c5e08: am
a59551ba: Merge "Fix issue
2388215: Audio not routed to 3.5mm Headset after removal/insertion." into eclair
Merge commit '
131c5e0867d542788cf2dab23b17f2f8cc3d0391'
* commit '
131c5e0867d542788cf2dab23b17f2f8cc3d0391':
Fix issue
2388215: Audio not routed to 3.5mm Headset after removal/insertion.
John Wang [Thu, 28 Jan 2010 18:08:55 +0000 (10:08 -0800)]
am
64c92f75: am
08cb0024: Handle emergency calls only status in ServiceStateTracker.
Merge commit '
64c92f75df7415084aa9f0b304f2a99089b6be9f'
* commit '
64c92f75df7415084aa9f0b304f2a99089b6be9f':
Handle emergency calls only status in ServiceStateTracker.
Grace Kloba [Wed, 27 Jan 2010 22:11:13 +0000 (14:11 -0800)]
Use a single EXTRA_HEADERS intent.
Grace Kloba [Thu, 28 Jan 2010 17:14:52 +0000 (09:14 -0800)]
Merge "Need to check parent for performLongClick() as it is the result of a delayed message."
Patrick Scott [Thu, 28 Jan 2010 16:32:43 +0000 (08:32 -0800)]
Merge "First pass at the url rendering service."