Xavier Ducrohet
430a5a0b0c
Merge "Add notice files for aapt and aidl."
2011-02-28 19:19:23 -08:00
Daniel Sandler
5dc9fc2a53
Merge "resolved conflicts for merge of cfeaa492 to master"
2011-02-28 18:38:02 -08:00
Dianne Hackborn
0b77ea2981
Merge "Add ParcelFileDescriptor APIs to get raw fd."
2011-02-28 18:36:48 -08:00
Daniel Sandler
8ab0c00110
resolved conflicts for merge of cfeaa492 to master
...
Change-Id: I6ee4e3f822cb91008b1ca64ab9a6673278e501e0
2011-02-28 21:31:14 -05:00
Adam Powell
366ee8c385
Merge "Change behavior of multitouch in scrolling views."
2011-02-28 18:16:14 -08:00
Fred Quintana
6831ab5487
Merge "Make the AccountManagerService clear old grants when the package that the grants refer to is no longer installed."
2011-02-28 18:09:58 -08:00
Dianne Hackborn
795af4d938
am 1de4a2ca: am 62619392: Merge "Fix leak when keylock is recreated."
...
* commit '1de4a2ca58df9bd21e054742f52e0af7a2ed5864':
Fix leak when keylock is recreated.
2011-02-28 18:06:46 -08:00
Dianne Hackborn
5b18439050
am 62619392: Merge "Fix leak when keylock is recreated."
...
* commit '626193926df0b3c7236e5c244f30d797d9192e0d':
Fix leak when keylock is recreated.
2011-02-28 18:03:12 -08:00
Dianne Hackborn
b00d5d94d6
Merge "Fix leak when keylock is recreated."
2011-02-28 17:54:54 -08:00
Jeff Brown
def3554cf1
Merge "Fix inverted scrolling condition in lists."
2011-02-28 17:50:33 -08:00
Mike Lockwood
ed649ca25f
Merge "CameraBrowser: Add USB device filter meta-data for digital cameras"
2011-02-28 17:46:04 -08:00
Mike Lockwood
ab396ee286
Merge "USB accessory support library"
2011-02-28 17:45:08 -08:00
Mike Lockwood
c0d7a2f315
Merge "Add platform features for USB host and USB accessory support."
2011-02-28 17:05:12 -08:00
Mike Lockwood
1510320697
Merge "UsbManager: Enhancements for managing USB devices and accessories"
2011-02-28 17:04:23 -08:00
Ben Komalo
db167f3ab3
Merge "Remove a stale line in a JavaDoc."
2011-02-28 16:48:40 -08:00
Jaikumar Ganesh
98a22899cc
am 9711b9b7: am 1eefb529: Merge "Phone crash when old callback func is woken up when enabling BT."
...
* commit '9711b9b7aa7448b44b85fe8158ded0364cc3540e':
Phone crash when old callback func is woken up when enabling BT.
2011-02-28 16:27:16 -08:00
Fred Quintana
b348d09ca8
Merge "remove the code that clears the passwords when the sim is replaced with a different one."
2011-02-28 16:25:36 -08:00
Robert Ly
87d2fd4d71
Merge "fixing resource browser for renderscript samples because the samples moved"
2011-02-28 16:19:52 -08:00
Stephen Hines
af2cba186a
Merge "Discovered a matrix element bug while writing cts unit tests."
2011-02-28 16:08:32 -08:00
Wink Saville
c855e277af
am 0eb6af89: Merge "Fixing the write of BackgroundData setting, DO NOT MERGE." into honeycomb
...
* commit '0eb6af892948ba23bf9de5c5a6172c6ec50f8f71':
Fixing the write of BackgroundData setting, DO NOT MERGE.
2011-02-28 16:00:22 -08:00
Jaikumar Ganesh
03100c7446
am 1eefb529: Merge "Phone crash when old callback func is woken up when enabling BT."
...
* commit '1eefb529c78be5336f6c8a1b8ac2c32e268d4294':
Phone crash when old callback func is woken up when enabling BT.
2011-02-28 16:00:01 -08:00
Wink Saville
47e42beb12
Merge "Fixing the write of BackgroundData setting, DO NOT MERGE." into honeycomb
2011-02-28 15:54:02 -08:00
Jaikumar Ganesh
51e164ad73
Merge "Phone crash when old callback func is woken up when enabling BT."
2011-02-28 15:33:34 -08:00
Adam Cohen
fd3cb6a608
Merge "Small change to AppWidgetProviderInfo public field name and docs"
2011-02-28 15:24:56 -08:00
Elliott Hughes
3ce3b2cae9
Merge "Fix Parcel.writeNative to not ignore 'offset'."
2011-02-28 15:11:00 -08:00
Gilles Debunne
3e30307e52
Merge "Text selection mode is stopped when View is recycled in ListView"
2011-02-28 14:24:19 -08:00
Gilles Debunne
e34afec8e6
Merge "OnScrollListener fix in AbsListView"
2011-02-28 14:23:50 -08:00
Gilles Debunne
db24d8a5a2
Merge "AIOOB exception fix in TabWidget"
2011-02-28 14:23:35 -08:00
Yu Shan Emily Lau
f686521527
Merge "Remove the hard coded media recorder test cases. Add the native heap dump catpure functionality."
2011-02-28 14:10:23 -08:00
Eric Fischer
68e75a92e4
am 04a536af: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '04a536af3c91fc78d07a7d5b242a40b2731ec0ff':
Import revised translations. DO NOT MERGE
2011-02-28 14:08:39 -08:00
Eric Fischer
06ab2ea22d
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-02-28 14:05:59 -08:00
Irfan Sheriff
0c37e6b180
am f9e2a491: Fix issue to clear scan alarms
...
* commit 'f9e2a491176b086cd3c238b209e025cd68d76001':
Fix issue to clear scan alarms
2011-02-28 14:05:06 -08:00
Adam Powell
ba6aa2596b
Merge "Fix some bugs in the new ScaleGestureDetector logic."
2011-02-28 13:39:38 -08:00
Shimeng (Simon) Wang
fb1db830a1
Merge "Remove the limitation that zoom can't go beyond overview scale."
2011-02-28 13:28:58 -08:00
Mike Lockwood
b999303b88
am 61c1bb4f: Merge "UsbService: Remove stack-trace message during boot. DO NOT MERGE" into gingerbread
...
* commit '61c1bb4fef439650a3b88131c6e1360ffc03a7ed':
UsbService: Remove stack-trace message during boot. DO NOT MERGE
2011-02-28 13:18:06 -08:00
Mike Lockwood
b115c2440e
am 6da062a9: Merge "DO NOT MERGE: Clean up USB notifications:" into gingerbread
...
* commit '6da062a96c6f8126aad450a937144fab4333488f':
DO NOT MERGE: Clean up USB notifications:
2011-02-28 13:18:02 -08:00
Mike Lockwood
faaee3b419
am 3333f8af: Merge "DO NOT MERGE UsbManager: squashed commit of:" into gingerbread
...
* commit '3333f8afb2d1eae8bfdb41fa87f86836ad8702f7':
DO NOT MERGE UsbManager: squashed commit of:
2011-02-28 13:17:58 -08:00
Mike Lockwood
4b0caf3b83
am f7b99b32: Merge "Give system server permission to access USB. DO NOT MERGE" into gingerbread
...
* commit 'f7b99b32ad7a4872376355acabb5984142ba5e75':
Give system server permission to access USB. DO NOT MERGE
2011-02-28 13:17:54 -08:00
Jim Miller
00abb9a143
Merge "Fix 3386135: Make recent apps scrollable with more entries"
2011-02-28 13:12:56 -08:00
Mike Lockwood
1630f54d5b
Merge "UsbService: Remove stack-trace message during boot. DO NOT MERGE" into gingerbread
2011-02-28 13:12:11 -08:00
Mike Lockwood
93314ad737
Merge "DO NOT MERGE: Clean up USB notifications:" into gingerbread
2011-02-28 13:12:03 -08:00
Mike Lockwood
58a10b93fd
Merge "DO NOT MERGE UsbManager: squashed commit of:" into gingerbread
2011-02-28 13:11:55 -08:00
Mike Lockwood
f001d16081
Merge "Give system server permission to access USB. DO NOT MERGE" into gingerbread
2011-02-28 13:11:37 -08:00
Mathias Agopian
26f429d60e
Merge "surfaceflinger_client: Don't dereference NULL ptrs."
2011-02-28 12:50:25 -08:00
Christopher Tate
b1586e69a1
Merge "Binder linkage no longer depends on JNI objrefs as persistent tokens"
2011-02-28 12:50:09 -08:00
Mathias Agopian
734db07edf
Merge "Fix sp<> conversion operator / constructor"
2011-02-28 12:50:04 -08:00
Xavier Ducrohet
c6a02ff532
am edbd6139: Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread
...
* commit 'edbd6139b9d699879db2f14fb03b7b6a38bab9ea':
Merge 1911a6f7 into gingerbread. do not merge.
2011-02-28 12:29:08 -08:00
Jamie Gennis
9d4d6c101d
Add the MIN_UNDEQUEUED_BUFFERS query to ANW.
...
This change adds a new query to ANativeWindow for getting the minimum
number of buffers that must be left un-dequeued during the steady-state
operation of the ANativeWindow.
Change-Id: Ie8c461fc26b02ecde02ddb4f95bf763662cf1551
Related-Bug: 3356050
2011-02-28 12:24:40 -08:00
Xavier Ducrohet
13fbf42721
Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread
2011-02-28 12:24:01 -08:00
Christopher Tate
71f64dd876
Binder linkage no longer depends on JNI objrefs as persistent tokens
...
There are two areas that have changed to eliminate the assumption that
local jobject references are both canonical and persistent:
1. JavaBBinderHolder no longer holds onto and reuses it parent object
reference per se. Since the underlying JavaBBinder object holds a
real global ref, this was redundant anyway. Now, for purposes of its
transient need to perform JNI operations, it simply uses the current
jobject ref(s) passed during method invocation, and no longer attempts
to hold these refs beyond the scope of a single invocation.
2. Binder obituaries no longer assume that a jobject reference to a
recipient will always compare == as a 32-bit value with any future
reference to the same object. The implementation now asks Dalvik
whether object references match.
This amended patch fixes the earlier bug around races between
remote binder death cleanup and local explicit unregistration of
VM-side death recipients.
Bug 2090115
Change-Id: I70bd788a80ea953632b1f466f385ab6b78ef2913
2011-02-28 11:37:20 -08:00