00129eb694
Merge changes from topic "stats_log" am: 68f2c85354 am: 11bb6bbf41
...
am: 9ecaaf44f9
2017-11-15 19:30:13 +00:00
9ecaaf44f9
Merge changes from topic "stats_log" am: 68f2c85354
...
am: 11bb6bbf41
2017-11-15 19:28:35 +00:00
11bb6bbf41
Merge changes from topic "stats_log"
...
am: 68f2c85354
2017-11-15 19:26:12 +00:00
68f2c85354
Merge changes from topic "stats_log"
...
* changes:
Register an event logtag for stats logs.
Create stats buffer in logd.
2017-11-15 19:16:12 +00:00
954cb53eec
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
...
am: f3397a3ca4
2017-11-15 00:53:11 +00:00
f3397a3ca4
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
...
Change-Id: I2da7085b5c1f235c7d50949b1abd26ae2aea6888
2017-11-14 16:47:59 -08:00
c6eafeb5bf
Register an event logtag for stats logs.
...
Bug: 69323063
Test: manual
Change-Id: I244aa15c74ad70ba228c2128a3cdc829537ce5e2
2017-11-14 16:24:13 -08:00
701a0658e6
Create stats buffer in logd.
...
Bug: 69323063
Test: ran unit tests.
Change-Id: Icfb827ab4674172c26b4bbfe1a9b3bffc03dc24b
(cherry picked from commit 1b1b6f50c7
2017-11-14 16:20:00 -08:00
23e27db576
Merge commit 'a63ccea6abc7ea02e2d98e41c80793ca97237bd3' from
...
oc-mr1-dev-plus-aosp into stage-aosp-master
Change-Id: Ia33311cd1fd26dfaea59a69317b306fb91203c40
Merged-In: I03d06b10807e8a313c9654c2e1db36bfb59e3f99
2017-11-14 13:19:45 -08:00
a8066ead1d
Merge "Better, consistent definition of AID_SHARED_GID." am: b77ecd04d8 am: ea41bcf7a3
...
am: 90ec70adfa
2017-11-14 17:33:23 +00:00
90ec70adfa
Merge "Better, consistent definition of AID_SHARED_GID." am: b77ecd04d8
...
am: ea41bcf7a3
2017-11-14 17:20:17 +00:00
ea41bcf7a3
Merge "Better, consistent definition of AID_SHARED_GID."
...
am: b77ecd04d8
2017-11-14 17:04:21 +00:00
b77ecd04d8
Merge "Better, consistent definition of AID_SHARED_GID."
2017-11-14 16:49:30 +00:00
1f73aedee2
Merge "sdcard: Use AID_ROOT constant"
2017-11-14 00:16:52 +00:00
64adc7ca6a
Merge "healthd: move global gHealth service pointer"
2017-11-13 23:57:19 +00:00
53d37ba23f
Better, consistent definition of AID_SHARED_GID.
...
AID_SHARED_GID is a GID shared by a specific app across all users on
the same device. Bring the UserHandle and multiuser.c implementations
into agreement, and copy/paste the unit tests that verify that both
behave identically.
This fixes a regression where multiuser_get_shared_gid() was applying
per-user isolation when it shouldn't have.
Test: adb shell /data/nativetest64/libcutils_test/libcutils_test64
Bug: 34151068, 64548938
Change-Id: I491dd79d23a214425a68865d1d0f8269916aad4c
2017-11-13 16:49:26 -07:00
9680cbab65
Merge "fastboot: support f2fs format" am: 21d3840eb3 am: 6c2bfb95ee
...
am: 1fa1fdb8f9
2017-11-13 23:00:28 +00:00
1fa1fdb8f9
Merge "fastboot: support f2fs format" am: 21d3840eb3
...
am: 6c2bfb95ee
2017-11-13 22:55:54 +00:00
6c2bfb95ee
Merge "fastboot: support f2fs format"
...
am: 21d3840eb3
2017-11-13 22:48:15 +00:00
21d3840eb3
Merge "fastboot: support f2fs format"
2017-11-13 22:37:34 +00:00
5b61509339
Merge "Fix logcatd dependency in logpersist." am: d0406316fe am: 8b03fd8441
...
am: 808c8ca352
2017-11-13 22:23:53 +00:00
808c8ca352
Merge "Fix logcatd dependency in logpersist." am: d0406316fe
...
am: 8b03fd8441
2017-11-13 22:21:48 +00:00
8b03fd8441
Merge "Fix logcatd dependency in logpersist."
...
am: d0406316fe
2017-11-13 22:19:44 +00:00
d0406316fe
Merge "Fix logcatd dependency in logpersist."
2017-11-13 22:15:24 +00:00
2eaa098bfe
Merge "PRODUCT_TREBLE_LINKER_NAMESPACES for ld.config.txt" am: c437e14c17 am: 5bd7b32c15
...
am: 2c531b007e
2017-11-13 21:19:21 +00:00
2c531b007e
Merge "PRODUCT_TREBLE_LINKER_NAMESPACES for ld.config.txt" am: c437e14c17
...
am: 5bd7b32c15
2017-11-13 21:13:50 +00:00
5bd7b32c15
Merge "PRODUCT_TREBLE_LINKER_NAMESPACES for ld.config.txt"
...
am: c437e14c17
2017-11-13 21:11:17 +00:00
c437e14c17
Merge "PRODUCT_TREBLE_LINKER_NAMESPACES for ld.config.txt"
2017-11-13 21:06:34 +00:00
9cffa8a161
healthd: move global gHealth service pointer
...
... to class implementation::Health. Expose APIs
InitInstance(), GetImplmentation()
for its setter and getter.
Clients that statically links to android.hardware
.health@2.0-impl (e.g. charger, recovery)
should use InitInstance().
Test: health VTS tests
Bug: 63702641
Change-Id: I51b9b976d0b723dac1a03e5113d5d9e84300c0e9
2017-11-13 12:34:47 -08:00
24e7a25836
Fix logcatd dependency in logpersist.
...
This change ensures that the logcatd binary is properly
included into builds which contain logpersist. logcatd
is required for logpersist to actually work.
Bug: 69171565
Test: make checkbuild
Test: verified that logcatd binary is present in build
Change-Id: I78161998763a4694ba88af43113fef39a5fbd8c8
2017-11-13 12:22:47 -08:00
16a72c83e1
Merge "Remove dead dlmalloc stubs." am: 2736aec411 am: 3f958ed641
...
am: 28db530ee4
2017-11-13 17:30:12 +00:00
28db530ee4
Merge "Remove dead dlmalloc stubs." am: 2736aec411
...
am: 3f958ed641
2017-11-13 17:27:29 +00:00
3f958ed641
Merge "Remove dead dlmalloc stubs."
...
am: 2736aec411
2017-11-13 17:24:55 +00:00
2736aec411
Merge "Remove dead dlmalloc stubs."
2017-11-13 17:22:20 +00:00
71028f9fcd
Merge "DO NOT MERGE ANYWHERE Add comments and code about ro.boot.slot back" am: 6b07ee9fb5 -s ours am: 6cdd5f9002 -s ours
...
am: bee3639ab1
2017-11-13 16:43:48 +00:00
bee3639ab1
Merge "DO NOT MERGE ANYWHERE Add comments and code about ro.boot.slot back" am: 6b07ee9fb5 -s ours
...
am: 6cdd5f9002
2017-11-13 16:41:11 +00:00
6cdd5f9002
Merge "DO NOT MERGE ANYWHERE Add comments and code about ro.boot.slot back"
...
am: 6b07ee9fb5
2017-11-13 16:38:42 +00:00
6b07ee9fb5
Merge "DO NOT MERGE ANYWHERE Add comments and code about ro.boot.slot back"
2017-11-13 16:36:34 +00:00
690bce8d81
sdcard: Use AID_ROOT constant
...
To be consistent with the other parts of the code,
and to make it easy to use a differnt value when running in a container.
Bug: 69142822
Test: build
Change-Id: I9b2c7744e3867bb15511dd4ddd7bce281d758a7b
2017-11-13 18:29:20 +09:00
c6dce2a6a7
Merge "healthd is class hal"
2017-11-12 15:02:21 +00:00
d872118d88
fastboot: support f2fs format
...
+ quota support
This patch fixes broken f2fs_format by replacing the existing flow with calling
legacy mkfs.f2fs binary explicitly likewise ext4.
This removes obsolete ext4 stuffs as well.
Bug: 67009570
Change-Id: Ia81bcbc7adc3a8b57ada860f7f7871602ac1c6e9
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2017-11-11 18:29:02 -08:00
00e169ece6
Merge "first stage mount: abort when failed to parse fstab in device-tree" am: d0d7346dc7 am: 9a9469faeb
...
am: 71096ca58a
2017-11-11 01:55:59 +00:00
71096ca58a
Merge "first stage mount: abort when failed to parse fstab in device-tree" am: d0d7346dc7
...
am: 9a9469faeb
2017-11-11 01:53:51 +00:00
9a9469faeb
Merge "first stage mount: abort when failed to parse fstab in device-tree"
...
am: d0d7346dc7
2017-11-11 01:51:14 +00:00
d0d7346dc7
Merge "first stage mount: abort when failed to parse fstab in device-tree"
2017-11-11 01:48:30 +00:00
aaaa2555ab
Merge "fastboot: show how long extraction takes." am: 0626f7205e am: 178b010713
...
am: fa10b2bf8d
2017-11-11 01:08:55 +00:00
fa10b2bf8d
Merge "fastboot: show how long extraction takes." am: 0626f7205e
...
am: 178b010713
2017-11-11 01:06:15 +00:00
178b010713
Merge "fastboot: show how long extraction takes."
...
am: 0626f7205e
2017-11-11 01:04:43 +00:00
0626f7205e
Merge "fastboot: show how long extraction takes."
2017-11-11 00:59:29 +00:00
e77bdeb74d
Merge "Move libcutils source to C++." am: d2ce2f4f45 am: ba3b6a2851
...
am: 4320727b68
2017-11-11 00:43:22 +00:00
yaochen