The Android Automerger
8897508a12
merge in ics-release history after reset to master
2011-09-11 06:42:51 -07:00
Robert Greenwalt
87b9daae2b
am 1ac40f4e: Increase the window sizes on wifi and lte.
...
* commit '1ac40f4ef18799e252115d9c9ad17396ffb68f3d':
Increase the window sizes on wifi and lte.
2011-09-08 07:18:56 -07:00
Mike Lockwood
3c8dc2ffdd
Merge "init: Increase buffer size for serialno and other properties set from kernel command line" into ics-aah
2011-09-07 17:51:48 -07:00
Mike Lockwood
8a7fbf0cf3
init: Increase buffer size for serialno and other properties set from kernel command line
...
Fixes problem with last character truncated for 32 byte serial numbers.
Change-Id: I9ad92d4e1c574bf3c174501581283a13772f0075
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-09-07 17:12:13 -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
The Android Automerger
4285b8f850
merge in ics-release history after reset to master
2011-08-30 13:43:03 -07:00
The Android Automerger
1afcc2cfa4
merge in ics-release history after reset to master
2011-08-30 12:46:04 -07:00
Dima Zavin
09e32886e6
am 96a5482b: am fd6f3872: am 2985f81d: Merge "libdiskconfig: add missing LOCAL_MODULE_TAGS"
...
* commit '96a5482b75029129ebeecd543ca6683d2411b9a3':
libdiskconfig: add missing LOCAL_MODULE_TAGS
2011-08-30 09:51:01 -07:00
The Android Automerger
7fa67f90bf
merge in ics-release history after reset to master
2011-08-30 06:34:47 -07:00
Dima Zavin
96a5482b75
am fd6f3872: am 2985f81d: Merge "libdiskconfig: add missing LOCAL_MODULE_TAGS"
...
* commit 'fd6f38727e3be7d5d9163698b06d61656b2bbe4d':
libdiskconfig: add missing LOCAL_MODULE_TAGS
2011-08-29 18:02:56 -07:00
Dima Zavin
fd6f38727e
am 2985f81d: Merge "libdiskconfig: add missing LOCAL_MODULE_TAGS"
...
* commit '2985f81d0dfa0e3ff790cb7637684b3919a6ca1c':
libdiskconfig: add missing LOCAL_MODULE_TAGS
2011-08-29 17:59:51 -07:00
Vladimir Chtchetkine
dccddee972
Fix DEBUG_NEEDS usage
...
Change-Id: Ic107c60080e55e1f9092f20fe3bd55e7592ca9fd
2011-08-29 10:02:24 -07:00
The Android Automerger
97eda89531
merge in ics-release history after reset to master
2011-08-29 06:34:53 -07:00
Dima Zavin
2985f81d0d
Merge "libdiskconfig: add missing LOCAL_MODULE_TAGS"
2011-08-26 15:38:32 -07:00
Dima Zavin
3bea0790e2
init: check for list empty when getting commands for action
...
Change-Id: Id42d6a6b6297919b2e6520e074e31b5e01ae17bc
Signed-off-by: Dima Zavin <dima@android.com>
2011-08-26 14:03:32 -07:00
Chih-Wei Huang
68cc6bb0f1
libdiskconfig: add missing LOCAL_MODULE_TAGS
...
Change-Id: Ia4fceb4e4f33df3e37b0e83f042fff09dab2d06c
2011-08-25 13:13:24 +08:00
The Android Automerger
948ed29134
merge in ics-release history after reset to master
2011-08-23 06:35:18 -07:00
Christopher Tate
bb86bc5892
Fix 'adb backup' command line validation
...
The host side wasn't properly checking for argument-list sufficiency
*after* removing any [-f filename] sequence.
Fixes bug 5164135
Change-Id: I7bc49e37ef168182088e0e664b6897dd2a088ebf
2011-08-22 17:12:08 -07:00
Benoit Goby
5da93589f1
Allow radio to set sys.usb.config
...
This allows the ril to put the phone into diagnostic mode
Change-Id: Iafc8164991550e7ab0ffda8b8da1d58e34a4225b
2011-08-22 12:12:37 -07:00
The Android Automerger
d5e231b832
merge in ics-release history after reset to master
2011-08-22 06:32:36 -07:00
JP Abgrall
7b114883d0
Merge "init: allow mediaserver to tag socket (group net_bw_acct)"
2011-08-18 09:58:52 -07:00
JP Abgrall
85e37b0a81
init: allow mediaserver to tag socket (group net_bw_acct)
...
The mediaserver needs to do communication on behalf of other apps
(browser, ...).
It needs to be able to tag sockets. The kernel will check for net_bw_acct
group membership.
Change-Id: I7fb063fdb7d9435d7f979df6622ff17f34049cbc
2011-08-18 00:10:06 -07:00
The Android Automerger
e935be126c
merge in ics-release history after reset to master
2011-08-17 06:32:54 -07:00
Jeff Brown
9de370e165
Show the resolution of each axis.
...
Change-Id: I81c4b7e6480b98e59fb389060ab2c8d34257ae5f
2011-08-16 17:19:30 -07:00
Kenny Root
75ae424629
Merge "Add install arg for verification"
2011-08-16 08:36:17 -07:00
The Android Automerger
ada4aa3ced
merge in ics-release history after reset to master
2011-08-16 06:35:19 -07:00
repo sync
3572e5ecb1
Merge "Update dhcp for p2p"
2011-08-15 15:32:36 -07:00
Mike Lockwood
22268c720b
am 549bfcda: am 003771d1: am 80d508fd: Merge "correct VID of Lenovo(0x2006 is for LenovoMobile,0x17EF is for Lenovo)"
...
* commit '549bfcda6df30dd00db254b3717fc8df463ce710':
correct VID of Lenovo(0x2006 is for LenovoMobile,0x17EF is for Lenovo)
2011-08-15 10:29:03 -07:00
Mike Lockwood
549bfcda6d
am 003771d1: am 80d508fd: Merge "correct VID of Lenovo(0x2006 is for LenovoMobile,0x17EF is for Lenovo)"
...
* commit '003771d1c0ad6c3c6cd0c82f787636111c9e193c':
correct VID of Lenovo(0x2006 is for LenovoMobile,0x17EF is for Lenovo)
2011-08-15 10:25:47 -07:00
Mike Lockwood
003771d1c0
am 80d508fd: Merge "correct VID of Lenovo(0x2006 is for LenovoMobile,0x17EF is for Lenovo)"
...
* commit '80d508fd62a2cc22693a9bbb3aca9bd8568ecec5':
correct VID of Lenovo(0x2006 is for LenovoMobile,0x17EF is for Lenovo)
2011-08-15 10:23:51 -07:00
Mike Lockwood
80d508fd62
Merge "correct VID of Lenovo(0x2006 is for LenovoMobile,0x17EF is for Lenovo)"
2011-08-15 10:07:07 -07:00
The Android Automerger
571a471576
merge in ics-release history after reset to master
2011-08-15 06:35:08 -07:00
zhangclb
c11f99f40a
correct VID of Lenovo(0x2006 is for LenovoMobile,0x17EF is for Lenovo)
...
Change-Id: I3466fdf7b03cf5da189efe4efb563d09f14b467a
2011-08-15 14:18:02 +08:00
JP Abgrall
63470fd027
Merge "resolved conflicts for merge of d18dc005
to master"
2011-08-12 16:17:40 -07:00
repo sync
a329b4296c
Update dhcp for p2p
...
Bug: 5002384
Change-Id: I4ee4f80e2bc2966aa30d1344182d90f30117fbae
2011-08-12 15:07:14 -07:00
Dmitry Shmidt
1e144548aa
Merge "libnl_2: Update README"
2011-08-12 14:52:16 -07:00
Dmitry Shmidt
806ed3ce4a
libnl_2: Update README
...
Change-Id: I8501dc01782fa2cfeabb9d27b9c48caa50b74f37
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-08-12 14:46:33 -07:00
JP Abgrall
be24f0c331
resolved conflicts for merge of d18dc005
to master
...
Change-Id: I91015a835880f3619452107239a4fc8ea0fafbf6
Signed-off-by: JP Abgrall <jpa@google.com>
2011-08-12 14:14:55 -07:00
Mathias Agopian
c9b06951e0
another attempt at fixing the SDK build.
...
Change-Id: I2b96cf7d046b694b232f0699257e4e0608fda660
2011-08-11 22:35:31 -07:00
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