18310 Commits

Author SHA1 Message Date
Jason Sams
0bcc74ccca Merge "Change default mode." 2010-02-10 18:10:02 -08:00
Jason Sams
8dd9ca3e97 Change default mode. 2010-02-10 18:09:36 -08:00
Jason Sams
b8755c7ed3 Merge "Add java benchmark to imageProcessing." 2010-02-10 18:08:28 -08:00
Jason Sams
586f3b5d32 Add java benchmark to imageProcessing. 2010-02-10 18:07:37 -08:00
Jason Sams
b507e71111 Merge "Cleanup image processing example script." 2010-02-10 16:59:47 -08:00
Jason Sams
1d317d1453 Cleanup image processing example script. 2010-02-10 16:58:16 -08:00
Oscar Montemayor
87c2b15d39 Merge "Fix for bug 2427961 android.security.tests.SystemKeyStoreTest:testBasicAccess is failing. Fixed issues in test." 2010-02-10 16:33:01 -08:00
Jim Miller
575c6710a3 Merge "Fix 2373088: Cleanup and minor fixes to PasswordKeyboard*." 2010-02-10 15:45:32 -08:00
Irfan Sheriff
102d05fa91 get DHCP IP on each connection
The IP state was not being refreshed when the supplicant transitions
from COMPLETED to ASSOCIATED to COMPLETED. This can lead to
a connected state with no real connection due to old IP settings.
The fix refreshes IP on each connection.

Bug: 2329261
Change-Id: I38cd56369ee2d8ab3e0f06f5c9f5712b9b2f35a0
2010-02-10 15:22:58 -08:00
Andreas Huber
aa82768b8c Merge "Fixing AMR recording code." 2010-02-10 15:16:09 -08:00
Jason Sams
a5cbed967d Merge "Fix ImageProcessing example." 2010-02-10 15:04:56 -08:00
Andreas Huber
259b7c1c1b Fixing AMR recording code. 2010-02-10 15:04:31 -08:00
Jason Sams
ec2746c33f Fix ImageProcessing example. 2010-02-10 15:03:24 -08:00
Ben Cheng
05b2f71ebd Merge "Support per-application switch to execute the VM in safe mode." 2010-02-10 14:52:53 -08:00
Shimeng (Simon) Wang
ea23206c28 Merge "Add back lost python script." 2010-02-10 14:52:07 -08:00
Ben Cheng
23085b781e Support per-application switch to execute the VM in safe mode.
The new attribute can be set by adding android:safeMode="true"
in AndroidManifest.xml with the SDK.

Tested with pairing locally compiled SDK with Eclipse and verified that the JIT
(the only component currently included in the safe mode) is indeed disabled
with the new attribute.

Bug: 2267583
2010-02-10 14:51:31 -08:00
Jim Miller
280b6023cb Fix 2373088: Cleanup and minor fixes to PasswordKeyboard*. 2010-02-10 14:50:58 -08:00
Dan Egnor
60586f2ec6 API CHANGE: Add SSLSessionCache public API to allow unbundled SSL session caching.
Generally clean up the associated SSLCertificateSocketFactory API as well,
change AndroidHttpClient to use this new thing, and make the android-common
library build SDK-clean (woo hoo).

Bug: 2362543
Bug: 2357311
2010-02-10 14:43:21 -08:00
Marco Nelissen
d2e6af66ce Merge "Do autodetection even if no locale was specified, and use the detected encoding if it is unambiguous." 2010-02-10 14:24:44 -08:00
Bjorn Bringert
e4e82f2782 Unhide SearchManager.INTENT_ACTION_SEARCH_SETTINGS
This intent action is needed by Settings to start the search settings
activity which lives in QuickSearchBox / GoogleQuickSearchBox.

Fixes http://b/issue?id=2394530

Change-Id: Iea2a7d9df0092459e5618986f4f789f9257f912a
2010-02-10 21:30:29 +00:00
Bjorn Bringert
23897c16a6 Use resource ID for searchable description
Before, SearchableInfo read and cached the localized
searchable description, which meant that it was not updated
on locale changes. Now SearchableInfo only holds the resource
ID.

SearchableInfo is a new API in Froyo, so it's ok to change.

Part of http://b/issue?id=2175247

Change-Id: I1898f7895b9172f58419d906ad741cb7dd1e7252
2010-02-10 21:22:57 +00:00
Suchi Amalapurapu
f67119bce5 Merge "Set default value for default install location" 2010-02-10 12:45:16 -08:00
Suchi Amalapurapu
a9c1625e71 Set default value for default install location 2010-02-10 12:39:59 -08:00
Makoto Onuki
a7d7f79c40 Adding null check. 2010-02-10 12:16:29 -08:00
Doug Zongker
2fe23de8e3 Merge "add Base64OutputStream to android-common" 2010-02-10 11:47:17 -08:00
Fred Quintana
caa6f3860f Merge "fix an NPE in SyncManager's dump where it can get a null AuthorityInfo; instead create one if one doesn't exist yet" 2010-02-10 11:45:47 -08:00
Fred Quintana
1bbcd105a1 fix an NPE in SyncManager's dump where it can get a null AuthorityInfo; instead create one if one doesn't exist yet 2010-02-10 11:44:23 -08:00
Romain Guy
46b8efa990 Merge "Prevent infinite loop in the Phone UI." 2010-02-10 11:30:03 -08:00
Romain Guy
5180d1c522 Prevent infinite loop in the Phone UI. 2010-02-10 11:29:22 -08:00
Shimeng (Simon) Wang
b4489000d1 Add back lost python script.
The script is used to generate top level domains' regular expressions.
This is enhanced and used to regenerate the new top level domains.

	new file:   common/tools/make-iana-tld-pattern.py
