Commit Graph

4517 Commits

Author SHA1 Message Date
Jean-Baptiste Queru a1fdd81c6c am d88a211d: am c3a4a054: am 3af04b71: am 7c386a61: Merge "Extend and document the "wait" command"
* commit 'd88a211d8833ea971e1af451544b35fd0a9cc101':
  Extend and document the "wait" command
2012-08-20 10:33:56 -07:00
Jean-Baptiste Queru d8f7d53649 am 87948ca1: am 80da83ac: am cd82a6fe: am 36b1399d: Merge "diskconfig: Add missing include for loff_t"
* commit '87948ca1c47eaa25d8957ce7884f4f1d5b1a01f6':
  diskconfig: Add missing include for loff_t
2012-08-20 10:33:55 -07:00
Jean-Baptiste Queru a7962832f6 am bb0d0721: am 94938c9d: am ed2e672f: Merge "Print strerror for file read errors during flashing"
* commit 'bb0d0721e6bc5dcedc9bbbac0ea8fa4e57f487ad':
  Print strerror for file read errors during flashing
2012-08-20 10:31:47 -07:00
Jean-Baptiste Queru d88a211d88 am c3a4a054: am 3af04b71: am 7c386a61: Merge "Extend and document the "wait" command"
* commit 'c3a4a054a99b62cb4fd593d95f3b2b0017202b20':
  Extend and document the "wait" command
2012-08-20 10:31:46 -07:00
Jean-Baptiste Queru 87948ca1c4 am 80da83ac: am cd82a6fe: am 36b1399d: Merge "diskconfig: Add missing include for loff_t"
* commit '80da83ac31925326b3a76f10564c05f2043c70f0':
  diskconfig: Add missing include for loff_t
2012-08-20 10:31:45 -07:00
Jean-Baptiste Queru bb0d0721e6 am 94938c9d: am ed2e672f: Merge "Print strerror for file read errors during flashing"
* commit '94938c9d60d6467ec40df4254beadc50bb787934':
  Print strerror for file read errors during flashing
2012-08-20 10:29:39 -07:00
Jean-Baptiste Queru c3a4a054a9 am 3af04b71: am 7c386a61: Merge "Extend and document the "wait" command"
* commit '3af04b71e51e89af02a1fe526e4fc32dce0100d3':
  Extend and document the "wait" command
2012-08-20 10:29:38 -07:00
Jean-Baptiste Queru 80da83ac31 am cd82a6fe: am 36b1399d: Merge "diskconfig: Add missing include for loff_t"
* commit 'cd82a6fea05d1fa06cb0ac56d2dbb27b013b8eaa':
  diskconfig: Add missing include for loff_t
2012-08-20 10:29:37 -07:00
Jean-Baptiste Queru 94938c9d60 am ed2e672f: Merge "Print strerror for file read errors during flashing"
* commit 'ed2e672f3b929ac49617de11e6530c812b082eb6':
  Print strerror for file read errors during flashing
2012-08-20 09:41:54 -07:00
Jean-Baptiste Queru 3af04b71e5 am 7c386a61: Merge "Extend and document the "wait" command"
* commit '7c386a610d9164c12932452d1ff671e070956ec1':
  Extend and document the "wait" command
2012-08-20 09:41:53 -07:00
Jean-Baptiste Queru cd82a6fea0 am 36b1399d: Merge "diskconfig: Add missing include for loff_t"
* commit '36b1399d8cee09d4ffde3bf958322ab9556b8ebe':
  diskconfig: Add missing include for loff_t
