Nick Pelly
e7934257bd
Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into gingerbread
2011-01-10 12:02:26 -08:00
Dianne Hackborn
b318ca6d37
Merge "Referencing of "r.record.name" is occured, when "r.record" is null." into gingerbread
2011-01-09 13:53:53 -08:00
Dianne Hackborn
3948d710ef
Merge "Fix issue # 3227963: SecurityException: Neither user 10023 nor..." into gingerbread
2011-01-09 11:38:15 -08:00
Yu Shan Emily Lau
6d15b27147
Merge "Fix the test application orientation. Bug# 3205196" into gingerbread
2011-01-07 09:38:24 -08:00
Gilles Debunne
2029a91959
Merge "Ran fixPngMetaTags on all the core/res assets." into gingerbread
2011-01-06 18:30:26 -08:00
Gilles Debunne
00a99a94a3
Merge "Asset cleanup. DO NOT MERGE" into gingerbread
2011-01-06 18:29:59 -08:00
Eric Fischer
8f55bbb010
Merge "Import translations for additional languages." into gingerbread
2011-01-06 14:11:47 -08:00
Jeff Hamilton
5a2804ddfc
Merge "Make the new NFC APIs public." into gingerbread
2011-01-06 11:28:42 -08:00
Dianne Hackborn
c0cb771cab
Merge "Avoiding cyclic references when unbinding from a service" into gingerbread
2011-01-05 18:54:19 -08:00
James Dong
da57245bae
Merge "Suppress the recording sound in the recorded video" into gingerbread
2011-01-05 17:53:18 -08:00
Nick Pelly
83f1f8ce07
Merge "Fix technology extra naming for IsoDep and NfcB (API part)." into gingerbread
2011-01-04 18:31:19 -08:00
Hung-ying Tyan
675b5b008f
Merge "Fix setting audio group mode in SipPhone." into gingerbread
2011-01-04 17:45:36 -08:00
Eric Laurent
a017d5b379
Fix issue 3302649.
...
The cause of the problem is that AudioTrack::start() can fail if it is called from a newly created
thread that has the same ID as the AudioTrack callback thread that has just been stopped and not yet exited.
This is possible as the thread ID used by the Thread class is not the TID.
The fix consists in clearing the thread ID before exiting the thread loop.
Change-Id: I66e679665c384403cb3ba2c31746f5de72d5836d
2011-01-04 11:58:04 -08:00
Nick Pelly
84680db3b5
Merge "Added response flags and DSFID extras for NfcV technology (API part)." into gingerbread
2011-01-03 22:38:14 -08:00
Nick Pelly
ddf6027ea3
Merge "Tweak Ndef.getType() API. Rename constants, expand javadoc." into gingerbread
2011-01-03 22:32:56 -08:00
Nick Pelly
610d72deb5
Merge "Added getType() to NDEF technology class (API part)." into gingerbread
2011-01-03 20:58:26 -08:00
Nick Pelly
5c5258a1da
Merge "Removed selectAid() from IsoDep." into gingerbread
2011-01-03 20:09:03 -08:00
Nick Pelly
af84317c80
Merge "Added transfer/restore convience cmds to MF Classic tech." into gingerbread
2011-01-03 18:33:09 -08:00
John Wang
d9883db5c5
Merge "Clear request list while timeout." into gingerbread
2011-01-03 08:44:17 -08:00
Alon Albert
d3b9dc712b
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
Dianne Hackborn
0e6375a789
Merge "frameworks/base: Fix to release references in ActivityManagerService" into gingerbread
2010-12-23 14:19:03 -08:00
Jeff Brown
37cc46a0b4
Merge "Fix policy issues when screen is off. (DO NOT MERGE)" into gingerbread
2010-12-23 12:41:59 -08:00
Dianne Hackborn
947d92c963
Merge "Another stab at fixing issue #3149290 java.lang.RuntimeException:..." into gingerbread
2010-12-22 18:34:40 -08:00
Jeff Brown
e7a0d2beea
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
2010-12-22 16:00:21 -08:00
James Dong
7bc0c0a8b7
Merge "Expose AMRNB/WB and AAC encoder and related file output formats - do not merge" into gingerbread
2010-12-22 12:38:11 -08:00
Hung-ying Tyan
6777b7fea3
Merge "Check if VoIP API is supported in SipManager." into gingerbread
2010-12-21 18:34:15 -08:00
Robert Greenwalt
374504c059
Merge "Be sure and report NO_CONNECTIVITY when needed." into gingerbread
2010-12-21 16:02:13 -08:00
Dianne Hackborn
0c6568615a
Merge "Fix issue #3224616 : TimeUtils.formatDuration() can drop 0s." into gingerbread
2010-12-21 13:27:15 -08:00
Simon Wilson
c6a0991635
Merge "fix [3127755] Launcher is missing anti-aliasing" into gingerbread
2010-12-20 14:09:52 -08:00
Mike LeBeau
98cb0d3f0f
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
2010-12-20 11:55:56 -08:00
Mathias Agopian
902329fb3e
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
2010-12-18 03:45:26 -08:00
Dianne Hackborn
80880644e6
Merge "Fix issue #3289835 : NullPointerException in..." into gingerbread
2010-12-17 10:37:25 -08:00
Hung-ying Tyan
dce71fbc9c
Merge "Check port in create peer's SIP profile." into gingerbread
2010-12-16 18:04:54 -08:00
Nick Pelly
bb55eef2ee
Merge "Need to check ndef before writing ndef." into gingerbread
2010-12-16 16:35:51 -08:00
Eric Laurent
b6272d14f1
Merge "Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO." into gingerbread
2010-12-16 11:18:29 -08:00
Scott Main
1d7e1b304d
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
2010-12-15 17:47:02 -08:00
Dianne Hackborn
a43aa9c8fc
Merge "Fix issue #3149290 : java.lang.RuntimeException: Unable to pause activity" into gingerbread
2010-12-15 12:56:53 -08:00
Dianne Hackborn
a2037834cf
Merge "Work on issue #3255640 : Need to bump GB to API 10 version name "2.4"" into gingerbread
2010-12-14 14:12:37 -08:00
Dan Morrill
78bcc605dd
Merge "GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen)." into gingerbread
2010-12-14 11:27:20 -08:00
Costin Manolache
eaefb93b61
Merge "Fix bug in permission grant system." into gingerbread
2010-12-14 10:07:26 -08:00
Roman Nurik
992b150891
Merge "Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack." into gingerbread
2010-12-13 19:12:42 -08:00
Brad Fitzpatrick
7ed1f656a6
Merge "Fix StrictMode javadoc copy/paste error." into gingerbread
2010-12-13 15:25:09 -08:00
Nick Kralevich
7fcd6df049
Merge "Avoid leaking sockets." into gingerbread
2010-12-13 15:03:28 -08:00
Nick Pelly
3cb8da45a2
Merge "Make getSystemService(NFC_SERVICE) the NFC entry point." into gingerbread
2010-12-10 17:18:00 -08:00
Megha Joshi
ebce77e665
Merge "Integrating webinar hosting with developer.android.com" into gingerbread
2010-12-10 12:30:35 -08:00
Jean-Baptiste Queru
c288fb7ef3
reconcile with open-source gingerbread
...
Change-Id: I11029c58c7bcfa194dde5584ea1e3ba048fb817b
2010-12-09 10:18:23 -08:00
Mathias Agopian
9215cabfa8
Merge "fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread
2010-12-08 16:17:02 -08:00
James Dong
a8e4eb7e51
Merge "When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again" into gingerbread
2010-12-08 16:14:27 -08:00
Mathias Agopian
c3ce880972
fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo
...
eglQueryContext(..., EGL_CONFIG_ID, ...) is dereferencing an uninitialized pointer
due to a typo.
Change-Id: I100addf3150f19cb6dfbce9987fb5239dd240878
2010-12-08 15:34:02 -08:00
Mathias Agopian
fc84e8269b
Merge "[317580] fix issue where the screen wouldn't be rotated properly in bypass mode" into gingerbread
2010-12-08 15:08:33 -08:00