OSDN Git Service
James Dong [Mon, 10 Jan 2011 20:04:50 +0000 (12:04 -0800)]
Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge" into gingerbread
Nick Pelly [Mon, 10 Jan 2011 20:02:36 +0000 (12:02 -0800)]
Merge "Remove attemptDeadServiceRecovery() from TagTechnology's." into gingerbread
Nick Pelly [Mon, 10 Jan 2011 20:02:26 +0000 (12:02 -0800)]
Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into gingerbread
James Dong [Mon, 10 Jan 2011 16:55:02 +0000 (08:55 -0800)]
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
Nick Pelly [Mon, 10 Jan 2011 07:14:41 +0000 (18:14 +1100)]
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
Nick Pelly [Mon, 10 Jan 2011 06:26:59 +0000 (17:26 +1100)]
Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)
The later feels less clumsy.
Change-Id: I50f29aef23d2993dcfd25f4c4f2cb0d77bdc0610
Dianne Hackborn [Sun, 9 Jan 2011 21:53:53 +0000 (13:53 -0800)]
Merge "Referencing of "r.record.name" is occured, when "r.record" is null." into gingerbread
Chris Tate [Fri, 29 Oct 2010 19:57:04 +0000 (12:57 -0700)]
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
Chris Tate [Tue, 16 Nov 2010 23:10:49 +0000 (15:10 -0800)]
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
lge-aosp [Fri, 7 Jan 2011 04:45:37 +0000 (13:45 +0900)]
Referencing of "r.record.name" is occured, when "r.record" is null.
Change-Id: I625e45923a7fd9f4ac8eb434ed07d452f8e1e0b6
Dianne Hackborn [Sat, 8 Jan 2011 02:42:59 +0000 (18:42 -0800)]
Fix issue #
3333958: Package Manager can sometimes mistakenly think...
...an app is disabled!
Ouch.
Change-Id: I5788c5f8edfe2a0d6f4f0f3359e1742f8ed8d98e
Dianne Hackborn [Sun, 9 Jan 2011 19:38:15 +0000 (11:38 -0800)]
Merge "Fix issue #
3227963: SecurityException: Neither user 10023 nor..." into gingerbread
Scott Main [Fri, 7 Jan 2011 22:48:18 +0000 (14:48 -0800)]
docs: catchup gingerbread to gingerbread-docs with misc changes
Change-Id: Id5d38a6d97323e082535e433ab64e89e8bd3d021
Scott Main [Wed, 5 Jan 2011 19:42:09 +0000 (11:42 -0800)]
cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f
docs: update dashboard
Change-Id: I2b91243b28cc831348d29fcf11e23f5018838396
Scott Main [Wed, 22 Dec 2010 17:30:26 +0000 (09:30 -0800)]
fix bug
3295540
Change-Id: I11eecd07ec8d49da4d2431f7e164555b84e8d8fc
Yu Shan Emily Lau [Fri, 7 Jan 2011 17:38:24 +0000 (09:38 -0800)]
Merge "Fix the test application orientation. Bug#
3205196" into gingerbread
Gilles Debunne [Fri, 7 Jan 2011 02:30:26 +0000 (18:30 -0800)]
Merge "Ran fixPngMetaTags on all the core/res assets." into gingerbread
Gilles Debunne [Fri, 7 Jan 2011 02:29:59 +0000 (18:29 -0800)]
Merge "Asset cleanup. DO NOT MERGE" into gingerbread
Marco Nelissen [Fri, 7 Jan 2011 00:37:03 +0000 (16:37 -0800)]
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
Marco Nelissen [Thu, 6 Jan 2011 19:12:17 +0000 (11:12 -0800)]
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
Nick Pelly [Wed, 5 Jan 2011 05:53:17 +0000 (16:53 +1100)]
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
Eric Fischer [Thu, 6 Jan 2011 22:11:47 +0000 (14:11 -0800)]
Merge "Import translations for additional languages." into gingerbread
Jeff Hamilton [Thu, 6 Jan 2011 19:28:42 +0000 (11:28 -0800)]
Merge "Make the new NFC APIs public." into gingerbread
Jeff Hamilton [Thu, 23 Dec 2010 01:20:26 +0000 (19:20 -0600)]
Make the new NFC APIs public.
Change-Id: Ia0acd9759d67683eaf1dc199dc2cc55e16a98e77
Eric Fischer [Thu, 6 Jan 2011 18:29:06 +0000 (10:29 -0800)]
Import translations for additional languages.
Change-Id: I8a30fc0f90e22a5ec8d746aaf4b64776a3274016
Dianne Hackborn [Thu, 6 Jan 2011 03:14:53 +0000 (19:14 -0800)]
Tweak level at which we reset battery stats to 90%.
Change-Id: I81151809100912c7956536d5d47279d2c2fea8c4
Johannes Carlsson [Wed, 27 Oct 2010 08:08:10 +0000 (10:08 +0200)]
Clear reference to the IIntentReceiver in order to avoid memory leak
When using sendOrderedBroadcast(..) with a BroadcastReceiver the
BroadcastReceiver instance was not released. The reason for this was that
the resultTo field in the BroadcastRecord kept a reference until it was pushed
out of the mBroadcastHistory. This reference in turn kept a reference to the
process side IIntentReceiver (implemented in ReceiverDispatcher$InnerReceiver).
This in turn had a strong reference (through mStrongRef) to the Context.
In order to keep the debug output the resultTo is also kept as a String in the
new resultToString variable.
Change-Id: I4382a22a541c27b3694fb2b78a04ee820b235f8f
Dianne Hackborn [Thu, 6 Jan 2011 02:54:19 +0000 (18:54 -0800)]
Merge "Avoiding cyclic references when unbinding from a service" into gingerbread
James Dong [Thu, 6 Jan 2011 01:53:18 +0000 (17:53 -0800)]
Merge "Suppress the recording sound in the recorded video" into gingerbread
Mattias Petersson [Wed, 27 Oct 2010 07:32:51 +0000 (09:32 +0200)]
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
Brad Fitzpatrick [Wed, 5 Jan 2011 19:13:40 +0000 (11:13 -0800)]
Documentation fixes found over vacation hacking.
Change-Id: I28900026465d66d950cf4f05f0c202b46c3c2d43
Yu Shan Emily Lau [Wed, 5 Jan 2011 04:57:09 +0000 (20:57 -0800)]
Fix the test application orientation. Bug#
3205196
Change-Id: I57085d6507482ce15dbf3b167965be4af43b3d88
Nick Pelly [Wed, 5 Jan 2011 02:31:19 +0000 (18:31 -0800)]
Merge "Fix technology extra naming for IsoDep and NfcB (API part)." into gingerbread
Martijn Coenen [Tue, 21 Dec 2010 10:18:52 +0000 (11:18 +0100)]
Fix technology extra naming for IsoDep and NfcB (API part).
Change-Id: Iaa8f1b4dec5d626ffb17a33d71d2f92dd0d99636
Hung-ying Tyan [Wed, 5 Jan 2011 01:45:36 +0000 (17:45 -0800)]
Merge "Fix setting audio group mode in SipPhone." into gingerbread
James Dong [Wed, 5 Jan 2011 01:34:44 +0000 (17:34 -0800)]
Suppress the recording sound in the recorded video
bug -
3309194
Change-Id: Ib8fb248943bc22f963d67537bfdbc6056c5a159b
Chia-chi Yeh [Tue, 4 Jan 2011 11:10:06 +0000 (19:10 +0800)]
RTP: Send silence packets on idle streams for every second.
Originally a stream does not send packets when it is receive-only or there is
nothing to mix. However, this causes some problems with certain firewalls and
proxies. A firewall might remove a port mapping when there is no outgoing
packet for a preiod of time, and a proxy might wait for incoming packets from
both sides before start forwarding. To solve these problems, we send out a
silence packet on the stream for every second. It should be good enough to
keep the stream alive with relatively low resources.
Bug:
3119690
Change-Id: Ib9c55e5dddfba28928bd9b376832b68bda24c0e4
Nick Pelly [Tue, 4 Jan 2011 06:38:14 +0000 (22:38 -0800)]
Merge "Added response flags and DSFID extras for NfcV technology (API part)." into gingerbread
Martijn Coenen [Mon, 3 Jan 2011 12:45:25 +0000 (13:45 +0100)]
Added response flags and DSFID extras for NfcV technology (API part).
Also fixed a missing assignment in NfcB technology.
Change-Id: Ic564a0a17a9638c11fa528056da40f74ed37e9e6
Nick Pelly [Tue, 4 Jan 2011 06:32:56 +0000 (22:32 -0800)]
Merge "Tweak Ndef.getType() API. Rename constants, expand javadoc." into gingerbread
Nick Pelly [Tue, 4 Jan 2011 06:29:14 +0000 (17:29 +1100)]
Tweak Ndef.getType() API. Rename constants, expand javadoc.
Change-Id: I9d2c83411411fea4ef46bb7c30ebdbcd9ee3e7d8
Nick Pelly [Tue, 4 Jan 2011 04:58:26 +0000 (20:58 -0800)]
Merge "Added getType() to NDEF technology class (API part)." into gingerbread
Martijn Coenen [Wed, 22 Dec 2010 12:51:51 +0000 (13:51 +0100)]
Added getType() to NDEF technology class (API part).
Change-Id: Idfa391dd9d4a401e1daa3dc90ca57e4a3d9e0fa3
Nick Pelly [Tue, 4 Jan 2011 04:09:03 +0000 (20:09 -0800)]
Merge "Removed selectAid() from IsoDep." into gingerbread
Martijn Coenen [Tue, 21 Dec 2010 14:51:15 +0000 (15:51 +0100)]
Removed selectAid() from IsoDep.
It's a convenience method that can be implemented with transceive();
not really needed for now.
Change-Id: Idd855c85b15d97ae679d11d908834be3cb2741d8
Nick Pelly [Tue, 4 Jan 2011 02:33:09 +0000 (18:33 -0800)]
Merge "Added transfer/restore convience cmds to MF Classic tech." into gingerbread
Martijn Coenen [Sat, 18 Dec 2010 11:59:53 +0000 (12:59 +0100)]
Added transfer/restore convience cmds to MF Classic tech.
Change-Id: I675993bc3aae6a741d63be458a0dfea240dd5316
John Wang [Mon, 3 Jan 2011 16:44:17 +0000 (08:44 -0800)]
Merge "Clear request list while timeout." into gingerbread
Hung-ying Tyan [Mon, 13 Dec 2010 10:47:35 +0000 (18:47 +0800)]
Fix setting audio group mode in SipPhone.
Bug:
3119690
Change-Id: I495d3c031ee4c272d360fe19553ef9726a3f8771
John Wang [Wed, 29 Dec 2010 00:20:41 +0000 (16:20 -0800)]
Clear request list while timeout.
The wakelock will be kept held if there is outstanding requests
in request list. When WAKE_LOCK_TIMEOUT occurs, all requests
in mRequestList already waited at least DEFAULT_WAKE_LOCK_TIMEOUT
but no response. Those lost requests return GENERIC_FAILURE and
request list is cleared.
bug:
3292426
Change-Id: I369c6ba4d6836d65ef616140e48c7304faf888f0
Alon Albert [Tue, 28 Dec 2010 22:44:51 +0000 (14:44 -0800)]
Merge "Improved ignore-backoff handling Allow a non-epidited ignore-backoff op to pass through an expidited backed off op." into gingerbread
Dianne Hackborn [Thu, 23 Dec 2010 22:19:03 +0000 (14:19 -0800)]
Merge "frameworks/base: Fix to release references in ActivityManagerService" into gingerbread
Vairavan Srinivasan [Thu, 23 Dec 2010 21:51:48 +0000 (13:51 -0800)]
frameworks/base: Fix to release references in ActivityManagerService
ServiceRecord's bindings is a hashmap to keep track of all active
bindings to the service. This is not cleared when the service is
brought down by activity manager. This adds up the references to
IntentBindRecords and its references to ServiceRecord. Fix is to
clear the bindings.
ServiceRecord's restarter is a reference to the service and is not
cleared when the service is brought down by activity manager. This
adds up the references to ServiceRecord. Fix is to set the reference
to null when the service is brought down by activity manager.
Change-Id: Ica448cd5f60192c8adb23209b5d0e2cf0c04e446
Jeff Brown [Thu, 23 Dec 2010 20:41:59 +0000 (12:41 -0800)]
Merge "Fix policy issues when screen is off. (DO NOT MERGE)" into gingerbread
Dianne Hackborn [Thu, 23 Dec 2010 02:34:40 +0000 (18:34 -0800)]
Merge "Another stab at fixing issue #
3149290 java.lang.RuntimeException:..." into gingerbread
Dianne Hackborn [Thu, 23 Dec 2010 02:29:32 +0000 (18:29 -0800)]
Another stab at fixing issue #
3149290 java.lang.RuntimeException:...
...Unable to pause activity
{com.android.settings/com.android.settings.applications.StorageUse}
Change-Id: Ibfa28a1c5af50dd150dfcafe71e905426d312643
Dianne Hackborn [Wed, 22 Dec 2010 22:03:29 +0000 (14:03 -0800)]
Fix issue #
3227963: SecurityException: Neither user 10023 nor...
...current process has android.permission.WAKE_LOCK
When updating a system app, we would actually uninstall the package
of the system app, which also meant removing its uid...! It was just
luck that we would get the same uid when installing the update after
that. During that time, if anyone tried to do anything related to
that uid, it would be unknown.
This change tweaks how we go about replacing system apps by making
it more like normal apps -- to make this work, if we need to disable
the system app, we generate a new PackageSetting from the current
system app and replace it into our data structures, so we can update
that without trashing the current correct information about the (still
actually there) system app.
Also fixed a problem where we were not killing the currently running
app before installing, like we do when updating a normal application.
And fixed a problem where we were not deleting the /data .apk when
uninstalling a system app update.
And added a new option to the "pm" command to clear the data associated
with an app.
Change-Id: I0e879677849aa42950a3c360bf78ad820e87674b
Jeff Brown [Sat, 30 Oct 2010 04:50:21 +0000 (21:50 -0700)]
Fix policy issues when screen is off. (DO NOT MERGE)
Rewrote interceptKeyBeforeQueueing to make the handling more systematic.
Behavior should be identical except:
- We never pass keys to applications when the screen is off and the keyguard
is not showing (the proximity sensor turned off the screen).
Previously we passed all non-wake keys through in this case which
caused a bug on Crespo where the screen would come back on if a soft key
was held at the time of power off because the resulting key up event
would sneak in just before the keyguard was shown. It would then be
passed through to the dispatcher which would poke user activity and
wake up the screen.
- We propagate the key flags when broadcasting media keys which
ensures that recipients can tell when the key is canceled.
- We ignore endcall or power if canceled (shouldn't happen anyways).
Changed the input dispatcher to not poke user activity for canceled
events since they are synthetic and should not wake the device.
Changed the lock screen so that it does not poke the wake lock when the
grab handle is released. This fixes a bug where the screen would come
back on immediately if the power went off while the user was holding
one of the grab handles because the sliding tab would receive an up
event after screen turned off and release the grab handles.
Bug:
3144874
Change-Id: Iebb91e10592b4ef2de4b1dd3a2e1e4254aacb697
Alon Albert [Wed, 22 Dec 2010 19:07:54 +0000 (11:07 -0800)]
Improved ignore-backoff handling
Allow a non-epidited ignore-backoff op to pass through
an expidited backed off op.
To do this, I first refactored the complicated if statement:
if (best == null
|| ((bestSyncableIsUnknownAndNotARetry == syncableIsUnknownAndNotARetry)
? (best.expedited == op.expedited
? opRunTime < bestRunTime
: op.expedited)
: syncableIsUnknownAndNotARetry)) {
best = op;
bestSyncableIsUnknownAndNotARetry = syncableIsUnknownAndNotARetry;
bestRunTime = opRunTime;
}
Into a more readable:
boolean setBest = false;
if (best == null) {
setBest = true;
} else if (bestSyncableIsUnknownAndNotARetry == syncableIsUnknownAndNotARetry) {
if (best.expedited == op.expedited) {
if (opRunTime < bestRunTime) {
// if both have same level, earlier time wins
setBest = true;
}
} else {
if (op.expedited) {
setBest = true;
}
}
} else {
if (syncableIsUnknownAndNotARetry) {
setBest = true;
}
}
if (setBest) {
best = op;
bestSyncableIsUnknownAndNotARetry = syncableIsUnknownAndNotARetry;
bestRunTime = opRunTime;
}
The refactoring was all done automatically with IntelliJ to avoid human error
in the conversion.
After verifying this code still behaved as expected including the error
condition in the bug, I added handling for the cases when a non-expidited op
may override an expedited op if certain conditions occur, specificaly, if the
expidited op is backed off and the non-expidited op is not.
Finally, refactored to make it testable and added tests and logging.
Bug:
3128963
Change-Id: I131cbcec6073ea5fe425f6b5aa88ca56c02b6598
James Dong [Wed, 22 Dec 2010 20:38:11 +0000 (12:38 -0800)]
Merge "Expose AMRNB/WB and AAC encoder and related file output formats - do not merge" into gingerbread
James Dong [Wed, 22 Dec 2010 18:32:51 +0000 (10:32 -0800)]
Expose AMRNB/WB and AAC encoder and related file output formats - do not merge
bug -
3305667
Change-Id: I8f137af7f87cb010f75cae1777b9ec6b6af8214f
Mattias Petersson [Tue, 21 Dec 2010 09:15:11 +0000 (10:15 +0100)]
Improve performance of WindowState.toString()
This fix improves the performance by caching the string that should
be returned, and reuse it next time if possible.
This will make it faster to switch between activities, approximately
half the time to create the new view when changing from landscape to
portrait. Also, the time for starting a new application is be reduced
as WindowState.toString is being called thousands of times in this
case.
Change-Id: I2b8b9bc1e251d1af43b6c85f049c01452f2573a2
Jeff Hamilton [Sat, 18 Dec 2010 22:39:37 +0000 (16:39 -0600)]
Remove canBeFormatted().
It's not easy to determine if this
is possible, so instead apps should
attempt a format and handle errors
in the format request.
Change-Id: I078a208b849e71ef3fb6b5970a9111ece4a2d201
Hung-ying Tyan [Wed, 22 Dec 2010 02:34:15 +0000 (18:34 -0800)]
Merge "Check if VoIP API is supported in SipManager." into gingerbread
Gilles Debunne [Wed, 22 Dec 2010 00:46:18 +0000 (16:46 -0800)]
Ran fixPngMetaTags on all the core/res assets.
This removes the empty iTxt meta tags in png which are not supported by
Java 1.5. This script should be run every time the SDK is released.
Bug
3069421
Change-Id: I1610e52597937040f9da343046cd98aa075f728d
Robert Greenwalt [Wed, 22 Dec 2010 00:02:13 +0000 (16:02 -0800)]
Merge "Be sure and report NO_CONNECTIVITY when needed." into gingerbread
Gilles Debunne [Tue, 21 Dec 2010 23:15:48 +0000 (15:15 -0800)]
Asset cleanup. DO NOT MERGE
Assets moved from drawable to drawable-mdpi. Hdpi version created.
Change-Id: Iec08f79e22688a7b5dfc149aed68617ebf217564
Dianne Hackborn [Tue, 21 Dec 2010 21:27:15 +0000 (13:27 -0800)]
Merge "Fix issue #
3224616: TimeUtils.formatDuration() can drop 0s." into gingerbread
Robert Greenwalt [Tue, 21 Dec 2010 19:43:28 +0000 (11:43 -0800)]
Be sure and report NO_CONNECTIVITY when needed.
Reports that we sometimes didn't report NO_CONNECTIVITY led to this suggested change.
Could not repro the problem, but the change looks ok anyway. Better safe than sorry.
bug:
3276408
Change-Id: I0cdb48a05a5c9dfcf3a0b468a6eae43d461023b1
Hung-ying Tyan [Mon, 20 Dec 2010 11:08:24 +0000 (19:08 +0800)]
Check if VoIP API is supported in SipManager.
This is to make SipManager.isVoipSupported() effective.
Also add NPE check now that we may return null SipAudioCall when VOIP is not
supported.
Bug:
3251016
Change-Id: Icd551123499f55eef190743b90980922893c4a13
Bjorn Bringert [Tue, 23 Nov 2010 14:43:12 +0000 (14:43 +0000)]
Fix issue #
3224616: TimeUtils.formatDuration() can drop 0s.
Integrated from master.
Change-Id: Ie12dd25cce03c06fafb7df1335266322df43b038
Simon Wilson [Mon, 20 Dec 2010 22:09:52 +0000 (14:09 -0800)]
Merge "fix [
3127755] Launcher is missing anti-aliasing" into gingerbread
Mike LeBeau [Mon, 20 Dec 2010 19:55:56 +0000 (11:55 -0800)]
Merge "Unhide RecognizerResultsIntent. This API was reviewed for Froyo, but we didn't want to make it public then because it wasn't until our first Market release of Voice Search that the APIs would be in use by our app." into gingerbread
Scott Main [Mon, 20 Dec 2010 16:52:16 +0000 (08:52 -0800)]
cherrypick Change-Id: I51b73bb0bb09ef0b928efec151f55e0bf8ffc954
docs: fix typos
Change-Id: Ic31053b1a17b8b2e0842ba6077ad635e642dc705
Mike LeBeau [Mon, 6 Dec 2010 20:52:17 +0000 (15:52 -0500)]
Unhide RecognizerResultsIntent. This API was
reviewed for Froyo, but we didn't want to make it
public then because it wasn't until our first
Market release of Voice Search that the APIs would
be in use by our app.
http://b/
3135351
Change-Id: I49053717cac08e3976c22e3a105139b6755aadb8
Mathias Agopian [Sat, 18 Dec 2010 11:35:05 +0000 (03:35 -0800)]
disable the bypass mode. DO NOT MERGE.
SF bypass mode triggers a bug in the display controller that
case cause the device to freeze.
Change-Id: If29b4d5132f463d13831b082b904c235f15a19fb
Martijn Coenen [Fri, 17 Dec 2010 18:31:39 +0000 (19:31 +0100)]
Clean up and polish Mifare Classic tech.
- It's useful to have accessors at block level, so apps don't really have to know
about the sector structure (and how many blocks there are in a sector).
- There's no way to tell whether a read/write/ didn't work because of auth
failure. The documentation should be changed to make this point clear.
- Added increment/decrement commands, for atomic increment/decrement of value blocks.
Change-Id: I590feacbcd1443f1be7a86ab046a5b1f33e2e04c
Dianne Hackborn [Fri, 17 Dec 2010 18:37:25 +0000 (10:37 -0800)]
Merge "Fix issue #
3289835: NullPointerException in..." into gingerbread
Hung-ying Tyan [Thu, 16 Dec 2010 03:50:45 +0000 (11:50 +0800)]
Remove SIP realm/domain check
as the realm may be different from the domain.
Bug:
3283834
Change-Id: I64c9f0d6d626afdb397c5d378d30afa9d6a64ca9
Hung-ying Tyan [Fri, 17 Dec 2010 02:04:54 +0000 (18:04 -0800)]
Merge "Check port in create peer's SIP profile." into gingerbread
Nick Pelly [Fri, 17 Dec 2010 00:35:51 +0000 (16:35 -0800)]
Merge "Need to check ndef before writing ndef." into gingerbread
Martijn Coenen [Thu, 16 Dec 2010 21:39:20 +0000 (22:39 +0100)]
Need to check ndef before writing ndef.
Regression due to all the (re)connect changes.
Change-Id: I637618f63518965e893a5a59db61002271666fa4
Scott Main [Thu, 16 Dec 2010 23:41:55 +0000 (15:41 -0800)]
cherrypick Change-Id: I58e21f636e15d4b1522b66b16ffd48f1eb31308c
docs: misc fixes to the drawable reference
Change-Id: I8b867234250ca18d5b6ee78a22b6150e1ba3e588
Dianne Hackborn [Thu, 16 Dec 2010 20:41:56 +0000 (12:41 -0800)]
Fix issue #
3289835: NullPointerException in...
..PackageManagerService.grantPermissionsLP when updating system app
Change-Id: I36c1b96d2fe9a8737843d30f3a2669935fc281bb
Eric Laurent [Thu, 16 Dec 2010 19:18:29 +0000 (11:18 -0800)]
Merge "Fix issue
2712130: Sholes: problem when playing audio while recording over bluetooth SCO." into gingerbread
Scott Main [Thu, 16 Dec 2010 18:26:23 +0000 (10:26 -0800)]
cherrypick Change-Id: I7ec40d7c2908bd78b74ada8ba2b6838db4a0bac5
docs: misc fixes for the adb move
Change-Id: Ie7701d9c1656c6cb5ae6063562efeabd9eb737a3
Hung-ying Tyan [Thu, 16 Dec 2010 12:46:50 +0000 (20:46 +0800)]
Check port in create peer's SIP profile.
SipURI returns port -1 when port is not present in the URI.
Don't call SipProfile.Builder.setPort() when that happens.
Bug:
3291248
Change-Id: I8e608cbc56ea82862df55fdba885f6a864db83ab
Eric Laurent [Thu, 16 Dec 2010 03:09:42 +0000 (19:09 -0800)]
Fix issue
2712130: Sholes: problem when playing audio while recording over bluetooth SCO.
The problem is that when an input stream is opened for record over bluetooth SCO, the kernel
mono audio device should be opened in RW mode to allow further use of this same device by an output stream
also routed to bluetooth SCO.
This does not happen because of a bug in AudioSystem::isBluetoothScoDevice() that does not return true
when the device is DEVICE_IN_BLUETOOTH_SCO_HEADSET (input device for blurtooth SCO).
Change-Id: Ic78bf324b4a68e65721d763dc7682ce7a8f14f75
Scott Main [Thu, 16 Dec 2010 01:47:02 +0000 (17:47 -0800)]
Merge "cherrypick Change-Id: I07634c137e515068911c61c04bf3e9400c3fe0d4 docs: misc changes; add path to adb tool in sdk; fix broken link to ninepatch docs; fix and add some other links" into gingerbread
Scott Main [Thu, 16 Dec 2010 01:21:30 +0000 (17:21 -0800)]
cherrypick Change-Id: I07634c137e515068911c61c04bf3e9400c3fe0d4
docs: misc changes;
add path to adb tool in sdk;
fix broken link to ninepatch docs;
fix and add some other links
Change-Id: I27c7284ac2db2e6020c9cb0115fb932a2f503033
Mathias Agopian [Thu, 16 Dec 2010 00:59:55 +0000 (16:59 -0800)]
fix [
3127755] Launcher is missing anti-aliasing
Enable limited forms of mipmaping when possible.
Change-Id: I39ad90becaa4048844fdbbbcb187333e7d59fc6a
Martijn Coenen [Wed, 15 Dec 2010 09:04:27 +0000 (10:04 +0100)]
Implement additional Mifare Ultralight convenience methods.
Change-Id: I8d9dfadb5911b2d11d1ba6dcf1381decbb8386ef
Martijn Coenen [Wed, 15 Dec 2010 00:26:09 +0000 (01:26 +0100)]
Expose reconnect(), to allow applications to reset tag state.
Change-Id: Ib5432e7f6b6aaf6ec1cb06693592cb7c6440a6f8
Martijn Coenen [Tue, 14 Dec 2010 15:58:27 +0000 (16:58 +0100)]
Implement multi-tech connect, enfore tech exclusivity.
- The NfcService now allows for connecting to a specific technology;
- The "active" parts of technology classes may not be used at the same time.
Change-Id: Ibb569f51cc6da4f3e24df9d0850c6f49a022b0c2
Scott Main [Tue, 14 Dec 2010 23:49:38 +0000 (15:49 -0800)]
modifications to webinars:
add the ability to add an upcoming webinar event to Google Calendar;
add some introduction text;
adjust some markup
Change-Id: I4d18a183b1520e79a45e114dc49e725fe27a43c9
Dianne Hackborn [Wed, 15 Dec 2010 20:56:53 +0000 (12:56 -0800)]
Merge "Fix issue #
3149290: java.lang.RuntimeException: Unable to pause activity" into gingerbread
Scott Main [Tue, 14 Dec 2010 19:00:44 +0000 (11:00 -0800)]
cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd
docs: fix bug
3216642
Change-Id: Ic42d97d4e67a09dc4e366862e2b72ff92f152b85
Scott Main [Tue, 14 Dec 2010 18:39:35 +0000 (10:39 -0800)]
cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee
docs: fix bug
3273882
Change-Id: Ie53ba246c39bf448bfe199ae3754e50749ceb340
Dianne Hackborn [Wed, 15 Dec 2010 19:02:55 +0000 (11:02 -0800)]
Fix issue #
3149290: java.lang.RuntimeException: Unable to pause activity
{com.android.settings/com.android.settings.applications.StorageUse}
AbsListView could call mAdapter.getItemId() if a save state happened
after the data changed but before a layout occurred.
Change-Id: Ica020971dc458dff79b56dd810733e217f4f7da6
Scott Main [Wed, 15 Dec 2010 01:55:27 +0000 (17:55 -0800)]
cherrypick Change-Id: I19d2be00c807b6cbdab357b32a7dd13f98a5433e
docs: update to adt 8.0.1;
delete ADT archive page, put a redirect in its place;
update tools release notes and sys reqs to require ant 1.8
Change-Id: Id039d81953452d8f7cefc0c4d61e7d9ead575541