2012-08-20 09:41:52 -07:00
Jean-Baptiste Queru ed2e672f3b Merge "Print strerror for file read errors during flashing" 2012-08-20 09:19:09 -07:00
Jean-Baptiste Queru 7c386a610d Merge "Extend and document the "wait" command" 2012-08-20 09:18:38 -07:00
Jean-Baptiste Queru 36b1399d8c Merge "diskconfig: Add missing include for loff_t" 2012-08-20 09:18:06 -07:00
The Android Automerger 2a83864745 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-20 06:36:06 -07:00
Joe Onorato 42d622df58 am c14b5683: am ab163a9a: am c56f4285: am a11f4bcf: Merge changes I5006b467,I0118cebf,Ibc792367
* commit 'c14b56831d74d3d871cac8beb3024cedba7e7fa8':
  Support for multiple modules with the same name is going away.
  Fix build by removing TAGS from host module
  libext4_utils on host is now called libext4_utils_host so there is no name conflict
2012-08-17 01:02:47 -07:00
Joe Onorato c14b56831d am ab163a9a: am c56f4285: am a11f4bcf: Merge changes I5006b467,I0118cebf,Ibc792367
* commit 'ab163a9a1784594b46217576d0fa991496f3d14e':
  Support for multiple modules with the same name is going away.
  Fix build by removing TAGS from host module
  libext4_utils on host is now called libext4_utils_host so there is no name conflict
2012-08-17 00:55:18 -07:00
Joe Onorato ab163a9a17 am c56f4285: am a11f4bcf: Merge changes I5006b467,I0118cebf,Ibc792367
* commit 'c56f428530a307c850dc99024d23f7e5ebbf92d3':
  Support for multiple modules with the same name is going away.
  Fix build by removing TAGS from host module
  libext4_utils on host is now called libext4_utils_host so there is no name conflict
2012-08-17 00:53:14 -07:00
Joe Onorato c56f428530 am a11f4bcf: Merge changes I5006b467,I0118cebf,Ibc792367
* commit 'a11f4bcfd4d40673bc97d81eb80e201359ade1e6':
  Support for multiple modules with the same name is going away.
  Fix build by removing TAGS from host module
  libext4_utils on host is now called libext4_utils_host so there is no name conflict
2012-08-17 00:51:12 -07:00
Joe Onorato a11f4bcfd4 Merge changes I5006b467,I0118cebf,Ibc792367
* changes:
  Support for multiple modules with the same name is going away.
  Fix build by removing TAGS from host module
  libext4_utils on host is now called libext4_utils_host so there is no name conflict
2012-08-17 00:38:58 -07:00
Joe Onorato 20258b501e Support for multiple modules with the same name is going away.
Change-Id: I5006b467978071f9107babe532efa71d05061580
2012-08-16 22:47:13 -07:00
Mike J. Chen 4d9571145a Fix build by removing TAGS from host module
Change-Id: I0118cebff021b435baea0b46dd3c43250ef96632
Signed-off-by: Mike J. Chen <mjchen@google.com>
2012-08-16 22:47:13 -07:00
Joe Onorato 1cd5bcf591 libext4_utils on host is now called libext4_utils_host so there is no name conflict
Change-Id: Ibc7923676925ed6942b3f672ee764cfaa98ee96e
2012-08-16 22:47:13 -07:00
Benoit Goby f4ed516643 adb: Add public key authentification
Secure adb using a public key authentication, to allow USB debugging
only from authorized hosts.

When a device is connected to an unauthorized host, the adb daemon sends
the user public key to the device. A popup is shown to ask the user to
allow debugging once or permanantly from the host. The public key is
installed on the device in the later case. Other keys may be installed
at build time.

On the host, the user public/private key pair is automatically generated,
if it does not exist, when the adb daemon starts and is stored in
$HOME/.android/adb_key(.pub) or in $ANDROID_SDK_HOME on windows. If needed,
the ADB_KEYS_PATH env variable may be set to a ;-separated list of private
keys, e.g. company-wide or vendor keys.

On the device, vendors public keys are installed at build time in
/adb_keys. User-installed keys are stored in /data/misc/adb/adb_keys.

