Commit graph

4203 commits

Author SHA1 Message Date
Jean-Baptiste Queru
5f83cf0bcf resolved conflicts for merge of a6405e9d to jb-mr1-dev
Change-Id: I2c698ec017f29c9ccc89231439cb6c8013914009
2012-08-23 07:43:47 -07:00
Jean-Baptiste Queru
a6405e9da2 am db56bb4a: Merge "libcorkscrew: avoid future name collisions."
* commit 'db56bb4aebb2aaa63cf33c2f9868a22ea655b38e':
  libcorkscrew: avoid future name collisions.
2012-08-22 11:02:42 -07:00
Jean-Baptiste Queru
db56bb4aeb Merge "libcorkscrew: avoid future name collisions." 2012-08-22 10:43:11 -07:00
Erik Gilling
984d35703d update libsync to support new timeout semantics
Change-Id: Ibedbd261bb96a84785c4e679b6fc4061287d5d7d
2012-08-21 18:21:18 -07:00
Jean-Baptiste Queru
6302b42055 am 487d6d3d: am 02fd2924: Merge "Fixed warnings test_zipfile"
* commit '487d6d3db3f504b0120fc605ad3a4155ca214674':
  Fixed warnings test_zipfile
2012-08-21 09:12:13 -07:00
Jean-Baptiste Queru
a4ad734808 am 00f06911: am c6620cb3: Merge "Fixing unused param warnings in sync_test"
* commit '00f0691107dfde589bd23a7d079b4e05998833b0':
  Fixing unused param warnings in sync_test
2012-08-21 09:12:12 -07:00
Jean-Baptiste Queru
487d6d3db3 am 02fd2924: Merge "Fixed warnings test_zipfile"
* commit '02fd29246ab54ee4a0f8fa6358498070e54e5fd0':
  Fixed warnings test_zipfile
2012-08-21 09:10:03 -07:00
Jean-Baptiste Queru
00f0691107 am c6620cb3: Merge "Fixing unused param warnings in sync_test"
* commit 'c6620cb3a37e98ceb89f5d11305038786af76650':
  Fixing unused param warnings in sync_test
2012-08-21 09:10:02 -07:00
Jean-Baptiste Queru
02fd29246a Merge "Fixed warnings test_zipfile" 2012-08-21 08:09:07 -07:00
Jean-Baptiste Queru
c6620cb3a3 Merge "Fixing unused param warnings in sync_test" 2012-08-21 08:08:55 -07:00
Benoit Goby
3fc95a9918 Revert "adb: Add public key authentification"
This reverts commit f4ed516643.
2012-08-20 23:04:11 -07:00
Benoit Goby
300d6d65d0 Merge "adb: Add public key authentification" into jb-mr1-dev 2012-08-20 20:28:51 -07:00
Brian Carlstrom
1768707951 am e05ac541: am 9d779bf1: Merge "Upgrade to dlmalloc 2.8.5."
* commit 'e05ac5415e861dee6a3f175c8066ff577736ba1f':
  Upgrade to dlmalloc 2.8.5.
2012-08-20 17:04:24 -07:00
Brian Carlstrom
e05ac5415e am 9d779bf1: Merge "Upgrade to dlmalloc 2.8.5."
* commit '9d779bf1ea587dc70b74fd1f8798894a8695e78b':
  Upgrade to dlmalloc 2.8.5.
2012-08-20 17:02:20 -07:00
John Grossman
9dd0029a05 Merge "Replace a segfault with a warning." into jb-mr1-dev 2012-08-20 16:48:13 -07:00
John Grossman
9367f4f973 Replace a segfault with a warning.
Just print a warning if ADB_EXTERNAL_STORAGE is not defined when ADB
runs instead of segfaulting.  If we really don't want to continue to
run, we can make this a fatal error instead.

Change-Id: Icfc5fb9e594b0a310029f1dca7e9476f27ceb7bc
2012-08-20 16:38:01 -07:00
Brian Carlstrom
9d779bf1ea Merge "Upgrade to dlmalloc 2.8.5." 2012-08-20 16:12:35 -07:00
Ian Rogers
2d13791ce7 Upgrade to dlmalloc 2.8.5.
Remove mspace functionality from cutils.
Directly declare mspace from dlmalloc in code flinger's code cache, and
manage without using morecore.

