Commit Graph

26826 Commits

Author SHA1 Message Date
Treehugger Robot 4b44753085 Merge "Define GIDs for internal media file types." 2016-12-03 03:29:51 +00:00
Treehugger Robot b898ce00fa Merge "Remove unused adb_set_transport." 2016-12-03 02:48:03 +00:00
Treehugger Robot 61e74d7a1b Merge "libsparse: add a function to retrieve the data blocks" 2016-12-02 22:48:24 +00:00
Jeff Sharkey 4de27c6a6d Define GIDs for internal media file types.
Currently, all internal media storage files (under /data/media) are
given the same "media_rw" GID.  To support an upcoming optimization
to disk usage calculation, this CL defines three new GIDs that can be
used to quickly identify common types: audio, video, and images.

Test: builds
Bug: 27948817
Change-Id: I8548459c3d3ccbf7d822431c6e2ebd1c2e309d70
2016-12-02 14:17:48 -07:00
Elliott Hughes de80be39aa Remove unused adb_set_transport.
Bug: N/A
Test: builds
Change-Id: I0824d29c080c47e1002abf3520ebed8996bcbcc6
2016-12-02 12:53:09 -08:00
Mark Salyzyn b8de7b404a Merge "liblog: switch event_tag_map.c to event_tag_map.cpp" am: 48dfc220cb
am: 18f2b9f4c0

Change-Id: I896d3fe4bff55a4f2864e1b012ba98441d98f9dc
2016-12-02 18:03:40 +00:00
Mark Salyzyn 18f2b9f4c0 Merge "liblog: switch event_tag_map.c to event_tag_map.cpp"
am: 48dfc220cb

Change-Id: Ifa613fa9909bab3ba634062ef57c90dfa21a24a3
2016-12-02 17:56:09 +00:00
Mark Salyzyn 48dfc220cb Merge "liblog: switch event_tag_map.c to event_tag_map.cpp" 2016-12-02 17:51:36 +00:00
James Hawkins 9e0b1a0a97 Merge "bootstat: Fix the boot complete signal for FBE devices." am: 6e5f730243
am: ebe84bbcd4

Change-Id: If1f3cd1b0b73a79021c1e4179a45177734da2e07
2016-12-02 01:58:40 +00:00
James Hawkins ebe84bbcd4 Merge "bootstat: Fix the boot complete signal for FBE devices."
am: 6e5f730243

Change-Id: I18a54e10b495434a7a4b78d44d37814a09fbf919
2016-12-02 01:54:54 +00:00
Treehugger Robot 6e5f730243 Merge "bootstat: Fix the boot complete signal for FBE devices." 2016-12-02 01:46:46 +00:00
Mark Salyzyn ed9dc8abe2 liblog: switch event_tag_map.c to event_tag_map.cpp
NB: recent activities on event_tag_map.c were to allow
    this transition to be unremarkable.

Test: compile
Bug: 31456426
Change-Id: I13e1771a001874244711a5ac3023861c2a5f8c7d
2016-12-01 15:42:03 -08:00
James Hawkins e4079fbdef bootstat: Fix the boot complete signal for FBE devices.
FBE devices suffice with bootanim=stopped, but must be gated on
ro.crypto.type=file.

Bug: 33049941
Test: adb reboot && adb logcat | grep bootstat < Has output
Change-Id: I346d47aaf9d1d4b40f05906056849630b922a20d
2016-12-01 14:02:17 -08:00
Mark Salyzyn d37d0bf55e Merge "liblog: fortify event_log_tags test" am: de07029ad0
am: 27123d52fc

Change-Id: I42951a35b50f6698be12c3d9a68c28da32d2e01c
2016-12-01 17:53:10 +00:00
Mark Salyzyn 27123d52fc Merge "liblog: fortify event_log_tags test"
am: de07029ad0

Change-Id: I70b7c3d0bf07c061a04f8770979efd7b87bc6cec
2016-12-01 17:45:58 +00:00
Treehugger Robot de07029ad0 Merge "liblog: fortify event_log_tags test" 2016-12-01 17:24:33 +00:00
Wei Wang df47019a30 Merge "init: don't wait if we have more work to do" am: 32ee9fc24a
am: c746ecbcbe

Change-Id: I25e011de5ae99fdda1e4c0c88d6de9056ea8189a
2016-12-01 03:57:20 +00:00
Wei Wang c746ecbcbe Merge "init: don't wait if we have more work to do"
am: 32ee9fc24a