ADB Protocol change:
If the device needs to authenticate the host, it replies to CNXN
packets with an AUTH packet. The AUTH packet payload is a random token.
The host signs the token with one of its private keys and sends an AUTH(0)
packet. If the signature verification succeeds, the device replies with
a CNXN packet. Otherwise, it sends a new AUTH packet with a new token so
that the host can retry with another private key. Once the host has tried
all its keys, it can send an AUTH(1) packet with a public key as
payload. adbd then sends the public key to the framework (if it has been
started) for confirmation.

Change-Id: Idce931a7bfe4ce878428eaa47838e5184ac6073f
2012-08-16 21:36:26 -07:00
The Android Open Source Project 2da12877ca am 2f86a384: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '2f86a384743fd3f608e8e65e4d5f5328a0aedfcb':
  bluetooth: bring up with bluedroid stack
2012-08-16 19:13:08 -07:00
The Android Open Source Project 2f86a38474 Reconcile with jb-mr1-release - do not merge
Change-Id: I5602173e60967c0b027f926df862747b2cf1edde
2012-08-16 19:11:35 -07:00
Jeff Sharkey 7c87aaa38c am 807a2f54: am de980f27: Omit multiuser.c from Windows builds.
* commit '807a2f54f313caa5d7cba85a924de0ab6b830b66':
  Omit multiuser.c from Windows builds.
2012-08-16 17:27:58 -07:00
Jeff Sharkey 807a2f54f3 am de980f27: Omit multiuser.c from Windows builds.
* commit 'de980f27a701eb8f7130218f9bac768fe7155d30':
  Omit multiuser.c from Windows builds.
2012-08-16 17:26:47 -07:00
Jeff Sharkey de980f27a7 Omit multiuser.c from Windows builds.
Change-Id: I0cee35373e33084e4fc65a1d5c0b611c6fa82346
2012-08-16 17:16:43 -07:00
Jeff Sharkey 19542d2425 am b0d56eef: am 2be5338a: Merge "Multi-user external storage support." into jb-mr1-dev
* commit 'b0d56eef7b073461678751f56e24623f2e1ab581':
  Multi-user external storage support.
2012-08-16 14:37:49 -07:00
Jeff Sharkey b0d56eef7b am 2be5338a: Merge "Multi-user external storage support." into jb-mr1-dev
* commit '2be5338a84f19b24b6515c0bfcf2f3f7b55262c1':
  Multi-user external storage support.
2012-08-16 14:35:29 -07:00
Jeff Sharkey 2be5338a84 Merge "Multi-user external storage support." into jb-mr1-dev 2012-08-16 14:33:00 -07:00
Scott Anderson 0b7a10a15f am 59094a52: am edb2d634: Merge "ueventd.rc: Add /dev/uhid for bluedroid" into jb-mr1-dev
* commit '59094a52ff47e107d749d6094cf577019906e691':
  ueventd.rc: Add /dev/uhid for bluedroid
2012-08-16 12:26:41 -07:00
Scott Anderson 59094a52ff am edb2d634: Merge "ueventd.rc: Add /dev/uhid for bluedroid" into jb-mr1-dev
* commit 'edb2d634b35ec1b0268ac7d9ddab8c8fc082a14e':
  ueventd.rc: Add /dev/uhid for bluedroid
2012-08-16 12:24:54 -07:00
Scott Anderson edb2d634b3 Merge "ueventd.rc: Add /dev/uhid for bluedroid" into jb-mr1-dev 2012-08-16 12:22:51 -07:00
The Android Automerger 60e5cd66bb merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-16 06:35:01 -07:00
Jeff Sharkey 885342a0f2 Multi-user external storage support.
Remount rootfs as recursively shared, so that mount changes are
propagated into child namespaces.  Mount external storage for access
from adb.

Clean multi-user dependencies for use in Dalvik.  Also define
external storage paths.

