summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* File-system utilities for installd and zygote.Jeff Sharkey2012-08-305-6/+192
| | | | | Bug: 7008879 Change-Id: Ia54b8d4ad434e8973f235e2a4728651814bef8a9
* Merge "Revert "Revert "Upgrade to dlmalloc 2.8.5.""" into jb-mr1-devIan Rogers2012-08-296-448/+80
|\
| * Revert "Revert "Upgrade to dlmalloc 2.8.5.""Ian Rogers2012-08-286-448/+80
| | | | | | | | This reverts commit 42b83c6df7e4f65461a32a711d5dd4f46b9b85e0.
* | am e3524293: am af03b050: Merge "Export flags needed for ↵Wink Saville2012-08-280-0/+0
|\ \ | |/ |/| | | | | | | | | ifc_reset_connections API in netutils" * commit 'e3524293da5d7503dddb00911b9e5b37e9417981': Export flags needed for ifc_reset_connections API in netutils
| * am af03b050: Merge "Export flags needed for ifc_reset_connections API in ↵Wink Saville2012-08-282-4/+3
| |\ | | | | | | | | | | | | | | | | | | netutils" * commit 'af03b05009863f5d9761864dcec13e4ee6221d69': Export flags needed for ifc_reset_connections API in netutils
| | * Merge "Export flags needed for ifc_reset_connections API in netutils"Wink Saville2012-08-282-4/+3
| | |\
| | | * Export flags needed for ifc_reset_connections API in netutilsAlex Yakavenka2012-08-152-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Code using ifc_reset_connections api needs to have access to predefined masks for reset_mask parameter Change-Id: I90bc5e1b62ae4a88501c8ad4e353c0d93d319579
* | | | Merge "import init.${ro.hardware}.rc last to allow overriding default USB ↵Mike Lockwood2012-08-281-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | configuration" into jb-mr1-dev
| * | | | import init.${ro.hardware}.rc last to allow overriding default USB configurationMike Lockwood2012-08-281-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I2194466fb7cf7ff5313d146601155ebe6043fd42
* | | | | am 7995b841: am c3c5358b: Merge "Add MIPS support to pixelflinger."Jean-Baptiste Queru2012-08-2719-182/+3970
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | * commit '7995b841483fc45cc762d7dab8a8817a6d97492b': Add MIPS support to pixelflinger.
| * | | am c3c5358b: Merge "Add MIPS support to pixelflinger."Jean-Baptiste Queru2012-08-2719-182/+3970
| |\| | | | | | | | | | | | | | | | | | * commit 'c3c5358b94f48799fd595c829ce223b43588bac1': Add MIPS support to pixelflinger.
| | * | Merge "Add MIPS support to pixelflinger."Jean-Baptiste Queru2012-08-2719-182/+3970
| | |\ \
| | | * | Add MIPS support to pixelflinger.Paul Lind2012-08-1319-182/+3970
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See the comment-block at the top of MIPSAssembler.cpp for implementation overview. Change-Id: Id492c10610574af8c89c38d19e12fafc3652c28a
* | | | | Merge "Add an IMPL_DEFINED pixel format." into jb-mr1-devJamie Gennis2012-08-241-0/+16
|\ \ \ \ \
| * | | | | Add an IMPL_DEFINED pixel format.Jamie Gennis2012-08-221-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "Link directly with libm due to libpng dependency." into jb-mr1-devStephen Hines2012-08-231-1/+1
|\ \ \ \ \ \
| * | | | | | Link directly with libm due to libpng dependency.Stephen Hines2012-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9a9b8c3db025b8391b6a0e96ca24ed9cda3ab9a2
* | | | | | | am 582b1152: am baba9984: Merge "Define TCP buffer sizes for HSPAP, HSDPA, ↵Wink Saville2012-08-231-0/+4
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HSUPA and EVDO" * commit '582b11527cd6d968f163fbee73f92d82b679e330': Define TCP buffer sizes for HSPAP, HSDPA, HSUPA and EVDO
| * | | | | | am baba9984: Merge "Define TCP buffer sizes for HSPAP, HSDPA, HSUPA and EVDO"Wink Saville2012-08-221-0/+4
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | * commit 'baba99840400f5b835d44b6d91e2190136277988': Define TCP buffer sizes for HSPAP, HSDPA, HSUPA and EVDO
| | * | | | | Merge "Define TCP buffer sizes for HSPAP, HSDPA, HSUPA and EVDO"Wink Saville2012-08-221-0/+4
| | |\ \ \ \ \
| | | * | | | | Define TCP buffer sizes for HSPAP, HSDPA, HSUPA and EVDONaveen Kalla2012-07-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0fbd76aca69059917d363b2dcbfc843bbf4386f8
* | | | | | | | Merge "resolved conflicts for merge of a6405e9d to jb-mr1-dev" into jb-mr1-devJean-Baptiste Queru2012-08-232-19/+57
|\ \ \ \ \ \ \ \
| * | | | | | | | resolved conflicts for merge of a6405e9d to jb-mr1-devJean-Baptiste Queru2012-08-232-19/+57
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2c698ec017f29c9ccc89231439cb6c8013914009
| | * | | | | | | am db56bb4a: Merge "libcorkscrew: avoid future name collisions."Jean-Baptiste Queru2012-08-222-38/+46
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'db56bb4aebb2aaa63cf33c2f9868a22ea655b38e': libcorkscrew: avoid future name collisions.
| | | * | | | | | Merge "libcorkscrew: avoid future name collisions."Jean-Baptiste Queru2012-08-222-38/+46
| | | |\ \ \ \ \ \
| | | | * | | | | | libcorkscrew: avoid future name collisions.David 'Digit' Turner2012-07-132-38/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a forward-compatibility patch used to avoid two problems: 1/ The C library <signal.h> is going to be updated to define 'struct sigcontext' properly soon. Avoid redefining this structure here when it's not really needed to prevent a type conflict. 2/ Similarly, proper ucontext_t support is going to be added, prevent conflict by using a macro renaming trick. Mainly because there is a slight chance that the C library definition will follow a slightly different layout/naming. For context, see details at: http://code.google.com/p/android/issues/detail?id=34784 https://android-review.googlesource.com/#/c/38875/1 Change-Id: Ie94eb5d77297f8e0bafd146b65a648bd8805a551
* | | | | | | | | | adb: Add public key authentificationBenoit Goby2012-08-238-22/+882
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-25 04:40:43 +0000