Change-Id: Ie260a9e3d491b9108dc7681ede5a0e3ceac9ef79
2016-12-01 03:51:19 +00:00
Treehugger Robot 32ee9fc24a Merge "init: don't wait if we have more work to do" 2016-12-01 03:45:41 +00:00
Adrien Schildknecht a26a6bd6f3 libsparse: add a function to retrieve the data blocks
Test: m libsparse

Change-Id: I04bd3912bb4364e591b064ec2aab782cf02f6bd7
2016-11-30 19:16:28 -08:00
TreeHugger Robot 093f9b7aee Merge "fs_mgr: fix header ordering" into nyc-mr1-dev-plus-aosp 2016-12-01 02:53:54 +00:00
Wei Wang 16db4346a2 init: don't wait if we have more work to do
Bug: 33212253
Test: On marlin
Change-Id: I8502eaa73fac6953d358af01482760b3249cfd67
2016-11-30 18:09:29 -08:00
Jin Qian 8e599c08ce Merge "fs_mgr: support to reserved some blocks for an ext2/3/4 partition." am: bde6ddbbfa -s ours
am: eee645ec2a

Change-Id: I17d07f443e37de8d8144834ee1b5542877718e95
2016-12-01 01:58:11 +00:00
Jin Qian eee645ec2a Merge "fs_mgr: support to reserved some blocks for an ext2/3/4 partition."
am: bde6ddbbfa  -s ours

Change-Id: Icaac50e60b7ee881e593dea2ad5f10bf33aceb15
2016-12-01 01:52:43 +00:00
Jin Qian bde6ddbbfa Merge "fs_mgr: support to reserved some blocks for an ext2/3/4 partition." 2016-12-01 01:35:37 +00:00
Tom Cherry e35e4e4e39 fs_mgr: fix header ordering
A merge conflict resolution un-alphabetized the order of these
headers; this commit puts them back in order.

Change-Id: I13c26fbb8f88fe2ce0b332721235b3e4eba7deaf
2016-11-30 17:22:55 -08:00
Elliott Hughes 5dd53bf466 Merge "Use hasmntopt(3) rather than reinventing the wheel." am: 769a5a1962
am: 8656ed109b

Change-Id: Ied4c404b0d0f957bfe0e9ff3841173b52147b21b
2016-11-30 22:56:00 +00:00
Elliott Hughes 8656ed109b Merge "Use hasmntopt(3) rather than reinventing the wheel."
am: 769a5a1962

Change-Id: I62541c0ff6961888239a7686bb37115b39fc787b
2016-11-30 22:49:53 +00:00
Elliott Hughes 769a5a1962 Merge "Use hasmntopt(3) rather than reinventing the wheel." 2016-11-30 22:32:44 +00:00
Josh Gao 4fba3d2638 adb: move adb_strerror to sysdeps/win32/errno.cpp.
Bug: none
Test: mma
Change-Id: I9df4d6faf9883a78f50ca6b2b7c35f095d06ae20
2016-11-30 13:23:21 -08:00
Josh Gao d6d5c38469 adb: extend sync protocol's stat support.
Extend the file sync protocol to support calling regular stat (instead
of lstat), return error codes, and provide the entire stat struct.

Bug: http://b/33058958
Test: python test_device.py with both old and new adbd
Change-Id: I841123debc380f86194a19e91c97d85160112144
2016-11-30 13:23:21 -08:00
caozhiyuan 3353d2a03c init: Fix sync issue on property trigger.
am: 876ad4571e

Change-Id: I8a53c4728ee74a18b47b3ae8d9db6050b83ce6e2
2016-11-30 19:12:19 +00:00
Mark Salyzyn 3cd9e31446 liblog: fortify event_log_tags test
Robustness fortification.  Deal with gtest failure if event-log-tags
file is updated, adb sync for example, and thus will report
Shared_Dirty instead of Shared_Clear.  Add check for Private_Dirty
and Private_Clean being clear at zero too as a bonus.

Test: gTest liblog-unit-tests --gtest_filter=liblog.event_log_tags
Bug: 31456426
Change-Id: Id912929fdd65499aa532a15653ef387a997a5054
2016-11-30 11:08:46 -08:00
Pirama Arumuga Nainar 4c11b152ba Merge "Statically link LLVM libraries into backtrace_test" am: 9e8467a070
am: 66d86967bd

Change-Id: Ia7973b59db8706fc6540003464ba4f79c99342d1
2016-11-30 18:41:47 +00:00
Pirama Arumuga Nainar a16735e36c Statically link LLVM libraries into backtrace_test am: c198b150d4
am: 473f17cde0

