12802 Commits

Author SHA1 Message Date
Jeff Hamilton
06bb3aef0d am 52d3203e: Add dispatching overrides for foreground apps.
* commit '52d3203ef69d4babbc4dd030a15c08c0b8d1d226':
  Add dispatching overrides for foreground apps.
2011-01-13 12:46:16 -08:00
Jeff Hamilton
52d3203ef6 Add dispatching overrides for foreground apps.
Apps can register to override the default dispatching
but only when they're in the foreground.

Change-Id: I8e9a9254d3f79f097fb3c8c677d806043574ba4d
2011-01-13 14:24:07 -06:00
Wei-Ta Chen
62cd5c9788 am 61d9ffbf: Merge "Do not merge." into gingerbread
* commit '61d9ffbfd86dfe6bacce431b8ed9eebe1cfd8178':
  Do not merge.
2011-01-13 12:06:38 -08:00
Wei-Ta Chen
61d9ffbfd8 Merge "Do not merge." into gingerbread 2011-01-13 12:02:32 -08:00
Nick Pelly
18adceb427 am a29bf14e: Merge "New Intent defined for RF ON/OFF events" into gingerbread
* commit 'a29bf14e1d2857debc632ce4304a1c72dded348c':
  New Intent defined for RF ON/OFF events
2011-01-12 16:33:48 -08:00
Nick Pelly
a29bf14e1d Merge "New Intent defined for RF ON/OFF events" into gingerbread 2011-01-12 16:28:59 -08:00
daniel_tomas
200ca02fca New Intent defined for RF ON/OFF events
Change-Id: Ie1bc056bd36eb999b4678c594a3edc801a0cf6a1
2011-01-12 16:28:34 -08:00
Brad Fitzpatrick
54f428a63f am bdb7aee0: Merge "Fix for crash when setting live wallpaper."
* commit 'bdb7aee0a4934eb138f7caaf921f6c86f350b4b7':
  Fix for crash when setting live wallpaper.
2011-01-12 15:59:44 -08:00
Kenny Root
470750793b am e8c04db7: Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread
* commit 'e8c04db71e347396e9537ead7113ba9f46706e44':
  Add the {get,set}PackageObbPaths calls to API
2011-01-12 15:06:51 -08:00
Kenny Root
e8c04db71e Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread 2011-01-12 15:03:43 -08:00
Jaikumar Ganesh
471de1f5b3 am c8f42fb6: Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread
* commit 'c8f42fb69867f171c04013b1b1a8f7e897ae3685':
  DO NOT MERGE: Remove auto connection on ACL connection.
2011-01-12 13:58:17 -08:00
Jaikumar Ganesh
c8f42fb698 Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread 2011-01-12 13:56:13 -08:00
Jaikumar Ganesh
d50ac2966e DO NOT MERGE: Remove auto connection on ACL connection.
There is no need for this and causes problems with certian cars.

Fixes bug: 3281016

Change-Id: Idb65bbd4c8573923ebf82195b828ae071cb20aef
2011-01-12 13:50:06 -08:00
Kenny Root
0ee294470d am 6688b6c3: Merge "Allow updated system apps to retain priority" into gingerbread
* commit '6688b6c31765242866fc276cea7fa241fc5b5e7b':
  Allow updated system apps to retain priority
2011-01-12 11:59:49 -08:00
Mattias Petersson
d9463f50c8 Fix for crash when setting live wallpaper.
This fix prevents a crash that sometimes happens when setting a
live wallpaper. It happened when pressing "Set wallpaper" button
in the live wallpaper preview activity, before the preview was
fully loaded.

The crash happened in native code while updating the wallpaper
surface when calling mInputChannel.registerInputChannel(),
because the previous call to
mSession.add(mWindow, mLayout, View.VISIBLE, mContentInsets,
             mInputChannel)
had failed. The fix aborts the surface update when it is not
possible to add the window.

Change-Id: I0e79a851e5c7f7b15eb07043c63d1f4d78f14616
2011-01-12 15:41:55 +01:00
Wei-Ta Chen
25bce3a673 Do not merge.
Backport changes related to BitmapRegionDecoder from HoneyComb to
Gingerbread.

Bug: 3309014

