Mathias Agopian
a0bafb4713
Merge "Use EGL_NATIVE_VISUAL_ID to select EGLConfig" into gingerbread
2011-01-19 11:31:07 -08:00
Jeff Brown
39bc6197ba
Never drag scroll views with no children. (DO NOT MERGE)
...
Fixes a regression from Froyo. Previously, when a scroll view
had no children, its onTouchEvent would return because the scroll
view would only start dragging if the user touched one of its children.
In Gingerbread, the user can drag from anywhere within the scroll
view, not just by touching a child. However, it makes no sense
to drag a scroll view that has no children so an empty scroll view
should just ignore touches like any other empty view group would.
This change fixes applications that for some reason or other happen
to have empty scroll views in strange places.
Bug: 3246230
Change-Id: I76c6136d3cd74968983033014d60deec1718ce30
2011-01-19 11:20:46 -08:00
Andreas Huber
66e35c240e
am e9a00235: Merge "DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"" into gingerbread
...
* commit 'e9a00235c102d198a702bc665b2ea5b5e8c4bc07':
DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"
2011-01-19 08:23:47 -08:00
Andreas Huber
e9a00235c1
Merge "DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"" into gingerbread
2011-01-19 08:11:39 -08:00
Nick Pelly
e5099cd3f5
am b7d6ffd7: Merge "Change signature of MifareClassic.authenticate*() to throw IOException." into gingerbread
...
* commit 'b7d6ffd76f6c47af488494f5de9560ec490e8241':
Change signature of MifareClassic.authenticate*() to throw IOException.
2011-01-18 18:56:45 -08:00
Nick Pelly
8216044435
am 50d0bcb4: Merge "Support for TagLostException (API)." into gingerbread
...
* commit '50d0bcb45beb30746271b620ab23ad4d69fd9d5b':
Support for TagLostException (API).
2011-01-18 18:56:41 -08:00
Brad Fitzpatrick
6b2b053b5a
am 597fa828: Merge "Watchdog can get deadlocked on activity manager" into gingerbread
...
* commit '597fa828fa2b3cba053f0afeeac877b1ee2d24b7':
Watchdog can get deadlocked on activity manager
2011-01-18 18:54:25 -08:00
Nick Pelly
b7d6ffd76f
Merge "Change signature of MifareClassic.authenticate*() to throw IOException." into gingerbread
2011-01-18 18:53:42 -08:00
Nick Pelly
50d0bcb45b
Merge "Support for TagLostException (API)." into gingerbread
2011-01-18 18:53:40 -08:00
Nick Pelly
0316d4a24f
Change signature of MifareClassic.authenticate*() to throw IOException.
...
Update API for this and the previous commit.
Change-Id: I19275a5d00081bd0f00afea59a2b673344a32954
2011-01-18 18:52:37 -08:00
Brad Fitzpatrick
597fa828fa
Merge "Watchdog can get deadlocked on activity manager" into gingerbread
2011-01-18 18:52:04 -08:00
Martijn Coenen
bf34061bb4
Support for TagLostException (API).
...
Change-Id: Idf2c3253f7bc5f371133c4f18bfc2afde69c3010
2011-01-18 18:32:50 -08:00
Nick Pelly
ccc9a9e582
am b735aa0b: Merge "Fix javadoc which broke build." into gingerbread
...
* commit 'b735aa0b6fabb72097191923d8787b43fa52531e':
Fix javadoc which broke build.
2011-01-18 17:10:33 -08:00
Nick Pelly
b735aa0b6f
Merge "Fix javadoc which broke build." into gingerbread
2011-01-18 17:07:56 -08:00
Nick Pelly
a8ca533d34
Fix javadoc which broke build.
...
Change-Id: Ie3cac9bec04e80defae44ba02086ad0cdfd301a9
2011-01-18 17:07:05 -08:00
Eric Laurent
9ffe8338e3
am 00118a48: Merge "Fix omission in NOTICE file." into gingerbread
...
* commit '00118a48754c6152266916e7205dff4e0c3a905a':
Fix omission in NOTICE file.
2011-01-18 16:45:08 -08:00
Brad Fitzpatrick
0971a1367f
Watchdog can get deadlocked on activity manager
...
Bug: 3351719
Change-Id: Idf3907709340062849a09dd094137e86256ed739
2011-01-18 16:42:20 -08:00
Eric Laurent
00118a4875
Merge "Fix omission in NOTICE file." into gingerbread
2011-01-18 16:42:20 -08:00
Nick Pelly
4d3ac03ade
am e4dd154c: Merge "hange the default IsoDep timeout to 300ms (docs update)." into gingerbread
...
* commit 'e4dd154c08b04090bad8f450450e13163d5fef9b':
hange the default IsoDep timeout to 300ms (docs update).
2011-01-18 16:16:36 -08:00
Mathias Agopian
b92a40ebfa
am 12d014fd: Merge "fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE" into gingerbread
...
* commit '12d014fdf40f69512e59e84914b230a2d3e7b8eb':
fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE
2011-01-18 16:14:13 -08:00
Nick Pelly
e4dd154c08
Merge "hange the default IsoDep timeout to 300ms (docs update)." into gingerbread
2011-01-18 16:11:14 -08:00
Mathias Agopian
12d014fdf4
Merge "fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE" into gingerbread
2011-01-18 16:10:08 -08:00
Andreas Huber
0e49d20107
DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"
...
if the network interface is shutdown while connecting.
Change-Id: I168c6026de24812efa9b7e607a9eb83efded8c1f
related-to-bug: 3362836
2011-01-18 15:52:31 -08:00
Amith Yamasani
7c93e52fac
am 68153821: Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME to true." into gingerbread
...
* commit '68153821481f748ecbd2493bfd417005686960e0':
Set the default state of NOTIFICATIONS_USE_RING_VOLUME to true.
2011-01-18 15:43:44 -08:00
Amith Yamasani
6815382148
Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME to true." into gingerbread
2011-01-18 15:41:26 -08:00
Martijn Coenen
cbec3fb285
hange the default IsoDep timeout to 300ms (docs update).
...
Change-Id: I4fe5a6bf9fd42a28c9619e6e0bf11885bcc43f91
2011-01-18 15:35:14 -08:00
Eric Laurent
e3b959b9c1
Fix omission in NOTICE file.
...
Added copyright notice for audio effects source files under
media/libeffects/lvm.
Change-Id: I8e142bacb7e4b1faaeafe88e907b73f21fced1c3
2011-01-18 15:25:32 -08:00
Irfan Sheriff
ef76b8306f
am 4170b463: Merge "Do not add unsolicited events to queue" into gingerbread
...
* commit '4170b46329ed91e81cf22dba82e2dadc326b3e3d':
Do not add unsolicited events to queue
2011-01-18 14:43:04 -08:00
Irfan Sheriff
4170b46329
Merge "Do not add unsolicited events to queue" into gingerbread
2011-01-18 14:40:18 -08:00
Jeff Brown
b26c516c03
am 41395459: Merge "Filter virtual keys after touches. (DO NOT MERGE)" into gingerbread
...
* commit '41395459e676cf9ab4059e08446656f145662c2d':
Filter virtual keys after touches. (DO NOT MERGE)
2011-01-18 14:38:27 -08:00
Jeff Brown
41395459e6
Merge "Filter virtual keys after touches. (DO NOT MERGE)" into gingerbread
2011-01-18 14:31:31 -08:00
Brad Fitzpatrick
02bbbc1122
am 069e810c: Merge "Fixing memory leak in PreferenceScreen."
...
* commit '069e810c6a5efc0b33fbe8c29a2d11f7c342a4d8':
Fixing memory leak in PreferenceScreen.
2011-01-18 13:39:07 -08:00
Brad Fitzpatrick
069e810c6a
Merge "Fixing memory leak in PreferenceScreen."
2011-01-18 13:23:13 -08:00
Brad Fitzpatrick
4bb180d62f
am ded2b006: Merge "frameworks/base: remove redundant code in WindowManager"
...
* commit 'ded2b00643c788a96ce8adc1a4cc0f7619a4c606':
frameworks/base: remove redundant code in WindowManager
2011-01-18 13:20:06 -08:00
Amith Yamasani
18b41374e8
Set the default state of NOTIFICATIONS_USE_RING_VOLUME to true.
...
Bug: 3319615
This doesn't affect upgrades, only new installs.
Change-Id: I86fa77b36867649becce8fc470bf9a559fe48131
2011-01-18 13:13:47 -08:00
Brad Fitzpatrick
ded2b00643
Merge "frameworks/base: remove redundant code in WindowManager"
2011-01-18 12:59:19 -08:00
Vairavan Srinivasan
3f6875f143
frameworks/base: remove redundant code in WindowManager
...
Change-Id: I8a356ca36129645977d33129e0d56c1b89f97fb0
2011-01-18 12:20:16 -08:00
Martijn Coenen
c4eee776ad
am 07e6f616: Check NDEF before calling makeReadOnly().
...
* commit '07e6f616d122496342a5bae51323bb218d88f7f2':
Check NDEF before calling makeReadOnly().
2011-01-18 11:40:51 -08:00
Martijn Coenen
3d06b1e0e9
am a701cf85: Implement IsoDep timeout handling (API).
...
* commit 'a701cf85a0167a6bb623343388a7dca6f2b61ac5':
Implement IsoDep timeout handling (API).
2011-01-18 11:38:28 -08:00
Martijn Coenen
07e6f616d1
Check NDEF before calling makeReadOnly().
...
Change-Id: Iadbaf5c29821eff78ad487b248af529febcdc4ce
2011-01-18 11:35:46 -08:00
Martijn Coenen
a701cf85a0
Implement IsoDep timeout handling (API).
...
Added a method for setting the timeout on IsoDep transactions.
Change-Id: Ie627e7a826556e46295fefe69b9be83ebf911d93
2011-01-18 11:35:46 -08:00
Mathias Agopian
4707dc73e2
am 72abf01a: Merge "Fix the ISurfaceComposer onTransact switch." into gingerbread
...
* commit '72abf01a8b6958ac1f86d36302a8462c4f51fd9d':
Fix the ISurfaceComposer onTransact switch.
2011-01-18 11:26:51 -08:00
Jeff Hamilton
97ac293507
am 0716ea14: Merge "Javadoc updates for NFC." into gingerbread
...
* commit '0716ea144d94b9dfce4670e90a849db19a492da9':
Javadoc updates for NFC.
2011-01-18 11:26:39 -08:00
Jeff Hamilton
8c1cd157fb
am 3a223404: Merge "New APIs for NDEF Push Protocol." into gingerbread
...
* commit '3a223404e7589831a901cb16c5ce97685bc1f3f8':
New APIs for NDEF Push Protocol.
2011-01-18 11:26:22 -08:00
Mathias Agopian
72abf01a8b
Merge "Fix the ISurfaceComposer onTransact switch." into gingerbread
2011-01-18 11:20:04 -08:00
Jeff Hamilton
0716ea144d
Merge "Javadoc updates for NFC." into gingerbread
2011-01-18 11:01:55 -08:00
Jeff Hamilton
3a223404e7
Merge "New APIs for NDEF Push Protocol." into gingerbread
2011-01-18 11:01:05 -08:00
Jeff Hamilton
ce3224cda5
Javadoc updates for NFC.
...
Change-Id: Ibd91829979576297599fbcc9eb8054924af1d527
2011-01-18 10:57:30 -08:00
Mathias Jeppsson
190acd4dd0
Fixing memory leak in PreferenceScreen.
...
Every time the PreferenceScreen is displayed a new ListView is
created and bound to the adapter. As the same adapter is used during
the lifetime of PreferenceScreen and the listviews never gets
unbound, the adapter will contain a list of unused views. The old view
should be unbound from adapter when we create a new view.
Change-Id: I13e2d0dc79c8ff79b58efa650653e3f84c6e53c5
2011-01-18 14:34:52 +01:00
Kenny Root
849dc24fa6
am 524133cc: Remove API that snuck into MockPackageManager
...
* commit '524133cc793b5e372cc97c62653281605f57b5b3':
Remove API that snuck into MockPackageManager
2011-01-17 13:05:24 -08:00