ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
31,029 Commits 2 Branches 0 Tags 54 MiB
57ec59b0f5
Commit Graph

31029 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jamie Gennis
0487b2a20a Merge "Fix error recovery in Stagefright init." 2011-03-01 10:24:55 -08:00
Mike Lockwood
8c18b5f38b am c01e201f: (-s ours) am 61c1bb4f: Merge "UsbService: Remove stack-trace message during boot. DO NOT MERGE" into gingerbread 
* commit 'c01e201f12149ca96593af4e18133d3b2fce5546':
  UsbService: Remove stack-trace message during boot. DO NOT MERGE
 2011-03-01 09:12:49 -08:00
Mike Lockwood
bcf65037d2 am fc88f94f: (-s ours) am 6da062a9: Merge "DO NOT MERGE: Clean up USB notifications:" into gingerbread 
* commit 'fc88f94fc32fc010b153af32dea8e1fd4bae1f19':
  DO NOT MERGE: Clean up USB notifications:
 2011-03-01 09:12:45 -08:00
Mike Lockwood
dd4af71b98 am 54e96c69: (-s ours) am 3333f8af: Merge "DO NOT MERGE UsbManager: squashed commit of:" into gingerbread 
* commit '54e96c69d068593f1d5893be6067509b07abdadc':
  DO NOT MERGE UsbManager: squashed commit of:
 2011-03-01 09:12:31 -08:00
Mike Lockwood
879ff09c2a am f41768c5: (-s ours) am f7b99b32: Merge "Give system server permission to access USB. DO NOT MERGE" into gingerbread 
* commit 'f41768c5837a078239e92d8fa1d2155394e4b6ac':
  Give system server permission to access USB. DO NOT MERGE
 2011-03-01 09:12:27 -08:00
Xavier Ducrohet
f2ac085586 am 7b972755: (-s ours) am edbd6139: Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread 
* commit '7b9727558b42aecacd0ea63cf3b3c89e9bfd9e9b':
  Merge 1911a6f7 into gingerbread. do not merge.
 2011-03-01 09:12:15 -08:00
Chet Haase
e831c48cd2 Merge "Cleanup of docs for ViewPropertyAnimator class" 2011-03-01 07:41:42 -08:00
Eric Fischer
3222ef69a9 am ae7fb488: (-s ours) am 04a536af: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit 'ae7fb4887394615b58c4e97fc5b1ad2e04441903':
  Import revised translations.  DO NOT MERGE
 2011-02-28 22:23:03 -08:00
Irfan Sheriff
ba1fced257 am 5af7cf7c: am f9e2a491: Fix issue to clear scan alarms 
* commit '5af7cf7c558e6febfa5d48b62900929743d2f7bb':
  Fix issue to clear scan alarms
 2011-02-28 22:22:37 -08:00
Adam Powell
6bd3b705b6 Merge "Fix bug 3497341 - take list padding into account when drawing ExpandableListView indicators" 2011-02-28 22:01:31 -08:00
Adam Powell
eff8575b70 Merge "Fix bug 3497307 - Fix issues with FEATURE_ACTION_MODE_OVERLAY" 2011-02-28 21:49:40 -08:00
Christopher Tate
d391311913 Merge "Make sure to properly default the screen size during wallpaper restore" 2011-02-28 19:37:06 -08:00
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