summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Iteration on multi-user external storage." into jb-mr1-devJeff Sharkey2012-08-224-14/+8
|\
| * Iteration on multi-user external storage.Jeff Sharkey2012-08-224-14/+8
| | | | | | | | | | | | | | | | | | | | 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
* | Merge "Remove sdcard groups from services." into jb-mr1-devJeff Sharkey2012-08-221-1/+1
|\ \
| * | Remove sdcard groups from services.Jeff Sharkey2012-08-201-2/+2
| | | | | | | | | | | | | | | | | | Even with the groups, services no longer have access. Change-Id: I2b4871b276ffd309c08c404b1211b33406dbebd5
* | | Merge "Don't give drmserver read permission to local storage" into jb-mr1-devJames Dong2012-08-221-1/+1
|\ \ \
| * | | Don't give drmserver read permission to local storageJames Dong2012-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | o related-to-bug: 6426185 Change-Id: Ibacd9210d10f95e3b5586dfa671c0b32d24f47de
* | | | Revert "Upgrade to dlmalloc 2.8.5."Brian Carlstrom2012-08-226-80/+448
| | | | | | | | | | | | | | | | This reverts commit 2d13791ce7ff61221ca047553891f31a23b2e943.
* | | | update libsync to support new timeout semanticsErik Gilling2012-08-212-3/+3
| |_|/ |/| | | | | | | | Change-Id: Ibedbd261bb96a84785c4e679b6fc4061287d5d7d
* | | am 487d6d3d: am 02fd2924: Merge "Fixed warnings test_zipfile"Jean-Baptiste Queru2012-08-211-1/+3
|\ \ \ | | | | | | | | | | | | | | | | * commit '487d6d3db3f504b0120fc605ad3a4155ca214674': Fixed warnings test_zipfile
| * \ \ am 02fd2924: Merge "Fixed warnings test_zipfile"Jean-Baptiste Queru2012-08-211-1/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '02fd29246ab54ee4a0f8fa6358498070e54e5fd0': Fixed warnings test_zipfile
| | * \ \ Merge "Fixed warnings test_zipfile"Jean-Baptiste Queru2012-08-211-1/+3
| | |\ \ \
| | | * | | Fixed warnings test_zipfileAriel Bernal2012-08-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | am 00f06911: am c6620cb3: Merge "Fixing unused param warnings in sync_test"Jean-Baptiste Queru2012-08-211-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '00f0691107dfde589bd23a7d079b4e05998833b0': Fixing unused param warnings in sync_test
| * | | | | am c6620cb3: Merge "Fixing unused param warnings in sync_test"Jean-Baptiste Queru2012-08-211-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'c6620cb3a37e98ceb89f5d11305038786af76650': Fixing unused param warnings in sync_test
| | * | | | Merge "Fixing unused param warnings in sync_test"Jean-Baptiste Queru2012-08-211-1/+1
| | |\ \ \ \
| | | * | | | Fixing unused param warnings in sync_testEdwin Vane2012-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia37a0118397ddece376bfbad7627d83263c1993f Author: Edwin Vane <edwin.vane@intel.com> Reviewed-by: Kevin P Schoedel <kevin.p.schoedel@intel.com>
* | | | | | | Revert "adb: Add public key authentification"Benoit Goby2012-08-207-875/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f4ed516643ee8ed3a59ad1a8048f7ce5f47f93fb.
* | | | | | | Merge "adb: Add public key authentification" into jb-mr1-devBenoit Goby2012-08-207-18/+875
|\ \ \ \ \ \ \
| * | | | | | | adb: Add public key authentificationBenoit Goby2012-08-167-18/+875
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | am e05ac541: am 9d779bf1: Merge "Upgrade to dlmalloc 2.8.5."Brian Carlstrom2012-08-206-448/+80
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit 'e05ac5415e861dee6a3f175c8066ff577736ba1f': Upgrade to dlmalloc 2.8.5.
| * | | | | | | am 9d779bf1: Merge "Upgrade to dlmalloc 2.8.5."Brian Carlstrom2012-08-206-448/+80
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '9d779bf1ea587dc70b74fd1f8798894a8695e78b': Upgrade to dlmalloc 2.8.5.
| | * | | | | | Merge "Upgrade to dlmalloc 2.8.5."Brian Carlstrom2012-08-206-448/+80
| | |\ \ \ \ \ \
| | | * | | | | | Upgrade to dlmalloc 2.8.5.Ian Rogers2012-08-206-448/+80
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge "Replace a segfault with a warning." into jb-mr1-devJohn Grossman2012-08-201-1/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Replace a segfault with a warning.John Grossman2012-08-201-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | am 42900c30: am 0874aa0e: Merge "adb: Pick desired product value from ↵Jean-Baptiste Queru2012-08-201-1/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | command line it follows -p" * commit '42900c30cf39ea4cdc41cc3671584b7f4f39b8bc': adb: Pick desired product value from command line it follows -p
| * | | | | | | | am 0874aa0e: Merge "adb: Pick desired product value from command line it ↵Jean-Baptiste Queru2012-08-201-1/+1
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | follows -p" * commit '0874aa0ec4f413a77a610133c904c2590a2e3ccd': adb: Pick desired product value from command line it follows -p
| | * | | | | | | Merge "adb: Pick desired product value from command line it follows -p"Jean-Baptiste Queru2012-08-201-1/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | adb: Pick desired product value from command line it follows -pVairavan Srinivasan2012-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic9fb74c99c88479addf3a2cc599b8492ced759d8
* | | | | | | | | | am 76080925: am 52d5dfc8: Merge "vmstat: Fix -n flag"Jean-Baptiste Queru2012-08-201-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '76080925410db41cfa5c70ffcffaa2b3b4d59aad': vmstat: Fix -n flag
| * | | | | | | | | am 52d5dfc8: Merge "vmstat: Fix -n flag"Jean-Baptiste Queru2012-08-201-2/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '52d5dfc8d30890734ee7122c3139f8637e196a1c': vmstat: Fix -n flag
| | * | | | | | | | Merge "vmstat: Fix -n flag"Jean-Baptiste Queru2012-08-201-2/+2
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | vmstat: Fix -n flagArun Raghavan2012-07-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The loop condition for the number of iterations basically caused the argument to -n to be ignored. This fixes the condition appropriately.
* | | | | | | | | | | am 1bcced2b: am c57689fc: Merge "add command-line arguments to mkbootimg to ↵Jean-Baptiste Queru2012-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | / / / / / / | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | move kernel, ramdisk, etc." * commit '1bcced2bb67a4024035d5303d953c793b857f275': add command-line arguments to mkbootimg to move kernel, ramdisk, etc.
| * | | | | | | | | am c57689fc: Merge "add command-line arguments to mkbootimg to move kernel, ↵Jean-Baptiste Queru2012-08-201-11/+18
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ramdisk, etc." * commit 'c57689fc7ccadee4f852ad62ac1010e53382a67c': add command-line arguments to mkbootimg to move kernel, ramdisk, etc.
| | * | | | | | | | Merge "add command-line arguments to mkbootimg to move kernel, ramdisk, etc."Jean-Baptiste Queru2012-08-201-11/+18
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | | * | | | | | | add command-line arguments to mkbootimg to move kernel, ramdisk, etc.Doug Zongker2012-08-201-11/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6918260 Change-Id: I5d4af6314fded027952941110a520dc9aa234a14
* | | | | | | | | | Merge "Migrate sdcard0 to shell-accessible location." into jb-mr1-devJeff Brown2012-08-203-22/+7
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Migrate sdcard0 to shell-accessible location.Jeff Sharkey2012-08-203-22/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | am 94938c9d: am ed2e672f: Merge "Print strerror for file read errors during ↵Jean-Baptiste Queru2012-08-201-8/+11
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flashing" * commit '94938c9d60d6467ec40df4254beadc50bb787934': Print strerror for file read errors during flashing
| * | | | | | | | | am ed2e672f: Merge "Print strerror for file read errors during flashing"Jean-Baptiste Queru2012-08-201-8/+11
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ed2e672f3b929ac49617de11e6530c812b082eb6': Print strerror for file read errors during flashing
| | * | | | | | | | Merge "Print strerror for file read errors during flashing"Jean-Baptiste Queru2012-08-201-8/+11
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Print strerror for file read errors during flashingMatt Gumbel2012-07-261-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7390867abd00036f19eb4d1a1ce23aa0aca50674 Signed-off-by: Matt Gumbel <matthew.k.gumbel@intel.com> Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
* | | | | | | | | | | am 3af04b71: am 7c386a61: Merge "Extend and document the "wait" command"Jean-Baptiste Queru2012-08-202-2/+9
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3af04b71e51e89af02a1fe526e4fc32dce0100d3': Extend and document the "wait" command
| * | | | | | | | | | am 7c386a61: Merge "Extend and document the "wait" command"Jean-Baptiste Queru2012-08-202-2/+9
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7c386a610d9164c12932452d1ff671e070956ec1': Extend and document the "wait" command
| | * | | | | | | | | Merge "Extend and document the "wait" command"Jean-Baptiste Queru2012-08-202-2/+9
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Extend and document the "wait" commandPatrick McCormick2012-07-242-2/+9
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The wait command was currently implemented but undocumented and only used internally. This change adds a second option toi (optionally) override the default timeout of 5 seconds. The wait command can be used to wait for a file to appear during the boot process, for example a disk or other device, and is a better alternative than an unconditional sleep. Change-Id: Ia11d8419c0ea84deec0e1bf5adfca5bc76ff38b7 Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
* | | | | | | | | | | am cd82a6fe: am 36b1399d: Merge "diskconfig: Add missing include for loff_t"Jean-Baptiste Queru2012-08-201-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | / / / / / / / | |_|_|/ / / / / / / |/| | | | | | | | | * commit 'cd82a6fea05d1fa06cb0ac56d2dbb27b013b8eaa': diskconfig: Add missing include for loff_t
| * | | | | | | | | am 36b1399d: Merge "diskconfig: Add missing include for loff_t"Jean-Baptiste Queru2012-08-201-0/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36b1399d8cee09d4ffde3bf958322ab9556b8ebe': diskconfig: Add missing include for loff_t
| | * | | | | | | | Merge "diskconfig: Add missing include for loff_t"Jean-Baptiste Queru2012-08-201-0/+1
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
generated by cgit v1.1 at 2025-02-04 16:10:17 +0000