Change-Id: I74a7c804446fed86a9c9f401f054ab8387d1b456
2016-11-30 18:41:32 +00:00
Pirama Arumuga Nainar 66d86967bd Merge "Statically link LLVM libraries into backtrace_test"
am: 9e8467a070

Change-Id: Iddd06215b4a696283f645080d4183dd524827af4
2016-11-30 18:36:16 +00:00
Pirama Arumuga Nainar 473f17cde0 Statically link LLVM libraries into backtrace_test
am: c198b150d4

Change-Id: I5d0db1329ac17a2a59cac589b9ab34c909f903ea
2016-11-30 18:36:14 +00:00
Treehugger Robot 9e8467a070 Merge "Statically link LLVM libraries into backtrace_test" 2016-11-30 18:27:39 +00:00
Elliott Hughes b94063edbf Merge "init: Fix sync issue on property trigger." am: 80d2f01fbf
am: 65016074c2

Change-Id: I72dda41a53e95420653027176b04c7d359fa8e71
2016-11-30 18:00:11 +00:00
Elliott Hughes 65016074c2 Merge "init: Fix sync issue on property trigger."
am: 80d2f01fbf

Change-Id: Iae57b79abeb7a372c0e483316d328d5307c66b73
2016-11-30 17:54:31 +00:00
caozhiyuan 876ad4571e init: Fix sync issue on property trigger.
This issue reproduces in the following senario.
 1. ("", "") is added to queue;
 2. property_triggers_enabled is set to 1;
 3. user defined property is triggered, like sys.usb.config=adb;
 4. ("sys.usb.config", "adb") is added to queue;
 5. main loop interpret ("", "") and queue all current triggers to execution,
    so ("sys.usb.config", "adb") is queued for execution for the first time.
 6. main loop interpret ("sys.usb.config", "adb"), it is queued for
    execution for a second time.
The second time makes ASIT fail.

(cherry pick from AOSP commit b104c502e1)

Bug: http://b/28218187
Change-Id: I230e175e0dca8989f1e5bd812398da90082d0ec1
Signed-off-by: caozhiyuan <cao.zhiyuan@zte.com.cn>
2016-11-30 09:51:38 -08:00
Pirama Arumuga Nainar c198b150d4 Statically link LLVM libraries into backtrace_test
Bug: http://b/28866258

Remove dependency of backtrace_test on libLLVM.  Also clean up
specification for libbacktrace_offline module.  Since it is a static
library now, dependencies are only needed to automatically include
necessary headers.

Test: 32-bit and 64-bit backtrace_test passes on host and on Angler.
      mma in system/extras/simpleperf, cts/tests/tests/simpleperf
      m test-art-host

Change-Id: I76b0db14d067fa7b140a99edd237370ac04fe873
2016-11-30 17:43:20 +00:00
Elliott Hughes 80d2f01fbf Merge "init: Fix sync issue on property trigger." 2016-11-30 17:39:55 +00:00
Elliott Hughes 8c1838823a Use hasmntopt(3) rather than reinventing the wheel.
Bug: N/A
Test: "power off" still works
Change-Id: I11d3dc22f98ac71608c9929a3fd43319c787d49e
2016-11-30 09:37:17 -08:00
Mark Salyzyn 2e88b5c803 Merge "libcutils: tests" am: bac388e424
am: 6878cd20e6

Change-Id: I11758ee49eec3e19a5b9484af7c986eb3f3de769
2016-11-30 17:34:10 +00:00
Mark Salyzyn 6878cd20e6 Merge "libcutils: tests"
am: bac388e424

Change-Id: I86a00ea257985836400b530c1e60bdc5e070dd00
2016-11-30 17:28:39 +00:00
Treehugger Robot bac388e424 Merge "libcutils: tests" 2016-11-30 17:21:46 +00:00
Oleksiy Avramchenko ac7bdd6a07 Merge "logcat: Fix --last usage option typo" am: 95a53b8b7a
am: 8a96f5e4a7

Change-Id: I458817e1ba2407bb35d0d9dc5c9c913f40bab6d5
2016-11-30 17:07:07 +00:00
Oleksiy Avramchenko 8a96f5e4a7 Merge "logcat: Fix --last usage option typo"
am: 95a53b8b7a

Change-Id: Ic18c2cec4c72cd97353c22f9e41c926baac8085b
2016-11-30 17:01:37 +00:00
Treehugger Robot 95a53b8b7a Merge "logcat: Fix --last usage option typo" 2016-11-30 16:55:23 +00:00