ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
20,862 Commits 2 Branches 0 Tags 54 MiB
4b1d4a7ac3
Commit Graph

20862 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Conley Owens
4b1d4a7ac3 am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" 
* commit '98fcc4041d35831c7a65a6e2f0e61021e0fb37e2':
  stagefright aacenc/amrwbenc: Remove trailing whitespace
 2011-07-18 12:42:42 -07:00
Conley Owens
9569289a8d Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" 2011-07-18 12:37:16 -07:00
Jaikumar Ganesh
04b363802f am 53cf7858: Merge "Bluetooth: correcting return value from cancelDiscovery" 
* commit '53cf7858c3fd36082302efdc4d848925bcc0001e':
  Bluetooth: correcting return value from cancelDiscovery
 2011-07-13 10:22:40 -07:00
Jaikumar Ganesh
95c15bacf5 Merge "Bluetooth: correcting return value from cancelDiscovery" 2011-07-13 10:04:19 -07:00
Robert Greenwalt
25fbdf5ecf am 38bb0123: Merge "Added methods to support dns cache per interface" 
* commit '38bb0123b8b9857c3119fd359739daf872f619d6':
  Added methods to support dns cache per interface
 2011-07-06 07:35:02 -07:00
Robert Greenwalt
e7438cc6c2 Merge "Added methods to support dns cache per interface" 2011-07-01 09:26:50 -07:00
Conley Owens
fdf196c3e4 am e06749e1: Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications." 
* commit 'e06749e14c1fb2d78540cba9548ee3b4b7b3b1d9':
  Add FLAG_AUTO_CANCEL flag for multiple supl notifications.
 2011-06-30 08:19:00 -07:00
Conley Owens
efa5bc7e87 Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications." 2011-06-30 08:11:25 -07:00
Jean-Baptiste Queru
aac9682a90 am 4fea5373: Merge "Add WEBP to the list of Image formats that support Compression." 
* commit '4fea5373d350f5d855408ffaa41206b8fa743c55':
  Add WEBP to the list of Image formats that support Compression.
 2011-06-24 11:33:46 -07:00
Jean-Baptiste Queru
cf949e64a9 am f458d5fd: Merge "Tweak for forward-compatibility" 
* commit 'f458d5fdb8a48747d6fdd5fd0d0a44a6a8ed89e9':
  Tweak for forward-compatibility
 2011-06-24 11:28:30 -07:00
Jean-Baptiste Queru
8349a2278a Merge "Add WEBP to the list of Image formats that support Compression." 2011-06-24 11:13:42 -07:00
Jean-Baptiste Queru
0891d8cbce Merge "Tweak for forward-compatibility" 2011-06-24 11:08:36 -07:00
Jean-Baptiste Queru
a614150d74 Tweak for forward-compatibility 
Change-Id: Ic5e4d949c1c80a2ebdc2ec802c35b5d3d7f9661d
 2011-06-24 10:49:18 -07:00
Raphael Moll
68238ef270 am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods." 
* commit 'e2b41b0d5c8db85a60cd190c7094052db61114b2':
  Laoutlib_creator: keep original of delegate methods.
 2011-06-22 17:44:29 -07:00
Raphael Moll
ad81c78607 Merge "Laoutlib_creator: keep original of delegate methods." 2011-06-22 17:11:27 -07:00
Jaikumar Ganesh
610b7f28ea am b38fa2a0: Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread 
* commit 'b38fa2a0ac2bde56504929de6a3dd61ac723958e':
  DO NOT MERGE Incoming Bluetooth Connection requests - dialog.
 2011-06-21 13:24:46 -07:00
Jaikumar Ganesh
fa4c10e9ba Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread 2011-06-21 11:23:51 -07:00
Nick Pelly
64c4f89c5b am 17523abb: NFC Adapter Extras API update. 
* commit '17523abb45b7f77f35af53e895d74be13f2314e0':
  NFC Adapter Extras API update.
 2011-06-20 15:54:07 -07:00
