29808 Commits

Author SHA1 Message Date
Eric Laurent
48f400c376 am bec4abaa: Merge "Fix issue 3302649." into gingerbread
* commit 'bec4abaa12bf6759f354b54119c5524cf9339e7b':
  Fix issue 3302649.
2011-01-12 13:52:42 -08:00
Eric Laurent
bec4abaa12 Merge "Fix issue 3302649." into gingerbread 2011-01-12 13:50:51 -08:00
Justin Ho
58ea93945b am 7b667a0c: Merge "Updated flightmode assets" into gingerbread
* commit '7b667a0c4b017af3c6b9e1f8a6dae56e2c53e07f':
  Updated flightmode assets
2011-01-12 13:50:25 -08:00
Justin Ho
7b667a0c4b Merge "Updated flightmode assets" into gingerbread 2011-01-12 13:47:59 -08:00
Justin Ho
8e8c8e02d5 Updated flightmode assets
Change-Id: Ia26da7982822d818f8416a110a21d17d316d7b3f
2011-01-12 13:43:20 -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
Kenny Root
6688b6c317 Merge "Allow updated system apps to retain priority" into gingerbread 2011-01-12 11:56:25 -08:00
Andreas Huber
c88b2c4411 am 7c615360: Fail to parse duration instead of asserting, if the server response cannot be parsed.
* commit '7c6153606cc963191362494c8cb5669749e84326':
  Fail to parse duration instead of asserting, if the server response cannot be parsed.
2011-01-12 10:35:18 -08:00
Andreas Huber
7c6153606c Fail to parse duration instead of asserting, if the server response cannot be parsed.
Change-Id: I95c61ed83800db82e99c0023b942fb8ae05ed3cf
related-to-bug: 3338518
2011-01-12 09:57:23 -08:00
Andreas Huber
0ef0d76a9d am 7e2f9cc8: DO NOT MERGE: Fix Matroska issues
* commit '7e2f9cc81da788006790365ff11f06551fc1bc26':
  DO NOT MERGE: Fix Matroska issues
2011-01-11 16:22:33 -08:00
Andreas Huber
7e2f9cc81d DO NOT MERGE: Fix Matroska issues
related-to-bug: 3331623

Squashed commit of the following:

commit 8484811f3784564ce962ec1b6311bac532d73ffc
Author: Andreas Huber <andih@google.com>
Date:   Tue Jan 11 11:56:06 2011 -0800

    Properly parse Matroska lacing flags and extract all frames contained in a block.

    related-to-bug: 3331623

commit 38f1f39381a01659577461b3d35bd22db45ba317
Author: Andreas Huber <andih@google.com>
Date:   Mon Nov 15 15:10:34 2010 -0800

    Proper support for variable NALsize lengths of AVC content in .mkv files.

    related-to-bug: 3197442

Change-Id: I4b404f3c3d0a2a2fa336b9edff75eb25ffc66a2f
2011-01-11 16:02:31 -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
repo sync
d439ac396e resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp
Change-Id: Icef97302fb99e3dd346ec6ee04aa9e8eea7bff26
2011-01-11 15:26:51 -08:00
Andreas Huber
e7fbfb6b74 Merge "DO NOT MERGE: Fix parsing of ntp= PLAY response." into gingerbread 2011-01-11 13:52:12 -08:00
Kenny Root
4aab4bc2a3 am 91c459ec: Copy user info from PackageSetting as well
* commit '91c459ec7dba6d56816ff5cbd92c627e0f718915':
  Copy user info from PackageSetting as well
2011-01-11 12:27:42 -08:00
Kenny Root
91c459ec7d Copy user info from PackageSetting as well
In order not to clobber the internal system's settings, we duplicate it
before putting it back into mPackages, but the PackageSetting has a
couple extra pieces of information that weren't being copied.

Bug: 3339279
Change-Id: I047087ac3477c7b2d5ce23e5e0a5e8c094bd0d3f
2011-01-11 11:04:54 -08:00
Andreas Huber
549f12ad04 DO NOT MERGE: Fix parsing of ntp= PLAY response.
related-to-bug: 3340186

Squashed commit of the following:

commit b61c36b7228aec9f5360883b1e1c1e0530488974
Author: Andreas Huber <andih@google.com>
Date:   Wed Oct 27 13:59:59 2010 -0700

    Better support for MP4A-LATM RTP disassembly. This used to fail if mNumSubFrames > 1 and the sub frames did not align with RTP packet boundaries.

commit b10f322c07e5bebcaf032e8624cb4a5d733dfc15
Author: Andreas Huber <andih@google.com>
Date:   Mon Oct 25 09:40:52 2010 -0700

    We don't have access to the md5 implementation on the simulator, let's disable digest authentication in rtsp for simulator targets.

commit 0aa83cf9e4637adf9501708fcdf7d0d6d4dc4fe1
Author: Andreas Huber <andih@google.com>
Date:   Wed Oct 20 15:00:34 2010 -0700

    Support for BASIC and DIGEST authentication schemes in RTSP. Support for malformed packet descriptions that end lines in LF only, instead of CRLF.

    related-to-bug: 3084183

Change-Id: I6e512cb73cc8d5624a83f7154aa5699f7fef7534
2011-01-11 09:53:30 -08:00
Chung-yih Wang
eb74d1aab5 am 65ba2c42: Merge "Add auth. username in SipProfile." into gingerbread
* commit '65ba2c421c19fde04e6b294087a5a9c507964575':
  Add auth. username in SipProfile.
2011-01-11 02:15:29 -08:00
Chung-yih Wang
65ba2c421c Merge "Add auth. username in SipProfile." into gingerbread 2011-01-11 02:08:19 -08:00
Nick Pelly
a058f56566 am ca36d863: Update API current.xml to unbreak build.
* commit 'ca36d863cc1684807e93f442c5ace89f08b9b5f5':
  Update API current.xml to unbreak build.
2011-01-10 14:19:30 -08:00
Nick Pelly
ca36d863cc Update API current.xml to unbreak build.
Change-Id: I151ee987fdae73fdf8f339dbb64f8fd27a0436b6
2011-01-10 14:16:16 -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
James Dong
0569e58988 am 13d1cb56: Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge" into gingerbread
* commit '13d1cb56dfdfc89888de6a0389b0fe6cf7e36c27':
  Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge
2011-01-10 12:09:09 -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
James Dong
13d1cb56df Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge" into gingerbread 2011-01-10 12:04:50 -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
James Dong
6328185b6c Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge
cherry-picked from: I4c79b66a900c527e3ae6a833f76d5da1b75c5a89

bug - 3336424

Change-Id: I2d8ecb79a5422342988c195c012c9e6327ac457a
2011-01-10 10:27:02 -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
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
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