Depends upon: https://android-review.googlesource.com/41717

Change-Id: If927254febd4414212c690f16509ef2ee1b44b44
2012-08-20 15:30:35 -07:00
Jean-Baptiste Queru
a8b832a897 am 42900c30: am 0874aa0e: Merge "adb: Pick desired product value from command line it follows -p"
* commit '42900c30cf39ea4cdc41cc3671584b7f4f39b8bc':
  adb: Pick desired product value from command line it follows -p
2012-08-20 14:51:53 -07:00
Jean-Baptiste Queru
2ab69388cb am 76080925: am 52d5dfc8: Merge "vmstat: Fix -n flag"
* commit '76080925410db41cfa5c70ffcffaa2b3b4d59aad':
  vmstat: Fix -n flag
2012-08-20 14:51:52 -07:00
Jean-Baptiste Queru
9305892464 am 1bcced2b: am c57689fc: Merge "add command-line arguments to mkbootimg to move kernel, ramdisk, etc."
* commit '1bcced2bb67a4024035d5303d953c793b857f275':
  add command-line arguments to mkbootimg to move kernel, ramdisk, etc.
2012-08-20 14:51:51 -07:00
Jean-Baptiste Queru
42900c30cf am 0874aa0e: Merge "adb: Pick desired product value from command line it follows -p"
* commit '0874aa0ec4f413a77a610133c904c2590a2e3ccd':
  adb: Pick desired product value from command line it follows -p
2012-08-20 14:50:36 -07:00
Jean-Baptiste Queru
7608092541 am 52d5dfc8: Merge "vmstat: Fix -n flag"
* commit '52d5dfc8d30890734ee7122c3139f8637e196a1c':
  vmstat: Fix -n flag
2012-08-20 14:50:35 -07:00
Jean-Baptiste Queru
1bcced2bb6 am c57689fc: Merge "add command-line arguments to mkbootimg to move kernel, ramdisk, etc."
* commit 'c57689fc7ccadee4f852ad62ac1010e53382a67c':
  add command-line arguments to mkbootimg to move kernel, ramdisk, etc.
2012-08-20 14:50:34 -07:00
Jean-Baptiste Queru
0874aa0ec4 Merge "adb: Pick desired product value from command line it follows -p" 2012-08-20 14:41:25 -07:00
Jean-Baptiste Queru
52d5dfc8d3 Merge "vmstat: Fix -n flag" 2012-08-20 14:25:13 -07:00
Jean-Baptiste Queru
c57689fc7c Merge "add command-line arguments to mkbootimg to move kernel, ramdisk, etc." 2012-08-20 14:24:56 -07:00
Ariel Bernal
62188564fa Fixed warnings test_zipfile
Fixed implicit declaration of strcmp warning
Fixed switch case of enumeration not handled

Change-Id: Ic3f3690a2e749235b1b0dffd252b119855ad36c0
Author: Ariel Bernal <ariel.j.bernal@intel.com>
Reviewed-by: Tareq A Siraj <tareq.a.siraj@intel.com>
2012-08-20 16:38:37 -04:00
Jeff Brown
a8c2112be6 Merge "Migrate sdcard0 to shell-accessible location." into jb-mr1-dev 2012-08-20 13:15:39 -07:00
Jeff Sharkey
5dd0f86fbf Migrate sdcard0 to shell-accessible location.
Also remove mount() from adb, since it can come online long before
data partition is ready.  Set EXTERNAL_STORAGE environment variable
to point to owner for backwards compatibility.

Bug: 7005701
Change-Id: I63444f6636624eb7ad89f053daa289663424639e
2012-08-20 13:11:11 -07:00
Doug Zongker
ed95159056 add command-line arguments to mkbootimg to move kernel, ramdisk, etc.
Bug: 6918260
Change-Id: I5d4af6314fded027952941110a520dc9aa234a14
2012-08-20 10:46:10 -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
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
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
Jeff Sharkey
de980f27a7 Omit multiuser.c from Windows builds.
Change-Id: I0cee35373e33084e4fc65a1d5c0b611c6fa82346
2012-08-16 17:16:43 -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
edb2d634b3 Merge "ueventd.rc: Add /dev/uhid for bluedroid" into jb-mr1-dev 2012-08-16 12:22:51 -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