Conley Owens
1894fc2765 am bf5adfa5: Merge "Check if we are in daylight time when calculating timezone" 
* commit 'bf5adfa5e558827fbb4771720433887bb3cbaefd':
  Check if we are in daylight time when calculating timezone
 2011-06-20 13:04:45 -07:00
Conley Owens
a77ed0e5f6 Merge "Check if we are in daylight time when calculating timezone" 2011-06-20 11:01:41 -07:00
Jean-Baptiste Queru
75e3e4936b am e3b05d09: Merge "Tweaks for forward-compatibility" 
* commit 'e3b05d09163257b888c86f2a560e10c48f4cf029':
  Tweaks for forward-compatibility
 2011-06-20 09:05:07 -07:00
Jean-Baptiste Queru
101d6fc4aa Merge "Tweaks for forward-compatibility" 2011-06-18 09:45:53 -07:00
Jean-Baptiste Queru
3f3f5af40e Tweaks for forward-compatibility 
Change-Id: Iec525edc186e78d5d865f82dd5b1f56263c22e86
 2011-06-18 09:42:04 -07:00
Maarten Hooft
dc1a5d75a5 am d76baeb4: Merge "Import revised Croatian translations." into gingerbread 
* commit 'd76baeb4d836c33cc68cbb0c2e237c066f368529':
  Import revised Croatian translations.
 2011-06-16 15:48:55 -07:00
Maarten Hooft
fad4d64a42 Merge "Import revised Croatian translations." into gingerbread 2011-06-16 15:41:20 -07:00
Irfan Sheriff
9dfdb876ef am df1734e3: Fix lease duration handling 
* commit 'df1734e3f57646df1fa96275cbb65bb91ac9d2ac':
  Fix lease duration handling
 2011-06-15 16:29:02 -07:00
Mathias Agopian
35cc0fcd51 am afffa8fa: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) 
* commit 'afffa8fa9f82a7343e1158bf921931fd3e3df615':
  fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
 2011-06-15 14:13:04 -07:00
Marco Nelissen
dd729fc173 resolved conflicts for merge of d027329c to gingerbread-plus-aosp 
Change-Id: I169c415bf998b9935ab36812511573db05717b91
 2011-06-15 08:58:38 -07:00
Mathias Agopian
76feee7a58 fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) 
Bug: 4595257
Change-Id: I4773cf4fe59b2509db0ed733739eb6961d473b25
 2011-06-13 13:58:34 -07:00
Dan Morrill
48014c7082 am 8688d470: Moving flag to a member field instead of a stack variable. 
* commit '8688d4708117db446d6ba2855f1d8ad715bb4d72':
  Moving flag to a member field instead of a stack variable.
 2011-06-11 09:52:50 -07:00
Dan Morrill
5e76bf9037 am a1a107b8: Merge "Adding a new config value used to tell StatusBarPolicy to always use CDMA signal strength value even when on EVDO. Default is off, but devices that need to can override it." into gingerbread 
* commit 'a1a107b8cb8cbb7eea796f375eb72958e8b148e3':
  Adding a new config value used to tell StatusBarPolicy to always use CDMA signal strength value even when on EVDO. Default is off, but devices that need to can override it.
 2011-06-09 14:52:40 -07:00
Dan Morrill
907dfec02d Merge "Adding a new config value used to tell StatusBarPolicy to always use CDMA signal strength value even when on EVDO. Default is off, but devices that need to can override it." into gingerbread 2011-06-09 14:43:58 -07:00
Conley Owens
7521344df2 am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" 
* commit 'd8b027b18f5a922ef729c6ee363eecb053358d47':
  stagefright aacenc/amrwbenc: Convert line breaks to Unix style
 2011-06-09 12:14:11 -07:00
Conley Owens
c66e2523b9 Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" 2011-06-09 11:12:04 -07:00
Marco Nelissen
ff86daf56a am a02d9bf9: Make sure we don\'t read from invalid fds 
* commit 'a02d9bf9c3ff22cd449da21ff7c23170488ebd8e':
  Make sure we don't read from invalid fds
 2011-06-09 10:36:24 -07:00
