Commit Graph

4621 Commits

Author SHA1 Message Date
Jeff Sharkey 707b2582b3 Bring back ADB_EXTERNAL_STORAGE.
Bug: 7119408
Change-Id: Ic9a23fb6adfb1db771e1e278179586bca69a5edd
2012-09-06 14:32:33 -07:00
Jeff Sharkey 58d3980f31 Keep /mnt/secure private to default namespace.
When vold mounts things in /mnt/secure/staging, it expects to MS_MOVE
those mountpoints when vetting is finished.  However, the kernel
doesn't allow MS_MOVE when the source is shared to child namespaces.

To work around this, create a tmpfs at /mnt/secure and mark it as
private (not shared).  Verified that vold can now successfully move
from the staging area.

Bug: 7094858
Change-Id: I5e05b1005c63efa277935c9bbd18cbf3ffdd47a3
2012-09-06 14:15:46 -07:00
Jeff Sharkey 2121219cfd am d8a8979b: Merge "Bring back ADB_EXTERNAL_STORAGE." into jb-mr1-dev
* commit 'd8a8979bd932a73378286ecea6a03c7fa8e1b2a6':
  Bring back ADB_EXTERNAL_STORAGE.
2012-09-06 13:10:27 -07:00
Jeff Sharkey d8a8979bd9 Merge "Bring back ADB_EXTERNAL_STORAGE." into jb-mr1-dev 2012-09-06 13:08:37 -07:00
Jeff Sharkey d6d4286a28 Bring back ADB_EXTERNAL_STORAGE.
Bug: 7119408
Change-Id: Ic9a23fb6adfb1db771e1e278179586bca69a5edd
2012-09-06 13:05:40 -07:00
The Android Open Source Project 446cc5b6d8 am 83e3842f: am 7908a68e: (-s ours) Reconcile with jb-release - do not merge
* commit '83e3842f4efc2647752d85af81869034dda985f6':
2012-09-06 09:11:08 -07:00
The Android Open Source Project 83e3842f4e am 7908a68e: (-s ours) Reconcile with jb-release - do not merge
* commit '7908a68e7041459c383513a67fbda8da1bba3177':
2012-09-06 08:31:24 -07:00
The Android Open Source Project 7908a68e70 Reconcile with jb-release - do not merge
Change-Id: I74a36d0a79723c656b50f36c1d96042e50a0c943
2012-09-06 08:09:33 -07:00
The Android Open Source Project 75ad343277 Reconcile with jb-mr1-release - do not merge
Change-Id: I6aeeecadf25294eb804a03b572cace327c6709e1
2012-09-06 07:55:17 -07:00
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 1098fa7d49 am 96535ba6: Dist fastboot and adb for the sdk build.
* commit '96535ba62044c712f8b017fe569f598a7a2934c2':
  Dist fastboot and adb for the sdk build.
2012-09-05 10:38:13 -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
Benoit Goby 5548fed13b am 345ca131: adb: Link statically with libcrypto
* commit '345ca131bbc17b1ae1073db04f37f6610ccb4c71':
  adb: Link statically with libcrypto
2012-09-04 14:26:56 -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 07f6564551 am 59680145: Merge "adb: Create private key with 0600 mode" into jb-mr1-dev
* commit '59680145c85522e8b4b8cc928a48e105d966a44b':
  adb: Create private key with 0600 mode
2012-08-31 14:43:14 -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 028791fcb2 am 9685194f: File-system utilities for installd and zygote.
* commit '9685194fc94510a33201aee9b80c23f206ccfe67':
  File-system utilities for installd and zygote.
2012-08-30 10:35:34 -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
Colin Cross c7b75dcc1a fastboot: move help command before usb connect
Move the help command handling before the call to open_device
so that is doesn't block when no device is connected.

Bug: 7078873
Change-Id: I4e9a4317bd72b4ceb4b9fc838eafd2e57b17a473
2012-08-29 18:21:06 -07:00
Ian Rogers 04b5ac36a5 Remove unnecessary compiler pragma.
With dlmalloc 2.8.6 the compiler pragmas to suppress warnings are not
necessary.
Also fix compiler warning about redefinition of LOG_TAG.

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

Change-Id: I50f70be31f4bd994b09083e722759464476c70b3
2012-08-29 18:13:14 -07:00
The Android Automerger c4e7e976ff merge in jb-release history after reset to jb-dev 2012-08-29 14:29:55 -07:00
The Android Automerger 98a7c86bb0 merge in jb-release history after reset to jb-dev 2012-08-29 12:43:13 -07:00
Ian Rogers 117af5f206 am 84ac402f: Merge "Revert "Revert "Upgrade to dlmalloc 2.8.5.""" into jb-mr1-dev
* commit '84ac402fa1860817ed100d189b0613f8c4b0ef2a':
  Revert "Revert "Upgrade to dlmalloc 2.8.5.""
2012-08-29 08:56: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 1c9991d894 am 5c9da7b6: am e3524293: am af03b050: Merge "Export flags needed for ifc_reset_connections API in netutils"
* commit '5c9da7b65ca32f4268cafeef198f173abb33ec46':
  import init.${ro.hardware}.rc last to allow overriding default USB configuration
  Export flags needed for ifc_reset_connections API in netutils
2012-08-28 19:57:08 -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 3969115dd8 am 8bbc8a28: am 7995b841: am c3c5358b: Merge "Add MIPS support to pixelflinger."
* commit '8bbc8a2884b11ff4693be72756a90f86b122058d':
  Add MIPS support to pixelflinger.
2012-08-27 15:22:58 -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
The Android Open Source Project 7ec136557b Reconcile with jb-mr1-release - do not merge
Change-Id: Ib703906e995f252a62d61912627b584f4ad24e63
2012-08-25 07:18:05 -07:00
Jamie Gennis 1781c1eec9 am d7c8fe6a: Merge "Add an IMPL_DEFINED pixel format." into jb-mr1-dev
* commit 'd7c8fe6abbf03157242ae104a7aedabf15791da0':
  Add an IMPL_DEFINED pixel format.
2012-08-24 11:13:33 -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 c445e6e90b am 1182e61f: Merge "Link directly with libm due to libpng dependency." into jb-mr1-dev
* commit '1182e61f76f3adf79d82622697ba07a267f4cf71':
  Link directly with libm due to libpng dependency.
2012-08-23 17:51:56 -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 258114b489 am f824ad7b: am 582b1152: am baba9984: Merge "Define TCP buffer sizes for HSPAP, HSDPA, HSUPA and EVDO"
* commit 'f824ad7b35c3bf866d60662404be0d55fe753e3d':
  Define TCP buffer sizes for HSPAP, HSDPA, HSUPA and EVDO
2012-08-23 14:14: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