Commit graph

3047 commits

Author SHA1 Message Date
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
Mathias Agopian
7934d18aa6 really fix the SDK build and fix THE build
Change-Id: I994cccf01bcafedc9ea11648eafc20300c58878b
2011-08-11 19:26:39 -07:00
Mathias Agopian
05dc0c6c8d Merge "attempt to fix SDK build." 2011-08-11 19:10:52 -07:00
Mathias Agopian
33a1d43636 attempt to fix SDK build.
missing cdefs.h include

Change-Id: Ic7dfdfe74976a459f166a7576b077965cd1fda6a
2011-08-11 19:09:33 -07:00
Dmitry Shmidt
4863fc19e2 libnl_2: Fix nested attribute setting
Change-Id: I9dbf72a25e8a939ab6aa35eaf4adbf86d9ed97a1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-08-11 15:16:38 -07:00
Dmitry Shmidt
5fbf404d72 Merge "libnl_2: Fix nested attribute setting" 2011-08-11 09:31:13 -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
Mathias Agopian
8968195b19 Merge "Add a priority constant in to the graphics HAL header" 2011-08-10 19:40:24 -07:00
Dmitry Shmidt
64f17e85b4 libnl_2: Fix nested attribute setting
Change-Id: I9dbf72a25e8a939ab6aa35eaf4adbf86d9ed97a1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-08-10 15:25:51 -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
Ashish Sharma
e4b10e9f7f Merge "libcutils: qtaguid: support socket untagging, return errors." 2011-08-09 23:21:16 -07:00
Mathias Agopian
5c9be402a4 Add a priority constant in to the graphics HAL header
this is needed if a display/gpu driver needs to create
service threads that can block the main ui thread.
to avoid priority inversions, these must run at
HAL_PRIORITY_URGENT_DISPLAY

Change-Id: I3af592e05a6d1b6f39a2b7885a7c842e54abfce2
2011-08-09 18:55:44 -07:00