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
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
c042eb77a5
am 3769240b: Merge "Clear reference to the IIntentReceiver in order to avoid memory leak"
...
* commit '3769240b7976bfa50bb7bf235747b7f6bb7be08e':
Clear reference to the IIntentReceiver in order to avoid memory leak
2011-01-05 19:28:33 -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
Johannes Carlsson
73fef3c7c0
am b5a8654d: Clear reference to the IIntentReceiver in order to avoid memory leak
...
* commit 'b5a8654dea9ea8443b41f8ff3668ae4074e13a07':
Clear reference to the IIntentReceiver in order to avoid memory leak
2011-01-05 19:13:29 -08:00
Dianne Hackborn
3769240b79
Merge "Clear reference to the IIntentReceiver in order to avoid memory leak"
2011-01-05 19:10:15 -08:00
Johannes Carlsson
b5a8654dea
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
2011-01-05 18:59:07 -08:00
Dianne Hackborn
4302886f8f
am c91f9fe5: Merge "Avoiding cyclic references when unbinding from a service" into gingerbread
...
* commit 'c91f9fe542fd1ca9d6da432faeba60d35c4d5c49':
Avoiding cyclic references when unbinding from a service
2011-01-05 18:55:57 -08:00
Dianne Hackborn
c91f9fe542
Merge "Avoiding cyclic references when unbinding from a service" into gingerbread
2011-01-05 18:54:19 -08:00
James Dong
a8ce773607
am 35e8dcb9: Merge "Suppress the recording sound in the recorded video" into gingerbread
...
* commit '35e8dcb9df8c3d77ede120e3f1aaf842b2928639':
Suppress the recording sound in the recorded video
2011-01-05 17:55:27 -08:00
James Dong
35e8dcb9df
Merge "Suppress the recording sound in the recorded video" into gingerbread
2011-01-05 17:53:18 -08:00
Mattias Petersson
3996b41610
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-05 15:34:11 -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
Nick Pelly
8d98aebe28
Merge "Fix technology extra naming for IsoDep and NfcB (API part)." into gingerbread
2011-01-04 18:31:19 -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
Hung-ying Tyan
05c53067b6
am 273d2ea3: Merge "Fix setting audio group mode in SipPhone." into gingerbread
...
* commit '273d2ea3f986f1611d2cf303cc5b93f820c14dd3':
Fix setting audio group mode in SipPhone.
2011-01-04 17:47:47 -08:00
Hung-ying Tyan
273d2ea3f9
Merge "Fix setting audio group mode in SipPhone." into gingerbread
2011-01-04 17:45:36 -08:00
Chia-chi Yeh
dc78e3fe7f
am 3cf71376: RTP: Send silence packets on idle streams for every second.
...
* commit '3cf71376421f942d06b30101fbf0df7f3b23fbdd':
RTP: Send silence packets on idle streams for every second.
2011-01-04 17:37:17 -08:00
James Dong
a7ac739b74
Suppress the recording sound in the recorded video
...
bug - 3309194
Change-Id: Ib8fb248943bc22f963d67537bfdbc6056c5a159b
2011-01-04 17:34:44 -08:00
Chia-chi Yeh
3cf7137642
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
2011-01-04 19:54:49 +08:00
Johannes Carlsson
5897591537
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
2011-01-04 09:15:09 +01: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
Nick Pelly
4b94dee833
Merge "Added transfer/restore convience cmds to MF Classic tech." into gingerbread
2011-01-03 18:33:09 -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
John Wang
e85229988e
am 06fccc32: Merge "Clear request list while timeout." into gingerbread
...
* commit '06fccc325123bf4c9ebd04ac9300b504436724fe':
Clear request list while timeout.
2011-01-03 08:46:47 -08:00
John Wang
06fccc3251
Merge "Clear request list while timeout." into gingerbread
2011-01-03 08:44:17 -08:00
Hung-ying Tyan
1d12ef09a8
Fix setting audio group mode in SipPhone.
...
Bug: 3119690
Change-Id: I495d3c031ee4c272d360fe19553ef9726a3f8771
2010-12-29 16:07:17 +08:00
John Wang
00d520b66c
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
2010-12-28 17:14:18 -08: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