////////////////////////////////////////////////////
This is a combination of 7 commits.
Revert "Do not merge."

This reverts commit f7681f84918c27f6a626681ce37ed2a236c44e82.

Change-Id: I46fd710600b1649773eaea2d9abc2b21a592f9a6

Fix a initialization bug in BitmapRegionDecoder.

Change-Id: I6c1151fd34970a84d4de52d664d9a5dc464892c5

Fix segfault when tring to throw IOException.

Change-Id: I530cc4409ba4ca17cec933afad077c5f60ba554f

Fix 3122139, where previewing an attachment for the second time will
fail.

Use AutoFDSeek to mark and restore the position before we read data from
the descriptor.

Change-Id: I3d4f012dce486e19b113bc90a98b94031cfa8195

Add inPreferQualityOverSpeed into BitmapFactory.Options.

The new field allows a developer to use a more accurate by
slightly slower IDCT method in JPEG decode. This in turns improves the
quality of the reconstructed image.

The field by default is not set and thus does not affect existing
applications.

Bug: 3238925
Change-Id: I93d55b7226e47a43e639325cd1a677694d6f2ee4

Unhide inPreferQualityOverSpeed in BitmapFactory.Options.

The new field allows a developer to use a more accurate by
slightly slower IDCT method in JPEG decode. This in turns improves the
quality of the reconstructed image.

The field by default is not set and thus does not affect existing
applications.

Bug: 3238925

Related changes: https://android-git.corp.google.com/g/#change,83291 and
                 https://android-git.corp.google.com/g/#change,83294

Change-Id: I969f5c413f9b2179454aeb90e18ae8222ee583b4

Correct the API comments.

BitmapRegionDecoder supports PNG as well.
2011-01-11 22:54:10 -08:00
Kenny Root
1c6e764275 Allow updated system apps to retain priority
Previously any updated system apps would not be able to have a greater
than 0 priority on an activity intent filter. Moving the priority check
later in the package scanning allows it to apply to updated system
packages as well.

Bug: 2572398
Change-Id: I9fdf7906809518b28b49ffec31afec1442d85d3c
2011-01-11 15:51:46 -08:00
Martijn Coenen
261fa99890 am 25be5365: Implement canMakeReadonly().
* commit '25be53652167300183282d170a00a6df576523f5':
  Implement canMakeReadonly().
2011-01-10 12:14:36 -08:00
Martijn Coenen
25be536521 Implement canMakeReadonly().
The method is needed since makeReadOnly() only works on T1T/T2T. Also removed
makeLowlevelReadonly(), since NFC forum does not allow setting the CC and the lock
bits separately.

Change-Id: I8e6d7c065b1f017ef07d878c41df05e1a8193f5a
2011-01-10 12:11:33 -08:00
Nick Pelly
6b9db1d8c8 am 92939376: Merge "Remove attemptDeadServiceRecovery() from TagTechnology\'s." into gingerbread
* commit '92939376199a08fa0a3b01759579a4979c2a94a2':
  Remove attemptDeadServiceRecovery() from TagTechnology's.
2011-01-10 12:06:51 -08:00
Nick Pelly
19326cdcbf am d64d711d: Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into gingerbread
* commit 'd64d711d457326b503981f7e55ab1448fa23ad9f':
  Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)
2011-01-10 12:06:39 -08:00
Nick Pelly
9293937619 Merge "Remove attemptDeadServiceRecovery() from TagTechnology's." into gingerbread 2011-01-10 12:02:36 -08:00
Nick Pelly
d64d711d45 Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into gingerbread 2011-01-10 12:02:26 -08:00
Brad Fitzpatrick
52d7072265 am cb842753: Merge "Closing cursor in finalizer to avoid GREF and fd leak in acore"
* commit 'cb8427538dfdc5eae941e377b11bfd11a95fc5a5':
  Closing cursor in finalizer to avoid GREF and fd leak in acore
2011-01-10 08:32:35 -08:00
Johannes Carlsson
872a52c6b6 Closing cursor in finalizer to avoid GREF and fd leak in acore
The finalize() call did not clean up completely, this eventually
caused the android.process.acore to crash since it ran out of fds
and GREF to increased above 2000 if an application forgot to close
its cursor objects. A warning was also added when this happens so
that application developers can correct their mistake. The
included test case tries to verify that the finalizer works as
expected by creating a bunch of Cursor objects without closing
them (without this fix the acore process crashes after about 400
iterations and the test case ends with "Process crashed").

