summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Set ATRACE_ENABLE() to '0' if not availbleTobias Grosser2013-06-171-1/+1
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Change-Id: Iec61d275cd7b2be65f828c282f97cc59adf4cc0b
* | | | | | | am 44d1f3c7: am 99c1a416: resolved conflicts for merge of 95a41f6b to ↵Colin Cross2013-06-170-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master * commit '44d1f3c703015b065f009604907033aac8bedf32': init: fix copying boot properties toolbox: hide property implementation from watchprops init: verify size of property buffers passed to property_get init: move the system property writer implementation init: switch property_get to use __system_property_get
| * | | | | | am 99c1a416: resolved conflicts for merge of 95a41f6b to stage-aosp-masterColin Cross2013-06-176-105/+74
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '99c1a4168ba792437f298d31cd4631ff01661476': init: fix copying boot properties toolbox: hide property implementation from watchprops init: verify size of property buffers passed to property_get init: move the system property writer implementation init: switch property_get to use __system_property_get
| | * | | | | resolved conflicts for merge of 95a41f6b to stage-aosp-masterColin Cross2013-06-176-105/+74
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | Change-Id: Icfae29edf989fb43a7f0b8bda188a9807f76a3b9
| | | * | | | Merge changes Ia7b337e1,I7a2d8aa5,Iacc2b42b,Idf6100d1,If3fba2ccColin Cross2013-06-186-107/+76
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: init: fix copying boot properties toolbox: hide property implementation from watchprops init: verify size of property buffers passed to property_get init: move the system property writer implementation init: switch property_get to use __system_property_get
| | | | * | | | init: fix copying boot propertiesColin Cross2013-06-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous patch "init: verify size of property buffers passed to property_get" incorrectly modified one of the callers, resulting in ro.serialno, ro.bootmode, ro.baseband, and ro.bootloader always being set to their default values. Bug: 9469860 (cherry picked from commit 67e3663fc93c65b69b5d121db05b0833b98d97f1) Change-Id: Ia7b337e1fab6e334729f47ee1269e6c736615177
| | | | * | | | toolbox: hide property implementation from watchpropsColin Cross2013-06-171-17/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 91779634debc79bc75d3df4e0f59d964ad4f5f78) Change-Id: I7a2d8aa507ac61cedc5f67c563531a7d4ec8e4c2
| | | | * | | | init: verify size of property buffers passed to property_getColin Cross2013-06-172-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Verify that the buffer passed as the value parameter to property_get is always big enough. (cherry picked from commit 88ac54a4e8d2a63e4fd9c465e115795ace316776) Change-Id: Iacc2b42bfe4069e0bfcbb1c48474f30126a93139
| | | | * | | | init: move the system property writer implementationColin Cross2013-06-171-51/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the system property writer implementation into bionic to keep it next to the reader implementation and allow for better testing. (cherry picked from commit 9f5af635010a7ba92edf1fca543f7271cc9d75c8) Change-Id: Idf6100d1d0170751acd5163a22597912bff480f0
| | | | * | | | init: switch property_get to use __system_property_getColin Cross2013-06-175-39/+34
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 2deedfe0b1ac86ebd62d19cf7da9e7dcb508ab09) Change-Id: If3fba2cc1dd5c167b0924ddfe42dbe2e6387208a
* | | | | | | init: fix copying boot propertiesColin Cross2013-06-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous patch "init: verify size of property buffers passed to property_get" incorrectly modified one of the callers, resulting in ro.serialno, ro.bootmode, ro.baseband, and ro.bootloader always being set to their default values. Bug: 9469860 Change-Id: Id45bd8dd657e8d61f4cfaf7e6b2559d2bfd05181
* | | | | | | Merge changes Ia6609116,Ie5b6fcd9,I9026e604,I4fc0502aColin Cross2013-06-176-105/+72
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: toolbox: hide property implementation from watchprops init: verify size of property buffers passed to property_get init: move the system property writer implementation init: switch property_get to use __system_property_get
| * | | | | | | toolbox: hide property implementation from watchpropsColin Cross2013-06-171-17/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia6609116d641d3354971ca40a16ffcab38484150
| * | | | | | | init: verify size of property buffers passed to property_getColin Cross2013-06-172-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Verify that the buffer passed as the value parameter to property_get is always big enough. Change-Id: Ie5b6fcd94bb908215cfd55d0c9b07f717ddb70b1
| * | | | | | | init: move the system property writer implementationColin Cross2013-06-171-51/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the system property writer implementation into bionic to keep it next to the reader implementation and allow for better testing. Change-Id: I9026e604109e30546b2849b60cab2e7e5ff00ba5
| * | | | | | | init: switch property_get to use __system_property_getColin Cross2013-06-175-37/+32
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Change-Id: I4fc0502a1a5b331087618a4d2e3d90948743d7bd
* | | | | | | am 88411498: am 520f4f06: am 865bb05d: Merge "adb: fix reported transfer ↵Elliott Hughes2013-06-171-3/+3
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | size for transfer over 4 GiB" * commit '88411498b3341dbf8f2976991524b1e21dedc6f6': adb: fix reported transfer size for transfer over 4 GiB
| * | | | | | am 520f4f06: am 865bb05d: Merge "adb: fix reported transfer size for ↵Elliott Hughes2013-06-171-3/+3
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transfer over 4 GiB" * commit '520f4f060325496741f600692f3582536fa43a8f': adb: fix reported transfer size for transfer over 4 GiB
| | * | | | | am 865bb05d: Merge "adb: fix reported transfer size for transfer over 4 GiB"Elliott Hughes2013-06-171-3/+3
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | * commit '865bb05dd0db1531f252de5e137605beec171ca2': adb: fix reported transfer size for transfer over 4 GiB
| | | * | | | Merge "adb: fix reported transfer size for transfer over 4 GiB"Elliott Hughes2013-06-171-3/+3
| | | |\ \ \ \
| | | | * | | | adb: fix reported transfer size for transfer over 4 GiBJeff Smith2013-06-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When transferring files over 4 GiB with adb, the size of the transfer is misreported. Change-Id: Ia3d4cae1e9f82b4f7432341820b101ea9a44f85b Signed-off-by: Jeff Smith <whydoubt@gmail.com>
* | | | | | | | am 1aeefcd6: am 0173ebd5: am 5f8d9c01: Merge "adb: add vendor ID\'s for ↵Elliott Hughes2013-06-171-0/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Nook, Haier, Hisense, and MTK" * commit '1aeefcd6900d85911028e6d3e344e338e0a05158': adb: add vendor ID's for Nook, Haier, Hisense, and MTK
| * | | | | | am 0173ebd5: am 5f8d9c01: Merge "adb: add vendor ID\'s for Nook, Haier, ↵Elliott Hughes2013-06-171-0/+12
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hisense, and MTK" * commit '0173ebd531b2b443b56d1c12d598f2f89c95fb0a': adb: add vendor ID's for Nook, Haier, Hisense, and MTK
| | * | | | | am 5f8d9c01: Merge "adb: add vendor ID\'s for Nook, Haier, Hisense, and MTK"Elliott Hughes2013-06-171-0/+12
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '5f8d9c012cf28fad57d0896b938b05e2c976073f': adb: add vendor ID's for Nook, Haier, Hisense, and MTK
| | | * | | | Merge "adb: add vendor ID's for Nook, Haier, Hisense, and MTK"Elliott Hughes2013-06-171-0/+12
| | | |\ \ \ \
| | | | * | | | adb: add vendor ID's for Nook, Haier, Hisense, and MTKJeff Smith2013-06-171-0/+12
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I156ff750ef9ae66113d1e0e3ceffea047abc03b9 Signed-off-by: Jeff Smith <whydoubt@gmail.com>
* | | | | | | am 0c3de6af: (-s ours) Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-06-160-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | * commit '0c3de6aff3cceb6e041a46a12e596b8e8819aa15':
| * | | | | | Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-06-160-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4ec0a42f3e59ad0bc4d26ca2b1132ec55ce6fa6d
| | * \ \ \ \ \ merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-06-160-0/+0
| | |\ \ \ \ \ \
* | | \ \ \ \ \ \ am 05a52055: am 76c58893: Free file handle for /firmware/image after useAjay Dudani2013-06-141-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '05a52055661701c20f71124161798fdea8ea2982': Free file handle for /firmware/image after use
| * | | | | | | | am 76c58893: Free file handle for /firmware/image after useAjay Dudani2013-06-141-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | / / / / / | | |_|/ / / / / | |/| | | | | | * commit '76c5889325c2ada5dda07fd9af20a4a485978538': Free file handle for /firmware/image after use
| | * | | | | | Free file handle for /firmware/image after useAjay Dudani2013-06-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id59e25486b45dffc87a89a961970a6e8128a5237
* | | | | | | | am 890f37da: am c620f095: Merge "init: prevent action being added to the ↵Colin Cross2013-06-130-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | action_queue twice" * commit '890f37da1050916a8dc470b25f9e1d0e7712464d': init: prevent action being added to the action_queue twice
| * | | | | | | am c620f095: Merge "init: prevent action being added to the action_queue twice"Colin Cross2013-06-130-0/+0
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit 'c620f095fef62114ffdc6c0ed0749c56b5e817b8': init: prevent action being added to the action_queue twice
| | * | | | | | Merge "init: prevent action being added to the action_queue twice"Colin Cross2013-06-141-1/+6
| | |\ \ \ \ \ \
| | | * | | | | | init: prevent action being added to the action_queue twiceColin Cross2013-06-101-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Property triggers may cause an action to be queued twice, resulting in a loop in the action queue. Keep actions that are not on the queue in the list_empty state (act->qlist->next == act->qlist), and only add them to the list if they are in that state. Bug: 8335133 Change-Id: I3a3ec18176cf19cbaa3a45220a03c7560eacfe79
* | | | | | | | | am 65d8ec09: am 6ef0dfec: Merge "Add a new test to crasher to upset dlmalloc."Elliott Hughes2013-06-121-25/+34
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | | * commit '65d8ec099dbaa3e4fc56430060853f51a7687ac0': Add a new test to crasher to upset dlmalloc.
| * | | | | | | am 6ef0dfec: Merge "Add a new test to crasher to upset dlmalloc."Elliott Hughes2013-06-121-25/+34
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '6ef0dfecca9fde5abe15ceea30e0615897d7b374': Add a new test to crasher to upset dlmalloc.
| | * | | | | | Merge "Add a new test to crasher to upset dlmalloc."Elliott Hughes2013-06-121-25/+34
| | |\ \ \ \ \ \
| | | * | | | | | Add a new test to crasher to upset dlmalloc.Elliott Hughes2013-06-121-25/+34
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should also add a test for heap corruption, but I failed to come up with a kind of corruption that dlmalloc actually detects (rather than just crashing accidentally). Change-Id: I7457e732729635b171ffc44517c3de71f55608e6
* | | | | | | | Merge "Add webviewchromium to BOOTCLASSPATH."Torne (Richard Coles)2013-06-111-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Add webviewchromium to BOOTCLASSPATH.Torne (Richard Coles)2013-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add /system/framework/webviewchromium.jar to BOOTCLASSPATH. This jar contains the implementation classes for the new WebView. It has been processed with jarjar to ensure that it doesn't define any classes outside of com.android. Change-Id: If65913638df0088f4dd7d62a087750b90038a7fb
* | | | | | | | | am 0a0a8768: resolved conflicts for merge of c0df50af to stage-aosp-masterColin Cross2013-06-101-2/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | | | | | | | | * commit '0a0a8768cbc9ce36d3c9a0cc712dc8c309811565': fix bad return value in dhcp_do_request_*
| * | | | | | | resolved conflicts for merge of c0df50af to stage-aosp-masterColin Cross2013-06-101-2/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | Change-Id: I949cce9e1f14cd33162b81fbc6728c64e2b09b7c
| | * | | | | | Merge "fix bad return value in dhcp_do_request_*"Colin Cross2013-06-101-2/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | fix bad return value in dhcp_do_request_*Michael Wu2013-06-051-2/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. bad return status make it return uninitialized prefixLength with a magic number in android_net_utils_runDhcpCommon() 2. it will make DhcpInfoInternal.makeLinkAddress() to throw IllegalArgumentException when try to connect a Wifi AP 3. the exception will make system reboot, of cource it random. Change-Id: Iabc0cd5b69c1316f4eeae0aa1b8a91444dca4562 Signed-off-by: Michael Wu <michaelstay@gmail.com>
* | | | | | | remove unused SF event log tagsMathias Agopian2013-06-041-16/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1271875c575aac31568017a17622f4dc9ff40032
* | | | | | | Merge "HACK: cutils: restore record_stream temporarily"Dima Zavin2013-06-043-0/+230
|\ \ \ \ \ \ \
| * | | | | | | HACK: cutils: restore record_stream temporarilyDima Zavin2013-06-043-0/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore the record_stream code in cutils that was removed in e00a12bf8a99eb6c4f278efa503488aa21dd8d4d as part of cutils cleanup. Unfortunately, there are some prebuilt vendor libs that rely on this functionality that we cannot currently rebuild. Remove at the earliest possible convenience once the vendor libs have been fixed. Bug: 9189218 Change-Id: I5d44126756f1e3ed194d1b5873d64d9154183199 Signed-off-by: Dima Zavin <dima@android.com>
* | | | | | | | am 603746f0: am 59fa7e10: Merge "Fixed reversed output in netstat Recv-Q ↵Brian Carlstrom2013-06-041-2/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send-Q columns" * commit '603746f0e3b645954f33be36f7602cc8205cb71c': Fixed reversed output in netstat Recv-Q Send-Q columns
generated by cgit v1.1 at 2025-10-26 07:45:30 +0000