30031 Commits

Author SHA1 Message Date
Brad Fitzpatrick
cb8427538d Merge "Closing cursor in finalizer to avoid GREF and fd leak in acore" 2011-01-10 08:02:03 -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
Dianne Hackborn
a9d8a69a04 am 9aac2e2b: Merge "Referencing of "r.record.name" is occured, when "r.record" is null." into gingerbread
* commit '9aac2e2b9541c424ca02483631b08949f0e90c8c':
  Referencing of "r.record.name" is occured, when "r.record" is null.
2011-01-09 13:56:07 -08:00
Dianne Hackborn
9aac2e2b95 Merge "Referencing of "r.record.name" is occured, when "r.record" is null." into gingerbread 2011-01-09 13:53:53 -08:00
Chris Tate
69f8d3c667 am bbff7ed4: DO NOT MERGE : Ensure that the first post-restore backup pass is correct
* commit 'bbff7ed44b353ff299b900a1ff50812a082206f0':
  DO NOT MERGE : Ensure that the first post-restore backup pass is correct
2011-01-09 13:31:23 -08: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
bbff7ed44b DO NOT MERGE : Ensure that the first post-restore backup pass is correct
Some restore passes bring an ancestral dataset to the application, but
others instead act to bring an app back into sync with its own most-
recently-saved data.  In the latter case the state file written by the
app after the restore is a correct basis for generating future backup
deltas, but in the former case it is not.

The app should not be required to distinguish between these cases;
the framework has all the information necessary to handle the saved
state correctly following any flavor of restore operation.  This
patch makes the Backup Manager properly cause a full backup pass
following an ancestral-dataset restore.  After a current-set
restore the saved state file is an accurate description for
purposes of continued backup operations, so is preserved.

(Cherrypick from master to gingerbread)

Change-Id: I4bc4e8782a168ecc0795107a340bdbb35060730e
2011-01-09 13:01:45 -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
lge-aosp
c712204d91 Referencing of "r.record.name" is occured, when "r.record" is null.
Change-Id: I625e45923a7fd9f4ac8eb434ed07d452f8e1e0b6
2011-01-09 12:38:34 -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
Dianne Hackborn
95db1cfc74 am cd23823d: Merge "Fix issue # 3227963: SecurityException: Neither user 10023 nor..." into gingerbread
* commit 'cd23823d4f533431c76baa104eb50b7803b3b391':
  Fix issue # 3227963: SecurityException: Neither user 10023 nor...
2011-01-09 11:44:17 -08:00
Dianne Hackborn
cd23823d4f Merge "Fix issue # 3227963: SecurityException: Neither user 10023 nor..." into gingerbread 2011-01-09 11:38:15 -08:00
Romain Guy
9688fdf51e am fcf3d12d: Merge "Typo in Javadoc"
* commit 'fcf3d12d701e41d6e46bae8c13776f56d54f90e8':
  Typo in Javadoc
2011-01-08 10:18:10 -08:00
Romain Guy
fcf3d12d70 Merge "Typo in Javadoc" 2011-01-08 10:04:32 -08:00
Christian Mehlmauer
bd6fda11d2 Typo in Javadoc
Change-Id: I911ce02cab178f64aab222e4abcd25d113d75ec5
2011-01-08 18:22:20 +01:00
Gloria Wang
9e0bb6d5ee am 0544d059: Merge "DRM Framework bug fixes."
* commit '0544d05990c0f43a143e98e71f7fc60277872806':
  DRM Framework bug fixes.
2011-01-07 15:34:08 -08:00
Scott Main
ac8d79266b am 9b447d12: docs: catchup gingerbread to gingerbread-docs with misc changes
* commit '9b447d122a2f0a4798f03749e9d93b9a58834fe3':
  docs: catchup gingerbread to gingerbread-docs with misc changes
2011-01-07 15:32:04 -08:00
Scott Main
9b447d122a docs: catchup gingerbread to gingerbread-docs with misc changes
Change-Id: Id5d38a6d97323e082535e433ab64e89e8bd3d021
2011-01-07 14:55:59 -08:00
Scott Main
246a01b1de am 3d0f0108: cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f docs: update dashboard
* commit '3d0f0108f9487512195c7344be2417c30a93c3fc':
  cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f docs: update dashboard