Bug: 6925012
Change-Id: I375de581a63f4f36667894c56a34a9dd45361e8f
2012-08-15 21:10:07 -07:00
Joe Onorato 5069b01e21 Support for multiple modules with the same name is going away.
Change-Id: I5006b467978071f9107babe532efa71d05061580
2012-08-15 19:52:52 -07:00
Mike J. Chen 1926c15a12 Fix build by removing TAGS from host module
Change-Id: I0118cebff021b435baea0b46dd3c43250ef96632
Signed-off-by: Mike J. Chen <mjchen@google.com>
2012-08-15 19:52:52 -07:00
Joe Onorato 2ffe3c8ac4 libext4_utils on host is now called libext4_utils_host so there is no name conflict
Change-Id: Ibc7923676925ed6942b3f672ee764cfaa98ee96e
2012-08-15 19:52:52 -07:00
Alex Yakavenka 091c21c92c Export flags needed for ifc_reset_connections API in netutils
Code using ifc_reset_connections api needs to have access to
predefined masks for reset_mask parameter

Change-Id: I90bc5e1b62ae4a88501c8ad4e353c0d93d319579
2012-08-15 15:50:25 -07:00
Scott Anderson 3ad289dca6 ueventd.rc: Add /dev/uhid for bluedroid
Change-Id: Ica71265856fce1abc0a0ba9c0b1ca016510c61b7
Signed-off-by: Scott Anderson <saa@android.com>
2012-08-15 15:02:00 -07:00
Jeonghoon lim 81b1996827 bluetooth: bring up with bluedroid stack
- change permission of "bluetooth." property to AID_BLUETOOTH

Change-Id: Ifcd97f136cfc3372412fe500e4f800d1bbbd065c
2012-08-15 11:46:33 -07:00
Jean-Baptiste Queru d7514a0781 am 9342d910: am e92372ba: resolved conflicts for merge of 2237ca4c to jb-mr1-dev
* commit '9342d9101896d006a398de159409f08619fec004':
  Fixing signed/unsigned comparison warnings
2012-08-15 10:23:44 -07:00
Jean-Baptiste Queru 9342d91018 am e92372ba: resolved conflicts for merge of 2237ca4c to jb-mr1-dev
* commit 'e92372ba9eaa04eb4ed7eb9417ee2be3515bd972':
  Fixing signed/unsigned comparison warnings
2012-08-15 10:22:08 -07:00
Jean-Baptiste Queru e92372ba9e resolved conflicts for merge of 2237ca4c to jb-mr1-dev
Change-Id: I04982ff2b092274b940a621b238c2246349aa85e
2012-08-15 10:01:12 -07:00
Jean-Baptiste Queru 110a95bac7 am 7b0ea426: am d7f78e88: am e3bdaeb6: am 2765e4fb: Merge "Use sigemptyset to initialise signal mask as it is more portable. Referencing sa_restorer fails on MIPS"
* commit '7b0ea4262b2ec5781faeca67762f03af3fb1c71f':
  Use sigemptyset to initialise signal mask as it is more portable. Referencing sa_restorer fails on MIPS
2012-08-15 09:42:34 -07:00
Jean-Baptiste Queru 2469241351 am 2b9998fb: am ef1945f8: am 417e3041: am 8124e073: Merge "Fix unused parameter warnings"
* commit '2b9998fb90dd687f2344248d0c9b165bb7eea1e2':
  Fix unused parameter warnings
2012-08-15 09:42:33 -07:00
Jean-Baptiste Queru 50e87ff393 am cd67383d: am 5731de96: am 83c4398b: am cc12ed32: Merge "[MIPS] debuggerd and libcorkscrew support"
* commit 'cd67383d7966328d04b0e339a7c9f423ba40f99f':
  [MIPS] debuggerd and libcorkscrew support
2012-08-15 09:42:32 -07:00
Jean-Baptiste Queru 7b0ea4262b am d7f78e88: am e3bdaeb6: am 2765e4fb: Merge "Use sigemptyset to initialise signal mask as it is more portable. Referencing sa_restorer fails on MIPS"
* commit 'd7f78e88b5b2c65b8cef21fdcaae3278ec2ed083':
  Use sigemptyset to initialise signal mask as it is more portable. Referencing sa_restorer fails on MIPS
2012-08-15 09:40:49 -07:00