Commit graph

3047 commits

Author SHA1 Message Date
Lorenzo Colitti
47ddb515b7 Support adding, deleting, and clearing IPv6 addrs.
- Provide a function to add and delete IPv4/IPv6 addresses
  using netlink.
- Provide a function that clears all IP addresses on an
  interface that can be used by netd.

Also, a couple of cleanups:

- Update the header file to match reality, and include the
  header file in the implementation. Also fix a caller that
  has an incorrect method signature.
- Fix whitespace in Android.mk.

Change-Id: Ifba9d60cdfffb0b7e5c3b9c6ab328f5f77d259c4
2011-09-28 17:12:13 -07:00
Mathias Agopian
2a32df25b8 Merge "enable HAVE_DLADDR, since... we have it" 2011-09-28 15:16:44 -07:00
Vladimir Chtchetkine
b14bbf0298 Merge "Pick up on androidboot.hardware kernel cmd option" 2011-09-28 12:53:56 -07:00
Mathias Agopian
918638c775 enable HAVE_DLADDR, since... we have it
Change-Id: I02baa1f7d3383e93a43fa04de1d39f7398e971bc
2011-09-28 12:17:00 -07:00
Vladimir Chtchetkine
2b99543cef Pick up on androidboot.hardware kernel cmd option
x86 emulator passes hardware name through the androidboot.hardware kernel cmd option, and
ueventd must pick up on it to locate proper ueventd.rc file for that hardware.

Change-Id: Id61c5b67fe6275a15c7aa62556e0b89eda7968f8
2011-09-28 11:44:30 -07:00
Jean-Baptiste Queru
ba8ea70024 am c59c6c31: am 52262788: Ignore beec0066 from gingerbread (already here)
* commit 'c59c6c31a7bb6c70dc8b4f2b2879db98cd617626':
  emulator: allow /dev/qemu_pipe access
2011-09-28 10:47:47 -07:00
Jean-Baptiste Queru
c59c6c31a7 am 52262788: Ignore beec0066 from gingerbread (already here)
* commit '52262788834da375b88cb97b995b42c4ffde0f60':
  emulator: allow /dev/qemu_pipe access
2011-09-28 10:45:55 -07:00
Jean-Baptiste Queru
5226278883 Ignore beec0066 from gingerbread (already here)
Change-Id: Id124f8c7288e464f76bdb531dd97e10d5a22244a
2011-09-28 10:40:43 -07:00
The Android Automerger
1a1d11e9e4 merge in ics-release history after reset to master 2011-09-27 07:01:00 -07:00
Dima Zavin
a5bfd4e383 am 1a5ca61b: charger: use the new asset for almost full, and show full @ 95%
* commit '1a5ca61b28b3269b625b7a7162b4f50734f7fea9':
  charger: use the new asset for almost full, and show full @ 95%
2011-09-26 19:44:47 -07:00
Dima Zavin
df3429de12 am fc44f5f4: charger: update assets
* commit 'fc44f5f4d4b3b05d9eba1ee787b70e1dfe0f18c5':
  charger: update assets
2011-09-26 19:44:46 -07:00
Dima Zavin
1a5ca61b28 charger: use the new asset for almost full, and show full @ 95%
Change-Id: I5f8729260ae068d35d981ff2c16d576c3d4dd82f
Signed-off-by: Dima Zavin <dima@android.com>
2011-09-26 14:14:19 -07:00
Dima Zavin
fc44f5f4d4 charger: update assets
Change-Id: I0c0d1206fdc3aa30382a9ee86edb88bba1e21e63
Signed-off-by: Dima Zavin <dima@android.com>
2011-09-26 13:57:45 -07:00
Dima Zavin
d7802a2fa4 am e0c70dad: charger: show animation when the device is unplugged
* commit 'e0c70dad4b4d417182e4c0ba8adae199f2622582':
  charger: show animation when the device is unplugged
2011-09-26 13:14:56 -07:00
The Android Automerger
9aba3032c1 merge in ics-release history after reset to master 2011-09-26 07:00:28 -07:00
Dima Zavin
dcecd4cc77 resolved conflicts for merge of 0052abda to master
Change-Id: Ia33ac80949bebaafd1a012b7b131dc3960eca862
2011-09-25 22:27:13 -07:00
Dima Zavin
e0c70dad4b charger: show animation when the device is unplugged
Change-Id: I54af1bc61c73bbc993d1dff37174b16e1de5b7a4
Signed-off-by: Dima Zavin <dima@android.com>
2011-09-25 22:19:49 -07:00
Dima Zavin
0052abdafd charger: update charger UI with official graphics and animation
Change-Id: I1b36fa9e380797fe01812b57ac5d8c2c38857993
Signed-off-by: Dima Zavin <dima@android.com>
2011-09-25 21:20:55 -07:00
The Android Automerger
f60824cb94 merge in ics-release history after reset to master 2011-09-25 07:01:32 -07:00
Kenny Root
a031a91b95 Skip argument when parsing adb install
A command line flag with an argument was checked in the Pm.java code,
but it wasn't being checked by "adb install" so attempts to use it
failed.