2011-01-07 13:36:58 -08:00
Scott Main
f379205596 am c5602aee: fix bug 3295540
* commit 'c5602aeea3f4962dcb66d7a9e4a733259d5c12d5':
  fix bug 3295540
2011-01-07 13:34:54 -08:00
Scott Main
3d0f0108f9 cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f
docs: update dashboard

Change-Id: I2b91243b28cc831348d29fcf11e23f5018838396
2011-01-07 13:31:28 -08:00
Scott Main
c5602aeea3 fix bug 3295540
Change-Id: I11eecd07ec8d49da4d2431f7e164555b84e8d8fc
2011-01-07 13:30:46 -08:00
Gloria Wang
0544d05990 Merge "DRM Framework bug fixes." 2011-01-07 11:10:49 -08:00
Yu Shan Emily Lau
5619da8d8b am 2af4e71d: Merge "Fix the test application orientation. Bug# 3205196" into gingerbread
* commit '2af4e71dd47565d794ad48041a156871396a7dde':
  Fix the test application orientation. Bug# 3205196
2011-01-07 09:40:18 -08:00
Yu Shan Emily Lau
2af4e71dd4 Merge "Fix the test application orientation. Bug# 3205196" into gingerbread 2011-01-07 09:38:24 -08: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
2888208b0b am f13d4501: Send "compilation" tag when inserting into the database. It\'s not actually inserted into the database, but the media provider uses it for disambiguating albums. b/3311831
* commit 'f13d4501396aa1679004ad07d440f65ced3ecc2b':
  Send "compilation" tag when inserting into the database. It's not actually inserted into the database, but the media provider uses it for disambiguating albums. b/3311831
2011-01-07 09:22:57 -08:00
Dianne Hackborn
aab969ec2b am 3c902a62: Merge "Avoiding cyclic references when unbinding from a service"
* commit '3c902a62eddebc75adb5286e55e1107e0b63551f':
  Avoiding cyclic references when unbinding from a service
2011-01-07 00:58:04 -08:00
Dianne Hackborn
3c902a62ed Merge "Avoiding cyclic references when unbinding from a service" 2011-01-07 00:43:15 -08:00
Chung-yih Wang
f268a2f848 Add auth. username in SipProfile.
bug:3326867
Change-Id: I2a62c75fb3f5e9c6ec2e00b29396e93b0c183d9b
2011-01-07 15:21:54 +08:00
Mattias Petersson
5f619b7d95 Avoiding cyclic references when unbinding from a service
Cyclic references can occur between a Service object held by an
application and a ServiceRecord object held by the system server.
A part of the problem is that binders are leaked and since many binders
are implemented by inner classes of services these services are also leaked.
This causes low memory problems. The solution is: When a Service is beeing
destroyed, go through the ServiceRecord's all IntentBindRecord and set its
binder references to null. This allows the binder and the service object to
be garbage collected.

Change-Id: I5a257521964851f34c08ffb3908feaad96b1bafe
2011-01-07 07:56:46 +01: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
Hung-ying Tyan
f0bb1ce70f SipService: registers broadcast receivers on demand.
The previous implementation registers receivers when SipService starts up.
If the user doesn't use SIP at all, SipService will still process connecivity
and wifi state change events, which involves holding wake lock and thus
consumes power unnecessarily.

With this CL, SipService is completely idle if the user doesn't use SIP at all.
It registers receivers only when at least one account is opened.

Bug: 3326998
Change-Id: Ib70e0cf2c808e0ebab4c3c43dcab5532d24e5eeb
2011-01-07 11:57:22 +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
f13d450139 Send "compilation" tag when inserting into the database.
It's not actually inserted into the database, but the media provider uses it
for disambiguating albums.
b/3311831

Change-Id: Idb630866e960338ce2795dcc128cafaf6c9c27f2
2011-01-06 16:37:03 -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