The Android Automerger
05e2599ffd
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-06 06:34:54 -07:00
Ying Wang
96535ba620
Dist fastboot and adb for the sdk build.
...
So they can be downloaded from the build page.
Bug: 7109694
Change-Id: Ibc60d0acbc5d2445c01010fd0bd4654a240b0a88
2012-09-05 10:26:43 -07:00
The Android Automerger
4b019264e2
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-05 06:34:50 -07:00
The Android Automerger
d932c552ee
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-03 06:35:02 -07:00
Benoit Goby
345ca131bb
adb: Link statically with libcrypto
...
Bug: 7063951
Change-Id: I328b76a751aceaae625d64156f22ce3de65678c8
2012-08-31 18:24:07 -07:00
Benoit Goby
59680145c8
Merge "adb: Create private key with 0600 mode" into jb-mr1-dev
2012-08-31 14:40:51 -07:00
Benoit Goby
64b3103017
adb: Create private key with 0600 mode
...
Changed key name to force generating new pairs.
Bug: 7092477
Change-Id: I680cb9dd1896ae52b2b29d63533f966e033d823f
2012-08-31 12:31:36 -07:00
Jeff Sharkey
9685194fc9
File-system utilities for installd and zygote.
...
Bug: 7008879
Change-Id: Ia54b8d4ad434e8973f235e2a4728651814bef8a9
2012-08-30 10:29:41 -07:00
The Android Automerger
b2c75f7696
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-30 06:34:49 -07:00
Ian Rogers
84ac402fa1
Merge "Revert "Revert "Upgrade to dlmalloc 2.8.5.""" into jb-mr1-dev
2012-08-29 08:54:04 -07:00
The Android Automerger
db59e656da
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-29 06:34:35 -07:00
Wink Saville
5c9da7b65c
am e3524293: am af03b050: Merge "Export flags needed for ifc_reset_connections API in netutils"
...
* commit 'e3524293da5d7503dddb00911b9e5b37e9417981':
Export flags needed for ifc_reset_connections API in netutils
2012-08-28 19:54:59 -07:00
Wink Saville
e3524293da
am af03b050: Merge "Export flags needed for ifc_reset_connections API in netutils"
...
* commit 'af03b05009863f5d9761864dcec13e4ee6221d69':
Export flags needed for ifc_reset_connections API in netutils
2012-08-28 19:50:20 -07:00
Wink Saville
af03b05009
Merge "Export flags needed for ifc_reset_connections API in netutils"
2012-08-28 19:43:27 -07:00
Ian Rogers
fd7f1b6a50
Revert "Revert "Upgrade to dlmalloc 2.8.5.""
...
This reverts commit 42b83c6df7 .
2012-08-28 15:52:20 -07:00
Mike Lockwood
59c778e988
Merge "import init.${ro.hardware}.rc last to allow overriding default USB configuration" into jb-mr1-dev
2012-08-28 10:40:44 -07:00
Mike Lockwood
35ea5e4f23
import init.${ro.hardware}.rc last to allow overriding default USB configuration
...
Change-Id: I2194466fb7cf7ff5313d146601155ebe6043fd42
2012-08-28 10:25:13 -07:00
The Android Automerger
2748e5f455
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-28 06:34:45 -07:00
Jean-Baptiste Queru
8bbc8a2884
am 7995b841: am c3c5358b: Merge "Add MIPS support to pixelflinger."
...
* commit '7995b841483fc45cc762d7dab8a8817a6d97492b':
Add MIPS support to pixelflinger.
2012-08-27 15:19:07 -07:00
Jean-Baptiste Queru
7995b84148
am c3c5358b: Merge "Add MIPS support to pixelflinger."
...
* commit 'c3c5358b94f48799fd595c829ce223b43588bac1':
Add MIPS support to pixelflinger.
2012-08-27 15:15:24 -07:00
Jean-Baptiste Queru
c3c5358b94
Merge "Add MIPS support to pixelflinger."
2012-08-27 14:22:22 -07:00
The Android Automerger
df8ad93acc
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-27 06:35:07 -07:00
Jamie Gennis
d7c8fe6abb
Merge "Add an IMPL_DEFINED pixel format." into jb-mr1-dev
2012-08-24 11:11:32 -07:00
Stephen Hines
1182e61f76
Merge "Link directly with libm due to libpng dependency." into jb-mr1-dev
2012-08-23 17:50:15 -07:00
Stephen Hines
c60e6e7e58
Link directly with libm due to libpng dependency.
...
Change-Id: I9a9b8c3db025b8391b6a0e96ca24ed9cda3ab9a2
2012-08-23 15:17:09 -07:00
Wink Saville
f824ad7b35
am 582b1152: am baba9984: Merge "Define TCP buffer sizes for HSPAP, HSDPA, HSUPA and EVDO"
...
* commit '582b11527cd6d968f163fbee73f92d82b679e330':
Define TCP buffer sizes for HSPAP, HSDPA, HSUPA and EVDO
2012-08-23 14:11:35 -07:00
Jean-Baptiste Queru
2bf953a9ba
Merge "resolved conflicts for merge of a6405e9d to jb-mr1-dev" into jb-mr1-dev
2012-08-23 12:26:15 -07:00
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
The Android Automerger
23ab200c16
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-23 06:34:30 -07:00
Benoit Goby
d5fcafaf41
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 (; under
Windows) 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: I4e84d7621da956f66ff657245901bdaefead8395
2012-08-23 00:20:06 -07:00
Jeff Sharkey
42a1e6c9d8
Merge "Iteration on multi-user external storage." into jb-mr1-dev
2012-08-22 18:17:23 -07:00
Wink Saville
582b11527c
am baba9984: Merge "Define TCP buffer sizes for HSPAP, HSDPA, HSUPA and EVDO"
...
* commit 'baba99840400f5b835d44b6d91e2190136277988':
Define TCP buffer sizes for HSPAP, HSDPA, HSUPA and EVDO
2012-08-22 15:32:17 -07:00
Jeff Sharkey
f70c6da41e
Merge "Remove sdcard groups from services." into jb-mr1-dev
2012-08-22 15:00:30 -07:00
Wink Saville
baba998404
Merge "Define TCP buffer sizes for HSPAP, HSDPA, HSUPA and EVDO"
2012-08-22 15:00:00 -07:00
Brian Carlstrom
5e3d90c8be
Revert "Upgrade to dlmalloc 2.8.5."
...
This reverts commit 2d13791ce7 .
2012-08-22 14:57:54 -07:00
James Dong
8ccaed6a29
Merge "Don't give drmserver read permission to local storage" into jb-mr1-dev
2012-08-22 14:50:31 -07:00
Jamie Gennis
febe9d904f
Add an IMPL_DEFINED pixel format.
...
This change adds a new HAL pixel format that indicates that the specific format
is to be chosen by the gralloc implementation.
Change-Id: I326b5ec7347a20863b42119431ef1e4d22480fec
2012-08-22 14:44:51 -07:00
Jeff Sharkey
bfcd810b79
Iteration on multi-user external storage.
...
Define /storage as top-level concept, so that we enforce permissions
uniformly. Moves external storage paths from headers to per-device
environment variables. Added missing mount flags, and we no longer
have adb-specific external storage.
Bug: 6925012
Change-Id: Ic7ca953be2f552d3f0ec9e69f89fef751daa1b29
2012-08-22 14:28:37 -07:00
Brian Carlstrom
42b83c6df7
Revert "Upgrade to dlmalloc 2.8.5."
...
This reverts commit 2d13791ce7 .
2012-08-22 12:10:19 -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
The Android Automerger
6e648d9254
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-22 06:34:36 -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
The Android Automerger
c5a4eb547e
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-21 06:35:28 -07:00