drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,774 Commits 1 Branch 0 Tags
Commit Graph

12776 Commits

Author SHA1 Message Date
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
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
Brad Fitzpatrick
3a2c6bf0fc am 69ea4e15: Documentation fixes found over vacation hacking. 
* commit '69ea4e15e52c456537575d21443ac1efdb03a902':
  Documentation fixes found over vacation hacking.
 2011-01-05 13:52:53 -08:00
Brad Fitzpatrick
69ea4e15e5 Documentation fixes found over vacation hacking. 
Change-Id: I28900026465d66d950cf4f05f0c202b46c3c2d43
 2011-01-05 13:07:34 -08:00
Nick Pelly
978e41fccf am 8d98aebe: Merge "Fix technology extra naming for IsoDep and NfcB (API part)." into gingerbread 
* commit '8d98aebe286be0ca963232afce3d5ceec67d3d7a':
  Fix technology extra naming for IsoDep and NfcB (API part).
 2011-01-04 18:33:41 -08:00
Martijn Coenen
a559aa4759 Fix technology extra naming for IsoDep and NfcB (API part). 
Change-Id: Iaa8f1b4dec5d626ffb17a33d71d2f92dd0d99636
 2011-01-05 13:30:15 +11:00
Nick Pelly
c5caaf5ff8 am 8f49c025: Merge "Added response flags and DSFID extras for NfcV technology (API part)." into gingerbread 
* commit '8f49c025ca5b4ed84290fb9e5e0b7acb1c139b35':
  Added response flags and DSFID extras for NfcV technology (API part).
 2011-01-03 22:39:42 -08:00
Nick Pelly
8f49c025ca Merge "Added response flags and DSFID extras for NfcV technology (API part)." into gingerbread 2011-01-03 22:38:14 -08:00
Martijn Coenen
7eb32a4427 Added response flags and DSFID extras for NfcV technology (API part). 
Also fixed a missing assignment in NfcB technology.

Change-Id: Ic564a0a17a9638c11fa528056da40f74ed37e9e6
 2011-01-04 17:37:29 +11:00
Nick Pelly
d81c68c31e am a743448a: Merge "Tweak Ndef.getType() API. Rename constants, expand javadoc." into gingerbread 
* commit 'a743448a1b34d950b1e6f06e308ce113cbc9abcb':
  Tweak Ndef.getType() API. Rename constants, expand javadoc.
 2011-01-03 22:35:49 -08:00
Nick Pelly
a743448a1b Merge "Tweak Ndef.getType() API. Rename constants, expand javadoc." into gingerbread 2011-01-03 22:32:56 -08:00
Nick Pelly
ddbb2c997b Tweak Ndef.getType() API. Rename constants, expand javadoc. 
Change-Id: I9d2c83411411fea4ef46bb7c30ebdbcd9ee3e7d8
 2011-01-04 17:31:48 +11:00
Nick Pelly
a3e4293cdc am 163bd407: Merge "Added getType() to NDEF technology class (API part)." into gingerbread 
* commit '163bd407492bbadcdc8f0759191e1b9142d06859':
  Added getType() to NDEF technology class (API part).
 2011-01-03 21:01:01 -08:00
Nick Pelly
163bd40749 Merge "Added getType() to NDEF technology class (API part)." into gingerbread 2011-01-03 20:58:26 -08:00
Martijn Coenen
d27ebf1e69 Added getType() to NDEF technology class (API part). 
Change-Id: Idfa391dd9d4a401e1daa3dc90ca57e4a3d9e0fa3
 2011-01-04 15:57:39 +11:00
Nick Pelly
30ce5f8567 am 8c09ef91: Merge "Removed selectAid() from IsoDep." into gingerbread 
* commit '8c09ef91aef0706a012e449ba3d16c03e0d64508':
  Removed selectAid() from IsoDep.
 2011-01-03 20:11:08 -08:00
Nick Pelly
8c09ef91ae Merge "Removed selectAid() from IsoDep." into gingerbread 2011-01-03 20:09:03 -08:00
Martijn Coenen
912aa1cd70 Removed selectAid() from IsoDep. 
It's a convenience method that can be implemented with transceive();
not really needed for now.

Change-Id: Idd855c85b15d97ae679d11d908834be3cb2741d8
 2011-01-04 15:08:34 +11:00
Nick Pelly
7e4d74f7b9 am 4b94dee8: Merge "Added transfer/restore convience cmds to MF Classic tech." into gingerbread 
* commit '4b94dee8336a1135e4fc67a5911223bb5aabad99':
  Added transfer/restore convience cmds to MF Classic tech.
 2011-01-03 18:34:37 -08:00
Martijn Coenen
a42b352594 Added transfer/restore convience cmds to MF Classic tech. 
Change-Id: I675993bc3aae6a741d63be458a0dfea240dd5316
 2011-01-04 13:32:06 +11:00
Jean-Baptiste Queru
a6ac0ec30d am 69ebb984: Merge "according to rfc2617, nc-value = 8LHEX" 
* commit '69ebb984f230a523dc316bdb2c9e9c28111364fd':
  according to rfc2617, nc-value = 8LHEX
 2010-12-28 15:47:42 -08:00
Jean-Baptiste Queru
69ebb984f2 Merge "according to rfc2617, nc-value = 8LHEX" 2010-12-28 15:33:10 -08:00
Alon Albert
2967aa3e60 am 672ebb61: Merge "Improved ignore-backoff handling Allow a non-epidited ignore-backoff op to pass through an expidited backed off op." into gingerbread 
* commit '672ebb61a755e4bbe60e4e884b1adadf186733b6':
  Improved ignore-backoff handling Allow a non-epidited ignore-backoff op to pass through an expidited backed off op.
 2010-12-28 14:57:09 -08:00
Alon Albert
672ebb61a7 Merge "Improved ignore-backoff handling Allow a non-epidited ignore-backoff op to pass through an expidited backed off op." into gingerbread 2010-12-28 14:44:51 -08:00
Jean-Baptiste Queru
e90a1b16a3 am 752942ec: Merge "The phone is crashing when unknown mime content is transferred." 
* commit '752942ec4719e6a274d6ab11103ac28459cb0f0c':
  The phone is crashing when unknown mime content is transferred.
 2010-12-28 10:55:04 -08:00
Bin Jin
b19c9c3994 according to rfc2617, nc-value = 8LHEX 
Change-Id: I8646fd8d68cfa4786ee6fc24a757b2af93955c4b
 2010-12-25 17:53:30 +08:00
Jeff Brown
fa93584a4f am c6f2b3b3: Merge "Fix policy issues when screen is off. (DO NOT MERGE)" into gingerbread 
* commit 'c6f2b3b302c06b8b7b81ec7e3a43a7df1813d0e0':
  Fix policy issues when screen is off. (DO NOT MERGE)
 2010-12-23 12:43:48 -08:00
Jeff Brown
c6f2b3b302 Merge "Fix policy issues when screen is off. (DO NOT MERGE)" into gingerbread 2010-12-23 12:41:59 -08:00