Change-Id: I11e485cef1ac02e718b2742108aa88793666c31d
2011-01-10 12:46:21 +01:00
Nick Pelly
3dd6c45853 Remove attemptDeadServiceRecovery() from TagTechnology's.
attemptDeadServiceRecovery() is a hack to recover from NfcService dying. It
should be a rare event, and is only needed in NfcAdapter which is a long-lived
object.

TagTechnology objects are transient, it is acceptable for them to go stale
when NFC service dies. Lets not complicate the code with recovery for a rare
event.

Change-Id: I101350e920b075c680eb4f250683f0a2bb878553
2011-01-10 18:14:41 +11:00
Nick Pelly
b4003bf73e Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)
The later feels less clumsy.

Change-Id: I50f29aef23d2993dcfd25f4c4f2cb0d77bdc0610
2011-01-10 17:28:03 +11:00
Kenny Root
6c4d904851 Add the {get,set}PackageObbPaths calls to API
Add getPackageObbPaths() and setPackageObbPaths() to the public API.

Bug: 3214719
Change-Id: Icb9f2f92f8c59bb3d31317f609854e81abbd1449
2011-01-09 13:20:28 -08:00
Chris Tate
9b1bd2c7d1 am 6ec91731: DO NOT MERGE : Permission fix: don\'t require BACKUP perm for self-restores
* commit '6ec91731cbf6ee1a9a914d341fab9567d1599018':
  DO NOT MERGE : Permission fix: don't require BACKUP perm for self-restores
2011-01-09 13:04:01 -08:00
Chris Tate
6ec91731cb DO NOT MERGE : Permission fix: don't require BACKUP perm for self-restores
The public API is not supposed to require the BACKUP permission in order
for an application to restore its own last-known-good backup data.  However,
as currently implemented, BackupManager.requestRestore() [the public API
in question] depends on private Backup Manager methods that *do* enforce
that permission.  The net result is that the method cannot be successfully
used by third party applications: it will throw an exception if attempted.
This CL restructures the permission checking involved.

First, the underlying beginRestoreSession() operation can now be passed a
'null' transport name; if this is done, then the restore session is begun
on whatever the currently-active transport is.  Looking up the name of the
active transport is one of the permission-guarded actions that was required
with the initial implementation.

Second, a package name can now be passed to beginRestoreSession().  If
this is done, then the restore session can only be used to perform a
single-package restore of that one application.  The BACKUP permission is
not required if the caller is tying the restore to its own package name.

In combination, these changes permit BackupManager.requestRestore() to
function without the calling app needing to hold any special permission.
The no-permission case is intentionally quite narrow:  the caller must
hold the permission unless they both (a) pass 'null' for the transport
name, thereby accepting whatever the currently active transport is, and
(b) pass their own package name to restrict the restore session only
to their own app.

External bug http://code.google.com/p/android/issues/detail?id=10094
Internal bug 3197202

(Cherrypick from master to gingerbread)

Change-Id: Ie20b0bd2420345ce6eda178f854680b558f6372a
2011-01-09 12:49:47 -08:00
Dianne Hackborn
412ebd6f9d am 433863b1: Fix issue #3333958: Package Manager can sometimes mistakenly think...
* commit '433863b1085248a8fdc9bcd0ac8501cc6a7b8ace':
  Fix issue #3333958: Package Manager can sometimes mistakenly think...
2011-01-09 11:49:59 -08:00
Dianne Hackborn
433863b108 Fix issue #3333958: Package Manager can sometimes mistakenly think...
...an app is disabled!

Ouch.

Change-Id: I5788c5f8edfe2a0d6f4f0f3359e1742f8ed8d98e
2011-01-09 11:46:27 -08:00
Romain Guy
9688fdf51e am fcf3d12d: Merge "Typo in Javadoc"
* commit 'fcf3d12d701e41d6e46bae8c13776f56d54f90e8':
  Typo in Javadoc