Change-Id: I0b84a4203a416f7323fa823c0f1f1750670d0c76
2011-09-23 13:36:00 -07:00
JP Abgrall
8898c87449 am 29656d34: qtaguid: shhhh. LOGI -> LOGV
* commit '29656d34a21f4bc3899264027664c9321b0b94e0':
  qtaguid: shhhh. LOGI -> LOGV
2011-09-22 23:39:35 -07:00
JP Abgrall
29656d34a2 qtaguid: shhhh. LOGI -> LOGV
Less verbose output.

Bug: 5360129
Change-Id: Id32a7c61d51b6a16f50a5c8bcc75a2feaa0e34b1
2011-09-22 14:39:47 -07:00
David 'Digit' Turner
44e96d4302 Merge "emulator: Move qemu-props to core service" 2011-09-22 07:56:56 -07:00
The Android Automerger
9378409b54 merge in ics-release history after reset to master 2011-09-21 07:01:26 -07:00
Brian Swetland
303e6ac804 fix TINY_ANDROID build (exclude charger binary)
Change-Id: I28157cbadcb208df517052336f652f5810048cc1
Signed-off-by: Brian Swetland <swetland@google.com>
2011-09-20 17:38:06 -07:00
Wink Saville
6656d921e8 am 0c613613: Reduce connectivity logging.
* commit '0c613613d757c544d6ec7e5678f49a631a99d72a':
  Reduce connectivity logging.
2011-09-20 17:15:34 -07:00
Wink Saville
0c613613d7 Reduce connectivity logging.
Change-Id: Ib71f3f17d56ba614436bcb18f9100196fd7e7ee6
2011-09-20 15:53:23 -07:00
The Android Automerger
26833f5724 merge in ics-release history after reset to master 2011-09-18 07:02:08 -07:00
Xavier Ducrohet
1d37ef6ecb Merge "Add Positivo's vendor ID to adb." 2011-09-16 17:08:00 -07:00
Xavier Ducrohet
dd52e8c57b Add Positivo's vendor ID to adb.
Change-Id: Ida6fc323d766249f4f12708bae1c50ae5d937b2c
2011-09-16 13:48:50 -07:00
Dima Zavin
92312a515b charger: reduce timeout for power-on with power key to 2 secs
Change-Id: I8d3a49678a7fc47282d7ab407722e7c1829e9187
Signed-off-by: Dima Zavin <dima@android.com>
2011-09-16 13:16:04 -07:00
David 'Digit' Turner
beec0066fc emulator: allow /dev/qemu_pipe access
This patch is necessary to allow normal applications to access the
special /dev/qemu_pipe device file at runtime. This is used to provide
a high-speed communication channel with the emulator.

Needed by OpenGLES emulation.

Change-Id: Ic266bdcc4fd069d2b4355e6ea81723296a1a21d1
2011-09-16 17:02:51 +02:00
David 'Digit' Turner
a503456526 emulator: Move qemu-props to core service
The qemu-props program is launched at boot to read a series of
system property assignments from the emulator and apply them.

This is necessary to deal with the dynamic nature of the emulated
platform (e.g. the screen density which depends on the skin and
cannot be hard-coded in the platform image).

This patch ensures that qemu-props is started before any other
service that may read one of these properties (e.g. surface flinger).
This is done by encapsulating the program into a 'core' service.
Core services are all stared before regular ones.

Before the patch, qemu-props was started manually inside a script
that is called from a late emulator-specific boot service
(goldfish-setup).

The problem was that sometimes qemu-props was run too late.
This resulted in random flakiness, especially when running
on a low-end host machine.

Fix for bug 2161189 (and probably a few others)

Change-Id: I2933a25dcb5fecbb1fc238f157264e621b8f295b
2011-09-16 00:25:16 +02:00
The Android Automerger
a390e7fe9e merge in ics-release history after reset to master 2011-09-15 06:36:05 -07:00
JP Abgrall
243123fb41 libcutils: qtaguid: Support new functions, add tag resource tracking.
* Add support for
  deleteTagData(tag, uid)
  setCounterSet(counterSetNum, uid)
  setPacifier(on)

