summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "New NativeDaemonConnector protocol adds a seqnum."Guang Zhu2012-02-076-59/+24
| | | | | | | | Reverting because it seems to break `adb reboot` This reverts commit dc58e73071aa829a5038caf37211f6b3e2d7b275. Change-Id: Ib8cc4379254694398cbb7f3e7a64c20e1ed8c1ba
* New NativeDaemonConnector protocol adds a seqnum.Robert Greenwalt2012-02-076-24/+59
| | | | | | | Allows for one socket to be multiplexed for multiple requests. bug:5864209 Change-Id: I934c88da25d95e093371f455442bdf2f0ed7a4f4
* Revert "Implement 'fastboot format' command"Anatol Pomazau2012-02-034-204/+5
| | | This reverts commit 230d160a718333651f7ca1557404f96682795b37
* Implement 'fastboot format' commandAnatol Pomazau2012-02-034-5/+204
| | | | | | | | | | | | | | | | | | Some filesystems (e.g. ext4) require flushing an initial fs image, right after erasing it the partition is unusable. Doing erase,flush emptyfs is a little bit scaring so we have a separate command that performs it as atomic step: - get size of partition - create an empty filesystem image - erase the partition - flush empty fs to the partition This command applicable only for ext4 filesystem and checks the partition type before formatting it. Change-Id: I8529bc1dc64237f1f0d91312f7c0ab1a6e5d8b44
* Merge "Revert "Implement 'fastboot format' command""Anatol Pomazau2012-02-034-157/+5
|\
| * Revert "Implement 'fastboot format' command"Anatol Pomazau2012-02-034-157/+5
| | | | | | This reverts commit 049dff53ef368bd84d0bddcb4c91f408774949c1
* | Merge "Implement 'fastboot format' command"Anatol Pomazau2012-02-034-5/+157
|\|
| * Implement 'fastboot format' commandAnatol Pomazau2012-01-254-5/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some filesystems (e.g. ext4) require flushing an initial fs image, right after erasing it the partition is unusable. Doing erase,flush emptyfs is a little bit scaring so we have a separate command that performs it as atomic step: - get size of partition - create an empty filesystem image - erase the partition - flush empty fs to the partition This command applicable only for ext4 filesystem and checks the partition type before formatting it. Change-Id: I8529bc1dc64698f1f0d91312f7c0ab1a6e5d8b44
* | am 4802f781: am 48aca55f: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
|\ \ | | | | | | | | | * commit '4802f78191f0056e184f0c62ffa682866e86decb':
| * \ am 48aca55f: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| |\ \ | | | | | | | | | | | | * commit '48aca55f665393d3389073d8b4299a6a30f41c6d':
| | * \ Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| | |\ \ | | | | | | | | | | | | | | | Change-Id: Ib960fbb7d51a45d540149e6a21d50c3e1d17dd3b
* | | \ \ Merge "Restrict zygote to system user."Nick Kralevich2012-01-311-1/+1
|\ \ \ \ \
| * | | | | Restrict zygote to system user.Nick Kralevich2012-01-271-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CVE-2011-3918: Address denial of service attack against Android's zygote process. This change enforces that only UID=system can directly connect to zygote to spawn processes. Change-Id: I89f5f05fa44ba8582920b66854df3e79527ae067
* | | | | am aee9fc1e: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-300-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | * commit 'aee9fc1e4a44004a2d0b76dcf4f33cb544d29189':
| * | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-300-0/+0
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | Change-Id: Ieaacd272ef768930f444735139215730b1c218b6
| | * | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-240-0/+0
| | |\ \ \ | | | |_|/ | | |/| |
* | | | | am 142e895a: am e83cd37e: am 0458d373: Merge "fastboot: set the language ↵Jean-Baptiste Queru2012-01-272-3/+5
|\| | | | | |_|_|/ |/| | | | | | | | | | | | | | | | | | | local string" * commit '142e895a1d5030a4e032f08fa5814ebd42b964b6': fastboot: set the language local string
| * | | am e83cd37e: am 0458d373: Merge "fastboot: set the language local string"Jean-Baptiste Queru2012-01-272-3/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'e83cd37e58b00fb6b9eb50464067864ca0cb2ff7': fastboot: set the language local string
| | * \ \ am 0458d373: Merge "fastboot: set the language local string"Jean-Baptiste Queru2012-01-272-3/+5
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '0458d373261d89979529853fa63cdd998b12e04a': fastboot: set the language local string
| | | * \ \ Merge "fastboot: set the language local string"Jean-Baptiste Queru2012-01-272-3/+5
| | | |\ \ \
| | | | * | | fastboot: set the language local stringmgross2012-01-232-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the language local string to 0x409 (English US / en-us) such that fastboot will successfully read the usb descriptor serial number string. The usbdevfs ioctl fails when the wIndex is not initialized with the local for the unicode of the usb descriptor string. usbdevfs is an obsolete interface and fastboot probably needs a re-write to use libusb like what is in adb. Change-Id: I3687f84643f53c736f14b3ae7793185d9b5cccc0 Signed-off-by: Mark D Horn <mark.d.horn@intel.com>
* | | | | | | am 0c054095: am 746f3243: Add USB vendor IDs for Quanta, INQ and Sony.Xavier Ducrohet2012-01-242-0/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0c05409510037fd7372c3fe7ab240ebf33b15831': Add USB vendor IDs for Quanta, INQ and Sony.
| * | | | | | am 746f3243: Add USB vendor IDs for Quanta, INQ and Sony.Xavier Ducrohet2012-01-242-0/+10
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | | * commit '746f3243f6d30ab51a36dcfea76eac3ba29ac625': Add USB vendor IDs for Quanta, INQ and Sony.
| | * | | | Add USB vendor IDs for Quanta, INQ and Sony.Xavier Ducrohet2012-01-242-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I224e067d9a64e8e9e7afbad0760a4b07f965bf83
* | | | | | am 70580b20: am 149ae11f: Merge "adb,fastboot: add USB support for Intel ↵Jean-Baptiste Queru2012-01-242-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vendor ID" * commit '70580b20bc8485002df0b3e89e42754c8c9796ff': adb,fastboot: add USB support for Intel Vendor ID
| * | | | | am 149ae11f: Merge "adb,fastboot: add USB support for Intel Vendor ID"Jean-Baptiste Queru2012-01-242-0/+4
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit '149ae11fb63818b470156e1652abfad0e08d486d': adb,fastboot: add USB support for Intel Vendor ID
| | * | | | Merge "adb,fastboot: add USB support for Intel Vendor ID"Jean-Baptiste Queru2012-01-242-0/+4
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | adb,fastboot: add USB support for Intel Vendor IDWu, Hao2012-01-172-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds Intel USB Vendor ID into the support list for adb and fastboot. Signed-off-by: Wu, Hao <hao.wu@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com>
* | | | | | Don't statically compile run-asNick Kralevich2012-01-232-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5904033 Change-Id: Ie815f09a2bf51ad583ded82f652d162a7f70b87e
* | | | | | am 546dc10c: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '546dc10c1a7c6fb348507899d3629af01b4e4c43':
| * | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-200-0/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | Change-Id: Ica26c90c34d9665dfd68e404893a306d43aface3
| | * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-190-0/+0
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
* | | | | | am 56acfe35: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '56acfe3504249002cb46ab2fe06d420884034444':
| * | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-190-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | Change-Id: I7d6cd74bf255c517d04c5900a38145571297f66d
| | * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-130-0/+0
| | |\ \ \ \
| | | * \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-120-0/+0
| | | |\ \ \ \
* | | | | | | | am daafb531: am 4779e934: Add Intel\'s vendor ID to adbAndrew Hsieh2012-01-201-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'daafb531484a35a63e229e14d8a81b412e506670': Add Intel's vendor ID to adb
| * | | | | | | am 4779e934: Add Intel\'s vendor ID to adbAndrew Hsieh2012-01-191-1/+3
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '4779e9344bb62208e4772ff6486b6df564f434b8': Add Intel's vendor ID to adb
| | * | | | | | Add Intel's vendor ID to adbAndrew Hsieh2012-01-181-1/+3
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I81da3ea11bfd44395f6895fe51e477ff1e7fa25b
* | | | | | | am abffc7f7: (-s ours) am fa7860a2: Merge changes ↵Jean-Baptiste Queru2012-01-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Iff15ac5e,I52fce957,I6c2a1d56,I929ea38b,Ia0476219,Ia9a357de,Ifb82ae2c * commit 'abffc7f7a8c61a4e0202e9398e4d1565408a1ada': Rename LOG_ASSERT to ALOG_ASSERT Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) Rename (IF_)LOG() to (IF_)ALOG()
| * | | | | | am fa7860a2: Merge changes ↵Jean-Baptiste Queru2012-01-1855-507/+563
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Iff15ac5e,I52fce957,I6c2a1d56,I929ea38b,Ia0476219,Ia9a357de,Ifb82ae2c * commit 'fa7860a27ff79b5697ac059c4bedc4f7445500af': Rename LOG_ASSERT to ALOG_ASSERT Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) Rename (IF_)LOG() to (IF_)ALOG()
| | * | | | | Merge changes ↵Jean-Baptiste Queru2012-01-1855-507/+563
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Iff15ac5e,I52fce957,I6c2a1d56,I929ea38b,Ia0476219,Ia9a357de,Ifb82ae2c * changes: Rename LOG_ASSERT to ALOG_ASSERT Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) Rename (IF_)LOG() to (IF_)ALOG()
| | | * | | | Rename LOG_ASSERT to ALOG_ASSERTSteve Block2012-01-172-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iff15ac5e7ab226d437c08d23f18fd54e6793e65c
| | | * | | | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)Steve Block2012-01-1737-174/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I52fce957db06c281e2618daa4e2ecba19974f2eb
| | | * | | | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)Steve Block2012-01-1726-102/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6c2a1d56dadb7e5c69e478f4d8c7d9f2127db2af
| | | * | | | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)Steve Block2012-01-1715-39/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I929ea38bc6fe6efeefa7870c8e7e4c19cd0029b3
| | | * | | | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)Steve Block2012-01-1722-131/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia0476219b71ece949595515ee07ea072ed349d73
| | | * | | | Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)Steve Block2012-01-177-36/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia9a357dec5ad12eea93fd03401a3b02b38e4e94f
| | | * | | | Rename (IF_)LOG() to (IF_)ALOG()Steve Block2012-01-172-29/+37
| | |/ / / / | | | | | | | | | | | | | | | | | | Change-Id: Ifb82ae2c242becaffa3cf19e548b526e6616c2c7
* | | | | | Merge "Use audio_format_t consistently"Glenn Kasten2012-01-201-3/+3
|\ \ \ \ \ \