2011-01-08 10:18:10 -08:00
Christian Mehlmauer
bd6fda11d2 Typo in Javadoc
Change-Id: I911ce02cab178f64aab222e4abcd25d113d75ec5
2011-01-08 18:22:20 +01:00
Gilles Debunne
ce77f1b7ff am 9ffb0a0d: Merge "Ran fixPngMetaTags on all the core/res assets." into gingerbread
* commit '9ffb0a0df3a97115234bd50a73ca60efcefb4ef7':
  Ran fixPngMetaTags on all the core/res assets.
2011-01-07 09:23:11 -08:00
Gilles Debunne
f9335c1f23 am 97664784: Merge "Asset cleanup. DO NOT MERGE" into gingerbread
* commit '976647841cc9e52c373679c930d06d81310ff289':
  Asset cleanup. DO NOT MERGE
2011-01-07 09:23:07 -08:00
Marco Nelissen
d1da80a4b3 am ba77a3f9: Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831
* commit 'ba77a3f9cb1d68b2ed4813aaae856444578e3a75':
  Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831
2011-01-06 20:29:11 -08:00
Nick Pelly
240cf3d17e am f54ad8da: Clean up transceive().
* commit 'f54ad8daf6f9dc2b9670ab1abbbfa4308b40bc6a':
  Clean up transceive().
2011-01-06 20:29:06 -08:00
Eric Fischer
247cd64c37 am 06d19ef0: Merge "Import translations for additional languages." into gingerbread
* commit '06d19ef0a0f29d9a0bec63097ec443815512e9b1':
  Import translations for additional languages.
2011-01-06 20:29:02 -08:00
Jeff Hamilton
525f953bb1 am 0aea1836: Merge "Make the new NFC APIs public." into gingerbread
* commit '0aea1836152da049273e581051a878381dcbd73d':
  Make the new NFC APIs public.
2011-01-06 20:28:52 -08:00
Dianne Hackborn
97b0b7bbd4 am 3ea5728e: Tweak level at which we reset battery stats to 90%.
* commit '3ea5728e703554f8ba0bb3aa1367d6dc45d704bb':
  Tweak level at which we reset battery stats to 90%.
2011-01-06 20:28:44 -08:00
Gilles Debunne
9ffb0a0df3 Merge "Ran fixPngMetaTags on all the core/res assets." into gingerbread 2011-01-06 18:30:26 -08:00
Gilles Debunne
976647841c Merge "Asset cleanup. DO NOT MERGE" into gingerbread 2011-01-06 18:29:59 -08:00
Marco Nelissen
ba77a3f9cb Add support for the "compilation" tag in mp3, mp4 and ogg, and also add
support for two common ways of specifying album artist in ogg files.
b/3311831

Change-Id: Iba1152013b7577168af71f947d7249560419fa05
2011-01-06 15:05:06 -08:00
Nick Pelly
f54ad8daf6 Clean up transceive().
BasicTagTechnology.transceive(byte[] raw) should work for most child classes,
except those that want to disable (raw) transceive.

Current plan is not to add transceiveMifare() etc - use explicit methods
instead.

Add package scoped BasicTagTechnology.transceive(byte[] rata, boolean raw)
as a helper to remove code duplication.

Change-Id: Iaea161022751c99058d291e2ed0f8c475d1c7282
2011-01-07 09:21:23 +11:00
Eric Fischer
06d19ef0a0 Merge "Import translations for additional languages." into gingerbread 2011-01-06 14:11:47 -08:00
Jeff Hamilton
0aea183615 Merge "Make the new NFC APIs public." into gingerbread 2011-01-06 11:28:42 -08:00
Jeff Hamilton
be372d6462 Make the new NFC APIs public.
Change-Id: Ia0acd9759d67683eaf1dc199dc2cc55e16a98e77
2011-01-06 13:18:34 -06:00
Eric Fischer
43c8aa3144 Import translations for additional languages.
Change-Id: I8a30fc0f90e22a5ec8d746aaf4b64776a3274016
2011-01-06 10:29:06 -08:00
Dianne Hackborn
3ea5728e70 Tweak level at which we reset battery stats to 90%.
Change-Id: I81151809100912c7956536d5d47279d2c2fea8c4
2011-01-05 19:14:53 -08:00