openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
4,621 Commits 2 Branches 1 Tag 197 MiB
Commit Graph

4621 Commits

Author SHA1 Message Date
Jean-Baptiste Queru 13d71d332c am 2bf953a9: Merge "resolved conflicts for merge of a6405e9d to jb-mr1-dev" into jb-mr1-dev 
* commit '2bf953a9ba1949815f5022ae831e81061cb5c7e5':
  libcorkscrew: avoid future name collisions.
 2012-08-23 12:28:20 -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 63325c9109 am d5fcafaf: adb: Add public key authentification 
* commit 'd5fcafaf41f8ec90986c813f75ec78402096af2d':
  adb: Add public key authentification
 2012-08-23 00:35:02 -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 08f748a2f8 am 42a1e6c9: Merge "Iteration on multi-user external storage." into jb-mr1-dev 
* commit '42a1e6c9d827fc3d64ad3b0750b87de1f4c436e7':
  Iteration on multi-user external storage.
 2012-08-22 18:18:57 -07:00
Jeff Sharkey 42a1e6c9d8 Merge "Iteration on multi-user external storage." into jb-mr1-dev 2012-08-22 18:17:23 -07:00
The Android Open Source Project bd82e3293c Reconcile with jb-mr1-release - do not merge 
Change-Id: Ia5d484b16bf45e3a8481bf5c81864474749f964e
 2012-08-22 15:36:44 -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 ecee9934af am f70c6da4: Merge "Remove sdcard groups from services." into jb-mr1-dev 
* commit 'f70c6da41ef13146b85e1101d1e708cd35f81b78':
  Remove sdcard groups from services.
 2012-08-22 15:01:56 -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 86e21a1d24 am 8ccaed6a: Merge "Don\'t give drmserver read permission to local storage" into jb-mr1-dev 
* commit '8ccaed6a29d7371f614e94f28b68e476064fc959':
  Don't give drmserver read permission to local storage
 2012-08-22 14:52:08 -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 23f4ead81c am 42b83c6d: Revert "Upgrade to dlmalloc 2.8.5." 
* commit '42b83c6df7e4f65461a32a711d5dd4f46b9b85e0':
  Revert "Upgrade to dlmalloc 2.8.5."
 2012-08-22 13:55:09 -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 d5f149b3f5 am 984d3570: update libsync to support new timeout semantics 
* commit '984d35703d5c6738253193bd53da9dedb3b58243':
  update libsync to support new timeout semantics
 2012-08-21 19:11:04 -07:00
Erik Gilling 984d35703d update libsync to support new timeout semantics 
Change-Id: Ibedbd261bb96a84785c4e679b6fc4061287d5d7d
 2012-08-21 18:21:18 -07:00
The Android Open Source Project 161c1cc8ef Reconcile with jb-mr1-release - do not merge 
Change-Id: Ie51b5f85342674d507d7db2e7fb681f0f4088693
 2012-08-21 16:07:37 -07:00
Jean-Baptiste Queru 8fde167ba2 am 6302b420: am 487d6d3d: am 02fd2924: Merge "Fixed warnings test_zipfile" 
* commit '6302b420554724c1434e27e2cd46cb43f5fb7bca':
  Fixed warnings test_zipfile
 2012-08-21 09:13:12 -07:00
Jean-Baptiste Queru ba6d63e093 am a4ad7348: am 00f06911: am c6620cb3: Merge "Fixing unused param warnings in sync_test" 
* commit 'a4ad73480896c6bc7960331dcfca87a358cc5782':
  Fixing unused param warnings in sync_test
 2012-08-21 09:13:11 -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
Benoit Goby 3828994216 am 3fc95a99: Revert "adb: Add public key authentification" 
* commit '3fc95a991805feba257a396c13548776fd36f34f':
  Revert "adb: Add public key authentification"
 2012-08-21 00:48:32 -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 271add57ae am 300d6d65: Merge "adb: Add public key authentification" into jb-mr1-dev 
* commit '300d6d65d022c4a4663d097e5271eac745be6278':
  adb: Add public key authentification
 2012-08-20 20:30:26 -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 bc773686b1 am 17687079: am e05ac541: am 9d779bf1: Merge "Upgrade to dlmalloc 2.8.5." 
* commit '17687079519c9014ee6c5ad2d13c3163d40a02ce':
  Upgrade to dlmalloc 2.8.5.
 2012-08-20 17:06:32 -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 a0a46170f1 am 9dd0029a: Merge "Replace a segfault with a warning." into jb-mr1-dev 
* commit '9dd0029a05511d5e15c7fdb453b93f50d5b37d04':
  Replace a segfault with a warning.
 2012-08-20 16:49:40 -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 95ddeb0eb7 am a8b832a8: am 42900c30: am 0874aa0e: Merge "adb: Pick desired product value from command line it follows -p" 
* commit 'a8b832a89713dea6d1a82cfc8ecfa624c4fc5783':
  adb: Pick desired product value from command line it follows -p
 2012-08-20 14:53:05 -07:00
Jean-Baptiste Queru 81eecb1eb8 am 2ab69388: am 76080925: am 52d5dfc8: Merge "vmstat: Fix -n flag" 
* commit '2ab69388cb4e26855cc7a9f3584935b927a3659e':
  vmstat: Fix -n flag
 2012-08-20 14:53:04 -07:00
Jean-Baptiste Queru 66cb61c8ff am 93058924: am 1bcced2b: am c57689fc: Merge "add command-line arguments to mkbootimg to move kernel, ramdisk, etc." 
* commit '9305892464fc353702345eedcb2180f5e6fb27c0':
  add command-line arguments to mkbootimg to move kernel, ramdisk, etc.
 2012-08-20 14:53:03 -07:00