summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | Revert "Fix win_sdk build."Nick Kralevich2013-02-041-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 941daef629bd571032851edf7ae1dce24266640e. Change-Id: I6b509492964baf535e0eeb1a731bf70c91715942
* | | | | | | | | | | Fix win_sdk build.Nick Kralevich2013-02-021-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't depend on sys/cdefs.h, which doesn't exist when building for the host.Don't try to compile property_len() checking code in mingw32, it doesn't work. Change-Id: I6a56b759bd4e8d30d6ca136e43d6515bf7408cc6
* | | | | | | | | | | am 7480c007: am b2639f40: Merge "Label sockets consistently with the ↵Colin Cross2013-02-011-19/+27
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | seclabel value if specified." # By Stephen Smalley # Via Android Git Automerger (1) and others * commit '7480c0079d8c7fcfd5b3d9decfdabfebde162781': Label sockets consistently with the seclabel value if specified.
| * | | | | | | | | | am b2639f40: Merge "Label sockets consistently with the seclabel value if ↵Colin Cross2013-02-011-19/+27
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | specified." # By Stephen Smalley # Via Gerrit Code Review (1) and Stephen Smalley (1) * commit 'b2639f4015c9fb2ff10c7bfae6074a8d968f5b7e': Label sockets consistently with the seclabel value if specified.
| | * | | | | | | | | Merge "Label sockets consistently with the seclabel value if specified."Colin Cross2013-02-011-19/+27
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | | * | | | | | | | Label sockets consistently with the seclabel value if specified.Stephen Smalley2012-11-161-19/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is necessary to ensure that the adbd socket is created in the adbd domain rather than the init domain. Change-Id: Id4997d7f074aeefea62b41c87b46a6609e03f527 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | | | | | | | | | Merge "property_get: do argument checking."Nick Kralevich2013-02-011-0/+20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | property_get: do argument checking.Nick Kralevich2013-01-311-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try to verify, at compile time, that the supplied value buffer is large enough. There's more we can do here, but this is a good first pass. Change-Id: Iac8153826c89114b2755735032423c6744f7a61b
* | | | | | | | | | | | Merge "audio: added input device for front + back mic"Eric Laurent2013-01-311-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | audio: added input device for front + back micEric Laurent2013-01-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a value to audio_channel_mask_t enum for front + back mic combination to allow parsing of audio_policy.conf file by audio policy manager. Change-Id: I8412b4d3cfc03323eff867563a1a73322019c0f3
* | | | | | | | | | | | logwrapper: rename logwrap() to android_fork_execvp()Rom Lemarchand2013-01-303-40/+36
| |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also change the quiet flag to a logwrap flag (inverses the meaning of the boolean). Change-Id: I76047a7b460f4c28d52f26bfe3f65889d96047f8
* | | | | | | | | | | am 282caf3b: am 260f3471: am f8afaebe: Merge "Windows adb: include stdint.h ↵Kenny Root2013-01-291-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for uint8_t on MinGW-w64" # By Ray Donnelly # Via Android Git Automerger (2) and others * commit '282caf3bd0dfd81b92ac74e0b3ea970d195fee7b': Windows adb: include stdint.h for uint8_t on MinGW-w64
| * | | | | | | | | | am 260f3471: am f8afaebe: Merge "Windows adb: include stdint.h for uint8_t ↵Kenny Root2013-01-291-0/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on MinGW-w64" # By Ray Donnelly # Via Android Git Automerger (1) and others * commit '260f347197187c0e4ac9bf4afaf049bfa3655afc': Windows adb: include stdint.h for uint8_t on MinGW-w64
| | * \ \ \ \ \ \ \ \ \ am f8afaebe: Merge "Windows adb: include stdint.h for uint8_t on MinGW-w64"Kenny Root2013-01-291-0/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Ray Donnelly # Via Gerrit Code Review (1) and Ray Donnelly (1) * commit 'f8afaebec3d10879f22406ac1bf06a246d448f93': Windows adb: include stdint.h for uint8_t on MinGW-w64
| | | * | | | | | | | | Merge "Windows adb: include stdint.h for uint8_t on MinGW-w64"Kenny Root2013-01-301-0/+1
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Windows adb: include stdint.h for uint8_t on MinGW-w64Ray Donnelly2013-01-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I84b8284bc034feb0acd313b0aad9e2fa5868854f
* | | | | | | | | | | | | am 6c3d3ccf: am d033739d: am d40fd86e: Merge "Windows adb: initialize on to ↵Kenny Root2013-01-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1 in disable_tcp_nagle" # By Ray Donnelly # Via Android Git Automerger (2) and others * commit '6c3d3ccfa5d1d77b80e5c7619909a48b976c69ec': Windows adb: initialize on to 1 in disable_tcp_nagle
| * | | | | | | | | | | | am d033739d: am d40fd86e: Merge "Windows adb: initialize on to 1 in ↵Kenny Root2013-01-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disable_tcp_nagle" # By Ray Donnelly # Via Android Git Automerger (1) and others * commit 'd033739d176f8a2da99f80ef4a03bdca0649b644': Windows adb: initialize on to 1 in disable_tcp_nagle
| | * | | | | | | | | | | am d40fd86e: Merge "Windows adb: initialize on to 1 in disable_tcp_nagle"Kenny Root2013-01-291-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Ray Donnelly # Via Gerrit Code Review (1) and Ray Donnelly (1) * commit 'd40fd86ec5bdf56e8cd5a702ffc5332b6de931e4': Windows adb: initialize on to 1 in disable_tcp_nagle
| | | * | | | | | | | | | Merge "Windows adb: initialize on to 1 in disable_tcp_nagle"Kenny Root2013-01-301-1/+1
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Windows adb: initialize on to 1 in disable_tcp_nagleRay Donnelly2013-01-111-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | cutils: remove dead code.Nick Kralevich2013-01-292-39/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The last caller of this code was removed in dalvik commit eb1703442f3fc0577b3395b7eb4d55300b4125db (https://android-review.googlesource.com/50689) Change-Id: I3f4865c02092752a13369a3b2c3289fc9a4f6a62
* | | | | | | | | | | | | | am 76dd8e33: resolved conflicts for merge of 016806a7 to jb-mr1-dev-plus-aospDoug Zongker2013-01-290-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Doug Zongker * commit '76dd8e33689292e6255b090da7408fba76919424': change AID_LOOP_RADIO uid assignment
| * | | | | | | | | | | | | resolved conflicts for merge of 016806a7 to jb-mr1-dev-plus-aospDoug Zongker2013-01-290-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie513c90bcad779203a241a541945b0cf7c936664
| | * | | | | | | | | | | | change AID_LOOP_RADIO uid assignmentDoug Zongker2013-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1029 was taken by an AOSP change; use 1030 instead. Change-Id: Icfe19a5638a4c98a3e2694c0402d19b49b8face9
* | | | | | | | | | | | | | am 8cc97302: resolved conflicts for merge of 0fe9742e to jb-mr1-dev-plus-aospDoug Zongker2013-01-291-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Doug Zongker * commit '8cc97302b2cc42d70af3c6d84a6a46984a09fe24': add AID_LOOP_RADIO for control of loop radio device
| * | | | | | | | | | | | | resolved conflicts for merge of 0fe9742e to jb-mr1-dev-plus-aospDoug Zongker2013-01-291-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | / / / / / / / / / / / | | |/ / / / / / / / / / / | |/| | | | | | | | | | | Change-Id: Ie7a8b642dec0f07d4c8bfd9d8f736fd66c4febe0
| | * | | | | | | | | | | add AID_LOOP_RADIO for control of loop radio deviceDoug Zongker2013-01-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1e996dfbaa0f187ec87b5318a214ab0b852193cc
* | | | | | | | | | | | | am db9697b3: am b94b038d: Merge "libcorkscrew will always HAVE_DLADDR."Elliott Hughes2013-01-291-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android Git Automerger (1) and others * commit 'db9697b3b059469153e81bf9e8844fb8e23149ea': libcorkscrew will always HAVE_DLADDR.
| * | | | | | | | | | | | am b94b038d: Merge "libcorkscrew will always HAVE_DLADDR."Elliott Hughes2013-01-291-4/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Elliott Hughes (1) and Gerrit Code Review (1) * commit 'b94b038df58cb13ae2073a28d5264bf9162d5be5': libcorkscrew will always HAVE_DLADDR.
| | * | | | | | | | | | | Merge "libcorkscrew will always HAVE_DLADDR."Elliott Hughes2013-01-291-4/+0
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | libcorkscrew will always HAVE_DLADDR.Elliott Hughes2013-01-251-4/+0
| | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only place we don't have dladdr(3) is Windows, and libcorkscrew is for Unix. Change-Id: If7633ee8398bccf9897add728facbe07592c0fcf
* | | | | | | | | | | | | Merge "Delete frameworks/base/voip use voip-common from frameworks/opt/net/voip"Wink Saville2013-01-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Delete frameworks/base/voip use voip-common from frameworks/opt/net/voipWink Saville2013-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add voip-common to BOOTCLASSPATH Change-Id: Ieaba759a0f69b45c4b8839cbed1fe757cdf190c5
* | | | | | | | | | | | | | Merge "Revert "init.usb.rc: set sys.usb.config to none before changing it""Benoit Goby2013-01-291-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Revert "init.usb.rc: set sys.usb.config to none before changing it"Benoit Goby2013-01-151-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can cause init to be stucked in a loop in very rare cases where persist.sys.usb.config is set to "none" (because the "setprop sys.usb.config none" action is added twice to the action list). The original issue on encrypted devices has been fixed differently by change # I350c5aab986f8ca86b95f316398d03012553e581 This reverts commit 80828af3def1f37eff1d483520df79ebe4238d55. Change-Id: Id0a7af8dd861c8d10b80a13b540c8a339b432007
* | | | | | | | | | | | | | | Merge "logwrap: add quiet flag to logwrap()"Rom Lemarchand2013-01-293-32/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | logwrap: add quiet flag to logwrap()Rom Lemarchand2013-01-283-32/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a quiet flag to the logwrap function that prevents messages from getting logged. Change-Id: Ic56c011fb608babae32b03900b955833a6bdd070
* | | | | | | | | | | | | | | | Merge "adb: Add "unauthorized" connection state"Benoit Goby2013-01-293-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | adb: Add "unauthorized" connection stateBenoit Goby2013-01-153-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new connection state, so that devices, that require confirmation to allow adb, appear as "unauthorized" in the adb devices lists. Change-Id: Ib4264bc5736dedecf05bcf8e31896f4d7a91fad8
* | | | | | | | | | | | | | | Merge "logwrap: Replace sigprocmask with pthread_sigmask"Rom Lemarchand2013-01-291-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | logwrap: Replace sigprocmask with pthread_sigmaskRom Lemarchand2013-01-291-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sigprocmask has undefined behavior when called from a thread. Replacing with pthread_sigmask to ensure correct behavior if logwrap() gets called from a thread. Change-Id: I77b6959d345eac8d7b90039ed8144ead8c19a00c
* | | | | | | | | | | | | | | | Merge "logwrap: wait for child process when receiving SIGINT or SIGQUIT"Rom Lemarchand2013-01-293-3/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | logwrap: wait for child process when receiving SIGINT or SIGQUITRom Lemarchand2013-01-293-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Wait for the child to exit before propagating SIGINT and SIGQUIT to the parent - Add ignore_int_quit argument to logwrap() that gives the caller the option to ignore SIGINT and SIGQUIT while logwrap is running Change-Id: If5c96cf23094917211310f00aa6aed515f110f5b
* | | | | | | | | | | | | | | | logwrap: ensure child exits with _exitRom Lemarchand2013-01-281-20/+19
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always exit the child process with _exit() rather than exit() to ensure none of the parent's atexit functions get called if the child needs to exit before calling exec. Change-Id: I6a75111ef1bb3468c114c98743565471cf82c9dd
* | | | | | | | | | | | | | | Merge "adb: Read secure adb keys on every auth request"Benoit Goby2013-01-282-14/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | adb: Read secure adb keys on every auth requestBenoit Goby2013-01-152-14/+11
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The framework can now clear the user key list, so we need to reload the key list on every auth request instead of loading it once when adbd starts. This also fixes issues with encrypted devices, where the user key file is only readable after the user has unlocked the device. Change-Id: I350c5aab986f8ca86b95f316398d03012553e581
* | | | | | | | | | | | | | Merge "logwrap: remove unnecessary call to setuid/setgid"Rom Lemarchand2013-01-281-6/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | logwrap: remove unnecessary call to setuid/setgidRom Lemarchand2013-01-281-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android allows all users to write to log. The setuid/setgid call is unneeded and could cause unintended side effects when called from daemons or programs that need to run as root. Change-Id: I3bdb26eaa4363ef037615e45a1a5cb1ceb4088f3
* | | | | | | | | | | | | | | Merge "logwrap: fix off by 1 argument error"Rom Lemarchand2013-01-282-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
generated by cgit v1.1 at 2024-12-25 09:34:44 +0000