tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
2439 commits 1 branch 0 tags 215 MiB
Commit graph

2439 commits

This branch
This branch
All branches
Author SHA1 Message Date
JP Abgrall
d18dc00579 resolved conflicts for merge of a88c13bf to honeycomb-plus-aosp 
The Android.mk's LOCAL_SRC_FILES was different from gingerbread.

Change-Id: Ie1777a5f449e6b135320e92d0dc1c593869aa266
Signed-off-by: JP Abgrall <jpa@google.com>
 2011-08-11 21:53:02 -07:00
JP Abgrall
a88c13bfa9 am f25e55df: Merge changes I8e33c883,I0a2d1615,I401fc0b4,Ie0fb5b59 
* commit 'f25e55df1b086161ab28653b583c945df0a16615':
  libcutils: qtaguid: support socket untagging, return errors.
  Move qtaguid.c from common sources in Android.mk to fix windows build.
  Fix header file inclusion for type uid_t.
  Add communication support for xt_qtaguid(network traffic accounting) kernel module.
 2011-08-10 21:22:27 -07:00
JP Abgrall
f25e55df1b Merge changes I8e33c883,I0a2d1615,I401fc0b4,Ie0fb5b59 
* changes:
  libcutils: qtaguid: support socket untagging, return errors.
  Move qtaguid.c from common sources in Android.mk to fix windows build.
  Fix header file inclusion for type uid_t.
  Add communication support for xt_qtaguid(network traffic accounting) kernel module.
 2011-08-10 21:07:04 -07:00
Ashish Sharma
fa2f985b29 libcutils: qtaguid: support socket untagging, return errors. 
- Enable and rename qtaguid_tagSocket()
  - Add qtaguid_untagSocket()
  - Return kernel errors to caller

Change-Id: I8e33c8832b7f6b24ed9081f36ce1ea9ae6b099c0
Signed-off-by: Ashish Sharma <ashishsharma@google.com>
 2011-08-10 12:25:11 -07:00
JP Abgrall
8699394639 Move qtaguid.c from common sources in Android.mk to fix windows build. 
Change-Id: I0a2d1615108b6c10064b3635d05699748a1341a4
 2011-08-10 12:24:54 -07:00
Ashish Sharma
13825eb0a3 Fix header file inclusion for type uid_t. 
Change-Id: I401fc0b41b4b77114fce7240662c9dfe4509e841
 2011-08-10 12:23:30 -07:00
Ashish Sharma
60daf104a1 Add communication support for xt_qtaguid(network traffic accounting) kernel module. 
Change-Id: Ie0fb5b593987c53ee6f906fe6e0caab5a581d5a1
 2011-08-10 12:23:25 -07:00
Nick Kralevich
189de0c1f4 am adabe566: am 810cf41b: Merge "Fixed memory leak when using transport:serial." 
* commit 'adabe566906aa5e8ce791327559aeb10c139b365':
  Fixed memory leak when using transport:serial.
 2011-07-29 16:47:31 -07:00
Nick Kralevich
adabe56690 am 810cf41b: Merge "Fixed memory leak when using transport:serial." 
* commit '810cf41b6d5b772846bbb16700f8c69f03710e60':
  Fixed memory leak when using transport:serial.
 2011-07-29 16:44:22 -07:00
Nick Kralevich
810cf41b6d Merge "Fixed memory leak when using transport:serial." 2011-07-29 16:32:21 -07:00
Tom Marlin
3175c8e9bf Fixed memory leak when using transport:serial. 
Fixed memory leak when using transport:serial. Code was previously
using strdup() to make a copy of the serial number which was not
necessary. Instead, just set serial=service.

Change-Id: Ifa8fe7999c6fb88955d2c6bdfcd3cd724ec1f020
Signed-off-by: Tom Marlin <tomm@bsquare.com>
 2011-07-29 13:38:56 -05:00
Mike Lockwood
b1cfa67201 am 7d39463e: am d1015de9: Merge "adb: Add USB vendor ID for Vizio" 
* commit '7d39463eff2a9002208f34f1d2ce4d62546f6c3a':
  adb: Add USB vendor ID for Vizio
 2011-07-29 06:20:10 -07:00
Mike Lockwood
7d39463eff am d1015de9: Merge "adb: Add USB vendor ID for Vizio" 
* commit 'd1015de919308ec0a99643f5b2837774d7a3dc62':
  adb: Add USB vendor ID for Vizio
 2011-07-29 06:17:57 -07:00