* Add resource tracking
(If only kernel process termination had a hook)
Because the xt_qtaguid netfilter module needs to keep track of
tagged sockets, it needs a way to know when the process owning
the socket has died.
Normally the app will untag the sockets. But not on crash.
So the process opens the qtaguid misc dev, which is closed on crash,
at which point the xt_qtaguid can force-untag the processes sockets,
and thus allowing their refcount to go down and release them.

* Add pacifier support
 Add function to enable/disable pacification of the xt_qtaguid
 kernel module. (mostly for debugging)

Change-Id: I7f2228e65208046dd37ec1c7407ee307d5ba9b99
2011-09-14 15:00:40 -07:00
Mike Lockwood
aa61854645 adb: Add USB vendor IDs for K-Touch, Pegatron and Archos
Change-Id: Idbc212abfb7d4d0a53e6b8ecd55134b81f4e960d
Bug: 5182028
Bug: 5157478

Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-09-13 13:20:12 -04:00
The Android Automerger
8b4bd33193 merge in ics-release history after reset to master 2011-09-13 06:35:07 -07:00
JP Abgrall
8e3ff70444 init.rc: allow all users to open the qtaguid misc dev
The netfilter xt_qtaguid module uses a misc dev so that processes
that use the module can be tracked.
Every process that does socket tagging must open that dev.

Change-Id: I6af3e0f0180637b14455dd9607724523f142c402
2011-09-11 16:12:27 -07:00
The Android Automerger
8897508a12 merge in ics-release history after reset to master 2011-09-11 06:42:51 -07:00
Robert Greenwalt
1ac40f4ef1 Increase the window sizes on wifi and lte.
Set to 524288,1048576,2097152, 262144,524288,1048576.

bug:5226360
Change-Id: Id9d4257c51a355d78246b4ca59ab462fbe5b72be
2011-09-07 15:40:26 -07:00
The Android Automerger
fcb9bf4cc6 merge in ics-release history after reset to master 2011-09-07 06:35:14 -07:00
Dima Zavin
ebf46586f5 init: do not load default.prop from ramdisk in charger mode
Change-Id: Ic471b891829d7f857674b925c9948954972d9ecb
Signed-off-by: Dima Zavin <dima@android.com>
2011-09-06 10:12:41 -07:00
The Android Automerger
13ca5158e4 merge in ics-release history after reset to master 2011-09-05 06:35:43 -07:00
Dima Zavin
7e14e0c974 cutils: only build klog for target
Change-Id: Id524753ca5e7271a498fdf03179bba3fdaed5729
Signed-off-by: Dima Zavin <dima@android.com>
2011-09-04 17:16:13 -07:00
Dima Zavin
f48b23688c core: Add a standalone charger UI binary
This can be launched from an 'on charger' section in init, which
is processed if androidboot.mode=charger is supplied on kernel
command line.

This is a standalone binary that has a simple "user interface"
and allows the standard production kernel to run while charging.
This removes the burden from the bootloader to get low-power mode
working.

Currently, the device will "power-on" (i.e. reboot) into normal
mode if the power key is pressed for X seconds, and will also
power down the device if the usb/ac cable is removed for Y seconds.

Change-Id: I780594b99211cb09de7f8519a69c5962eb91348a
Signed-off-by: Dima Zavin <dima@android.com>
2011-09-04 15:41:36 -07:00
Dima Zavin
ca47cef749 init: add charge mode handling
Introduces a 'charger' section that is processed when androidboot.mode
supplied on the kernel commandline is "charger".

In this mode, sections such as fs, post-fs, etc are skipped. Only the
'early-init' and 'init' sections of the init rc files are processed before
processing the 'charger' section.

Change-Id: If9eb6334de18f04cbcf2aab784578e2993615242
Signed-off-by: Dima Zavin <dima@android.com>
2011-09-02 12:11:18 -07:00
Dima Zavin
da04c52ab1 init/cutils: move list utility code to cutils from init
Change-Id: I357ceee813700297d8343159f22a07659e768d41
Signed-off-by: Dima Zavin <dima@android.com>
2011-09-02 12:11:18 -07:00
Dima Zavin
8f91282ebe init/cutils: move kernel logging interface to libcutils from init
Change-Id: Ia0f91b1fcd6cae69d76bf3dd841340958db938a8
Signed-off-by: Dima Zavin <dima@android.com>
2011-09-02 12:11:17 -07:00
Dima Zavin
2d55e02d0f libcutils/init: move uevent socket opening code to libcutils
Change-Id: I90adf78c0eb6185505f2bf7b62e96e25ab918345
Signed-off-by: Dima Zavin <dima@android.com>
2011-09-02 12:11:17 -07:00
The Android Automerger
d4f1c430ef merge in ics-release history after reset to master 2011-08-31 06:34:42 -07:00