Mathias Agopian
ef1e16fc0b am 19974ecc: Fix a leak in RefBase (DO NOT MERGE) 
* commit '19974eccdbd3e4dbd7e3b2cc401db7806d4a17bc':
  Fix a leak in RefBase (DO NOT MERGE)
 2011-06-08 19:56:06 -07:00
Mathias Agopian
9a03cecf8b Fix a leak in RefBase (DO NOT MERGE) 
this bug was introduced recently. it caused RefBase's weakref_impl
structure to be leaked for every RefBase object (about 20 bytes).

Change-Id: Ia9b155fbfa643ef72cfb8129e96260a3b806a78c
 2011-06-08 16:13:39 -07:00
Jean-Baptiste Queru
233fca912a am f3894a04: Merge "Tweak setViewport stuff for fwd-compat" 
* commit 'f3894a04acb9cdd67a02a1a4c82ba7d178c13000':
  Tweak setViewport stuff for fwd-compat
 2011-06-08 14:07:19 -07:00
Jean-Baptiste Queru
16b844695c Merge "Tweak setViewport stuff for fwd-compat" 2011-06-08 13:10:58 -07:00
Jake Hamby
ca1df0ccac resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp 
Change-Id: Id13750bc01c977ab06accf8ceabc95fe5dee703a
 2011-06-07 16:24:15 -07:00
Xavier Ducrohet
c7492c07b4 am d6ce6791: Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into gingerbread 
* commit 'd6ce6791f26fd0a7cf89ded2847011a4894013e1':
  Cherrypick d1ed33c4 from hc-mr1. do not merge.
 2011-06-06 18:08:40 -07:00
Xavier Ducrohet
9bbc6b0528 am ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread 
* commit 'ee1b497648a0c3c03b09c4739619f23315d491fb':
  Cherrypick 5b61ea6b from hc-mr1
  LayoutLib: enable the LAYOUT_ONLY capability.
  Merge dba35f1b from honeycomb-mr1. do not merge.
 2011-06-06 18:08:32 -07:00
Romain Guy
445abdcf8d am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called." 
* commit '258f32e2e3ff7f4f4b1395cae292098141047fde':
  Disable plugins if setPluginsEnabled(false) called.
 2011-06-06 17:54:12 -07:00
Romain Guy
47a5fe58d2 Merge "Disable plugins if setPluginsEnabled(false) called." 2011-06-06 16:23:25 -07:00
Jake Hamby
a5338831fa resolved conflicts for merge of ab79ee4a to gingerbread-plus-aosp 
Change-Id: Ib885176060f65ef3286a24c7b9cae1a673666275
 2011-06-06 15:33:37 -07:00
Xavier Ducrohet
df25902127 Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into gingerbread 2011-06-03 18:53:41 -07:00
Xavier Ducrohet
ff4e02a897 Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread 
* changes:
  Cherrypick 5b61ea6b from hc-mr1
  LayoutLib: enable the LAYOUT_ONLY capability.
  Merge dba35f1b from honeycomb-mr1. do not merge.
 2011-06-03 18:53:23 -07:00
Andreas Huber
d2f99b158d am 8050a02b: DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls. 
* commit '8050a02b0130f0ba2e2ddfc240aa59029ee2ac6d':
  DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
 2011-06-02 07:37:52 -07:00
Martijn Coenen
3e1db14ded am 0aa1017f: Prevent allocation overflows by corrupt NDEF records. 
* commit '0aa1017f9183bca752c95af72f73120e102ab2d3':
  Prevent allocation overflows by corrupt NDEF records.
 2011-06-01 09:51:15 -07:00
Jaikumar Ganesh
9ea7f08b79 am 1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread 
* commit '1b755dea38cc428a4adb8b8954bbafaa9c0441fb':
  Remove discoverable timeout handler. DO NOT MERGE
 2011-05-27 13:46:50 -07:00