Mike Lockwood
d1015de919 Merge "adb: Add USB vendor ID for Vizio" 2011-07-29 06:01:54 -07:00
Mike Lockwood
fb34e98bdd adb: Add USB vendor ID for Vizio 
Change-Id: I280ff83d7f1fda1ed811bd42cb6fd65036525559
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-07-29 08:59:43 -04:00
Conley Owens
45e8fc6bfd am 8621b5ea: am 212282c3: am 80dbd2a7: Merge "Fix build error in init when building with bootchart" 
* commit '8621b5ea475822499128e6f138a9dfc224bbb569':
  Fix build error in init when building with bootchart
 2011-07-25 12:21:21 -07:00
Conley Owens
8621b5ea47 am 212282c3: am 80dbd2a7: Merge "Fix build error in init when building with bootchart" 
* commit '212282c314265b1d1def070634049c55291576bb':
  Fix build error in init when building with bootchart
 2011-07-21 17:51:48 -07:00
Conley Owens
212282c314 am 80dbd2a7: Merge "Fix build error in init when building with bootchart" 
* commit '80dbd2a7f277e2fcf831e2ac1b2da574e1513564':
  Fix build error in init when building with bootchart
 2011-07-21 17:50:01 -07:00
Conley Owens
80dbd2a7f2 Merge "Fix build error in init when building with bootchart" 2011-07-21 17:41:32 -07:00
Mike Lockwood
01acea1125 am 1f72fe99: am 7df080b2: am 3ddaa0ad: Merge "adb: Add USB vendor ID for Lenovo" 
* commit '1f72fe991dc2e48c13518015c523f9e3ea048af2':
  adb: Add USB vendor ID for Lenovo
 2011-07-18 09:18:58 -07:00
Mike Lockwood
1f72fe991d am 7df080b2: am 3ddaa0ad: Merge "adb: Add USB vendor ID for Lenovo" 
* commit '7df080b27921827327952628c46dcea6ae6caf34':
  adb: Add USB vendor ID for Lenovo
 2011-07-18 09:15:25 -07:00
Mike Lockwood
7df080b279 am 3ddaa0ad: Merge "adb: Add USB vendor ID for Lenovo" 
* commit '3ddaa0ad1eea0bd9b8137ccf3f200992f7d98c5a':
  adb: Add USB vendor ID for Lenovo
 2011-07-18 09:12:05 -07:00
Mike Lockwood
3ddaa0ad1e Merge "adb: Add USB vendor ID for Lenovo" 2011-07-18 09:08:29 -07:00
Conley Owens
aa4a66a16d am 1e5e2d76: am af6e3266: am d0b93f43: Merge "Create world readable, system writeable /data/resource-cache." 
* commit '1e5e2d7673a9ea915283f6626fa692cc169b0e67':
  Create world readable, system writeable /data/resource-cache.
 2011-07-15 11:30:44 -07:00
Conley Owens
1e5e2d7673 am af6e3266: am d0b93f43: Merge "Create world readable, system writeable /data/resource-cache." 
* commit 'af6e3266fd8d4808a3aa2b37e08dce67493ff396':
  Create world readable, system writeable /data/resource-cache.
 2011-07-15 11:29:15 -07:00
Conley Owens
af6e3266fd am d0b93f43: Merge "Create world readable, system writeable /data/resource-cache." 
* commit 'd0b93f4317c29d434ce22a2643c165317efc5464':
  Create world readable, system writeable /data/resource-cache.
 2011-07-15 11:26:47 -07:00
Kenny Root
070ec8e02e resolved conflicts for merge of 3ea075be to honeycomb-plus-aosp 
Change-Id: Ic668cb99822d4bc44f2f57782afd1a6c1b348e9b
 2011-07-15 11:20:14 -07:00
Conley Owens
d0b93f4317 Merge "Create world readable, system writeable /data/resource-cache." 2011-07-15 11:18:56 -07:00
Kenny Root
3ea075bee7 am ca0a6f04: am 008cbcd0: Merge "Add -F for classify to ls" 
* commit 'ca0a6f0493c2b6a4b6ea20b31a37457accdaf126':
  Add -F for classify to ls
 2011-07-14 17:56:56 -07:00
Kenny Root
ca0a6f0493 am 008cbcd0: Merge "Add -F for classify to ls" 
* commit '008cbcd082f21683b3b53d1ca84725b72b2f90b6':
  Add -F for classify to ls
 2011-07-14 17:54:54 -07:00
Kenny Root
008cbcd082 Merge "Add -F for classify to ls" 2011-07-14 17:41:40 -07:00
Mike Lockwood
7c17d0932c adb: Add USB vendor ID for Lenovo 
Change-Id: I1c2423f567272493067fae04e64fdcb651b0af62
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-07-14 09:00:33 -04:00
Kenny Root
40dac65941 Add -F for classify to ls 
Adds a field to the non-long version of ls that tells what type of file
it is (i.e., regular, directory, link, fifo, etc).

This is useful for scripts that don't have direct filesystem access.

