Amith Yamasani
0d7c11e143
Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME to true." into gingerbread
2011-01-18 15:41:26 -08:00
Irfan Sheriff
ee780450dc
Merge "Do not add unsolicited events to queue" into gingerbread
2011-01-18 14:40:18 -08:00
Jeff Brown
8fb7545953
Merge "Filter virtual keys after touches. (DO NOT MERGE)" into gingerbread
2011-01-18 14:31:31 -08:00
Mathias Agopian
ad2b78fa12
Merge "Fix the ISurfaceComposer onTransact switch." into gingerbread
2011-01-18 11:20:04 -08:00
Jeff Hamilton
c52ca2f61e
Merge "Javadoc updates for NFC." into gingerbread
2011-01-18 11:01:55 -08:00
Jeff Hamilton
7b6ecc4edd
Merge "New APIs for NDEF Push Protocol." into gingerbread
2011-01-18 11:01:05 -08:00
Jamie Gennis
238bec1ceb
Fix the ISurfaceComposer onTransact switch.
...
Two of the cases in the ISurfaceComposer onTransact switch statement
were missing 'break' statements at the end, and would fall through to
the next case block. This change adds those break statements.
Change-Id: I6dcc84263d3ea03d94612c667103283846b3dee1
2011-01-16 17:34:07 -08:00
Jeff Brown
4cc6fe1eea
Merge "Flush Binder commands in ndk looper." into gingerbread
2011-01-16 16:15:32 -08:00
Jim Miller
3d317da2ab
Merge "Fix 3106227: use WeakReferences for receivers in DigitalClock class" into gingerbread
2011-01-16 16:14:52 -08:00
Nick Pelly
d41381d8c5
Merge "Make sure service handles are live before passing to other objects." into gingerbread
2011-01-14 18:18:25 -08:00
James Dong
b1f1d0ede6
Merge "Squash commits of the following patches, cherry-picked from other branch - do not merge." into gingerbread
2011-01-14 16:27:48 -08:00
Jaikumar Ganesh
824bb889ff
Merge "Do Not Merge: Expose insecure rfcomm Bluetooth API." into gingerbread
2011-01-14 16:11:41 -08:00
Dianne Hackborn
6d3c5ae222
Merge "Added check to make orientation calculations more robust" into gingerbread
2011-01-14 15:36:26 -08:00
Dianne Hackborn
12edc159a3
Merge "Make the Phone options dialog use current language" into gingerbread
2011-01-14 15:33:44 -08:00
Eric Fischer
e6ec66185c
Merge "Add date format and map center resources for new locales." into gingerbread
2011-01-13 13:08:18 -08:00
Wei-Ta Chen
4877837c2d
Merge "Do not merge." into gingerbread
2011-01-13 12:02:32 -08:00
Dan Morrill
960f8a68a7
Adding ASL2 attribution for VisualOn.
...
Change-Id: I870133fc366507d95741f8aa234776de58ba60a9
2011-01-13 09:24:30 -08:00
Nick Pelly
2ee9a92f6a
Merge "New Intent defined for RF ON/OFF events" into gingerbread
2011-01-12 16:28:59 -08:00
Kenny Root
9c9f15acb5
Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread
2011-01-12 15:03:43 -08:00
Jaikumar Ganesh
d4960f4492
Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread
2011-01-12 13:56:13 -08:00
Eric Laurent
9e41414cd5
Merge "Fix issue 3302649." into gingerbread
2011-01-12 13:50:51 -08:00
Justin Ho
a7498c90b9
Merge "Updated flightmode assets" into gingerbread
2011-01-12 13:47:59 -08:00
Kenny Root
c31a45058e
Merge "Allow updated system apps to retain priority" into gingerbread
2011-01-12 11:56:25 -08:00
Jeff Brown
7bfdb29e53
Filter virtual keys after touches. (DO NOT MERGE)
...
Adds a new virtualKeyQuietTimeMillis configuration resource that sets
the duration for which virtual keys will be dropped after recent touches
on screen. The default value is 0; it is intended to be overridden
per device using a resource overlay.
This change is designed to help in two cases:
1. Swipes from touchscreen into virtual key area.
2. Accidental taps in virtual key area while using on-screen keyboard.
Bug: 3089163
Change-Id: Id6733c83c2e2bc8d9553aa0e5c1fd74b741bec6e
2011-01-11 20:56:04 -08:00
Andreas Huber
e9bef148d2
Merge "DO NOT MERGE: Fix parsing of ntp= PLAY response." into gingerbread
2011-01-11 13:52:12 -08:00
Chung-yih Wang
63f338d83d
Merge "Add auth. username in SipProfile." into gingerbread
2011-01-11 02:08:19 -08:00
James Dong
e59980106f
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
19fded7391
Merge "Remove attemptDeadServiceRecovery() from TagTechnology's." into gingerbread
2011-01-10 12:02:36 -08:00
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