2010-02-10 11:22:01 -08:00
San Mehat
d0efb6bc15 Merge "StorageNotification: Move notification / usb storage activity into StatusBarPolicy" 2010-02-10 11:21:50 -08:00
Andreas Huber
4c48cb72ff Merge "Properly detect Adobe's .f4v file format as an mp4 ISO compliant file." 2010-02-10 11:16:14 -08:00
Doug Zongker
b90d44808a add Base64OutputStream to android-common
Base64OutputStream is a FilterOutputStream that can encode or decode
base-64 data (with any of the flags supported by the Base64 class --
crlf, padding vs not, line wrapping vs not, etc.)

We change Base64 to have package-private decodeInternal and
encodeInternal methods that save all their state in objects and can be
called multiple times to stream data.  The existing functions for
in-memory encoding/decoding call the internal method once; the output
stream calls it multiple times.

Change-Id: Iac661d05329bc2e6b2863088efcedc974415ec44
2010-02-10 11:10:53 -08:00
Andreas Huber
01830a0814 Properly detect Adobe's .f4v file format as an mp4 ISO compliant file. 2010-02-10 11:08:15 -08:00
Andreas Huber
7d57413794 TI does not want the hardware H.263 decoder to be enabled. 2010-02-10 10:56:07 -08:00
Marco Nelissen
b45b0845a6 Do autodetection even if no locale was specified, and use the
detected encoding if it is unambiguous.
2010-02-10 10:36:02 -08:00
Andreas Huber
6ed937ebe9 Implementation of stagefright-enabled MediaPlayerService::decode functionality
related-to-bug: 2359268
2010-02-10 10:20:34 -08:00
Marco Nelissen
5b5f8652da Merge "Don't create a genre in the database for genre code 255 (unknown)" 2010-02-10 09:50:44 -08:00
Dirk Dougherty
f1275e74cb am 87bdfd6d: am d74bf162: Merge "Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper." into eclair
Merge commit '87bdfd6d22ee964339791bb65686a718d207793b'

* commit '87bdfd6d22ee964339791bb65686a718d207793b':
  Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper.
2010-02-10 09:46:08 -08:00
Bart Sears
615c98ae37 am eb42a288: (-s ours) am a1ab9766: Merge "DO NOT MERGE" into eclair
Merge commit 'eb42a28837e19722fd8c4ba13f13068581c4bdbf'

* commit 'eb42a28837e19722fd8c4ba13f13068581c4bdbf':
  DO NOT MERGE
2010-02-10 09:45:57 -08:00
Dirk Dougherty
87bdfd6d22 am d74bf162: Merge "Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper." into eclair
Merge commit 'd74bf1623913bade8f58369f39ebc666d551bb57' into eclair-plus-aosp

* commit 'd74bf1623913bade8f58369f39ebc666d551bb57':
  Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper.
2010-02-10 09:41:15 -08:00
Bart Sears
eb42a28837 am a1ab9766: Merge "DO NOT MERGE" into eclair
Merge commit 'a1ab9766718e11cb31bd5e87cda2a2bac03573db' into eclair-plus-aosp

* commit 'a1ab9766718e11cb31bd5e87cda2a2bac03573db':
  DO NOT MERGE
2010-02-10 09:41:06 -08:00
Dirk Dougherty
d74bf16239 Merge "Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper." into eclair 2010-02-10 09:38:01 -08:00
Bart Sears
a1ab976671 Merge "DO NOT MERGE" into eclair 2010-02-10 09:35:37 -08:00
Marco Nelissen
bfcb22a207 Don't create a genre in the database for genre code 255 (unknown) 2010-02-10 09:31:12 -08:00
Grace Kloba
b3316d35ff DO NOT MERGE
cherry-pick https://android-git.corp.google.com/g/#change,29843 from eclair-mr2
This will cherry-pick SHA1: 58def690a87b4aa2c01331c06b61e457198de0ea

This will workaround the following three bugs which are occuring because
the webview DB is getting corrupted:

http://b/issue?id=2338178
http://b/issue?id=2278210
http://b/issue?id=2405650

Here are the comments from the eclair-mr2 CL:

If openOrCreateDatabase() throws an exception, delete
the old db and re-do it. If it still fails, something
bad happens, like the directory may have the different
permission. Let it throw as WebView needs the db.

Fix http://b/issue?id=2179339
2010-02-10 09:24:31 -08:00
Bart Sears
1c00e57ca5 am 789b11c7: (-s ours) am 926780b0: Merge "DO NOT MERGE" into eclair
Merge commit '789b11c715af48a0379b8b1f90d7a829ac6a8145'

* commit '789b11c715af48a0379b8b1f90d7a829ac6a8145':
  DO NOT MERGE
2010-02-10 09:24:14 -08:00
Bart Sears
789b11c715 am 926780b0: Merge "DO NOT MERGE" into eclair
Merge commit '926780b023a09d37e8dcf1fabf6fa990f042f06d' into eclair-plus-aosp

* commit '926780b023a09d37e8dcf1fabf6fa990f042f06d':
  DO NOT MERGE
2010-02-10 09:18:37 -08:00
Bart Sears
926780b023 Merge "DO NOT MERGE" into eclair 2010-02-10 09:13:48 -08:00
Suchi Amalapurapu
117818e4f1 Add new manifest option for install location
Change recommendAppInstallLocation api
add code to parse new attribute.
Define flags in PackageInfo
Add new settings attributes for enabling setting and value for install location
Some tests
The policy for install location: if explicitly set in manifest as internal only we try to install the app only on internal storage. if set to preferExternal, we try to install it on sdcard if possible. If not we fall back to internal.
If the user enables setting SET_INSTALL_LOCATION(which will always
be set to false in final release builds) and sets a prefered location, we try
to honour it.
2010-02-10 08:59:08 -08:00