Change-Id: I54a327390f6ed403acb13c824f62ba9594ba320d
 2011-07-13 17:53:50 -07:00
Jean-Baptiste Queru
51ca95dc08 am 3415d411: Merge "resolved conflicts for merge of 8f1f5b06 to gingerbread-plus-aosp" into gingerbread-plus-aosp 
* commit '3415d411073113b44d9fcfd2b7ca7cc0d483d27c':
  pixelflinger: back-port AOSP master version.
  x86: Add vold.fstab to mount the SD card
  Assembly coded android_memset16 and android_memset32
  debuggerd: IA version
  debuggerd: Reorganize to facilitate IA commit
  Set the modes for rc.* files in /system/etc
  DBUS is not fully implemented. Disable it for now
  debuggerd: Show function names in tombstone backtraces
 2011-07-12 15:03:34 -07:00
Jean-Baptiste Queru
3415d41107 Merge "resolved conflicts for merge of 8f1f5b06 to gingerbread-plus-aosp" into gingerbread-plus-aosp 2011-07-12 15:01:26 -07:00
Jean-Baptiste Queru
f75a2ed213 Merge from gingerbread-plus-aosp 
Change-Id: I55b84eda30edf0eade8b43712ab011cd3f65f0d9
 2011-07-12 14:41:38 -07:00
Mike Lockwood
a38ec2b7d4 am 4c6b494a: Merge "adb: Add vendor IDs for iRiver, Compal and T & A Mobile Phones" 
* commit '4c6b494a109186791bfc421bc10f35eaae871174':
  adb: Add vendor IDs for iRiver, Compal and T & A Mobile Phones
 2011-07-12 11:59:31 -07:00
Mike Lockwood
7da2397583 am 0dce7d7e: Merge "Add Gigabyte\'s USB vendor ID to adb." 
* commit '0dce7d7e7294c3815594f7e561f8df9a858e0fab':
  Add Gigabyte's USB vendor ID to adb.
 2011-07-12 11:59:30 -07:00
Mike Lockwood
9df11a69e1 am 161fca79: Merge "Add Funai\'s USB vendor ID to adb." 
* commit '161fca79a9b79ed15d009fc71a916bf1a3b62621':
  Add Funai's USB vendor ID to adb.
 2011-07-12 11:59:28 -07:00
Mike Lockwood
4c6b494a10 Merge "adb: Add vendor IDs for iRiver, Compal and T & A Mobile Phones" 2011-07-12 11:53:31 -07:00
Mike Lockwood
0dce7d7e72 Merge "Add Gigabyte's USB vendor ID to adb." 2011-07-12 11:52:50 -07:00
Mike Lockwood
161fca79a9 Merge "Add Funai's USB vendor ID to adb." 2011-07-12 11:52:34 -07:00
David 'Digit' Turner
97814ab2a3 resolved conflicts for merge of 8f1f5b06 to gingerbread-plus-aosp 
Change-Id: Ie5d26c5a8b31e85aa5137ddbc5eef3616df4fcba
 2011-07-12 01:38:41 +02:00
Mike Lockwood
292e86230e adb: Add vendor IDs for iRiver, Compal and T & A Mobile Phones 
Change-Id: I4dafc43aa76049dd0075e1d70ba05d899e545c8d
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-07-11 09:39:39 -04:00
Joe Bass
7a5c1463ba Add Gigabyte's USB vendor ID to adb. 
Bug #4452872

Change-Id: Ib97548d121d40e96ccc519323a335fc90f3b32b9
 2011-07-11 09:39:02 -04:00
Xavier Ducrohet
cbe19cec61 Add Funai's USB vendor ID to adb. 
Change-Id: Idc2974d4437ab1c79cfea5aade98b599a877aad3
 2011-07-11 09:37:43 -04:00
Wink Saville
436deea5bb am 979203ee: Add reset_mask as parameter to ifc_reset_connections 
* commit '979203ee34084327bf4f20ad1f878450de94826e':
  Add reset_mask as parameter to ifc_reset_connections
 2011-07-08 10:27:09 -07:00
David 'Digit' Turner
8f1f5b061f merge intel x86 patches into gingerbread branch 2011-07-08 18:19:06 +02:00
Wink Saville
979203ee34 Add reset_mask as parameter to ifc_reset_connections 
The reset_mask allows either IPv4 and or IPv6 connections
of an interface to be reset.

Bug: 4981919
Change-Id: Id2d9ab90e30091d3d0764c66d4b01b73c0edbfcc
 2011-07-07 12:16:12 -07:00
vidya rao
6a18a07774 am 04cf629b: Move RILD to class main 
* commit '04cf629be5e99a3a920aecc0b059444bd07e9d84':
  Move RILD to class main
 2011-06-24 22:54:11 -07:00