Commit Graph

47639 Commits

Author SHA1 Message Date
Tej Singh f61390dafa Merge "stats_event_list changes for statsd mainline api" am: f95468d329
am: 930d04056f

Change-Id: I57b8bb3a2281c635a495cfd5d34afb5cb9f7596b
2019-04-02 18:49:49 -07:00
Vic Yang 6d9d411968 Merge "Version liblog LL-NDK library" am: 92c9e8ab7f
am: 10c9004bf7

Change-Id: If13677d5a64bae5d93d58ef81a0124e5ee3fdc7a
2019-04-02 18:41:25 -07:00
Tej Singh 930d04056f Merge "stats_event_list changes for statsd mainline api"
am: f95468d329

Change-Id: Ibd5d278f6af65a3c63bb97f6e5cf1b7b60180e4d
2019-04-02 18:15:12 -07:00
Vic Yang 10c9004bf7 Merge "Version liblog LL-NDK library"
am: 92c9e8ab7f

Change-Id: I1e5b4d1da1d186b8b5a7b331126a0dde2d39c48b
2019-04-02 18:06:54 -07:00
Treehugger Robot f95468d329 Merge "stats_event_list changes for statsd mainline api" 2019-04-02 23:18:00 +00:00
Treehugger Robot 92c9e8ab7f Merge "Version liblog LL-NDK library" 2019-04-02 23:16:22 +00:00
Mark Salyzyn a8611c0982 Merge "fs_mgr: remount: system is root" am: 2b8e96bd64
am: 81e08d4c98

Change-Id: I31b0c419f36eb1019e8a981bd7a181c765d4a86f
2019-04-02 15:25:04 -07:00
Josh Gao 8cecb02a2c Merge "adbd: demote CHECKs to warning logs." am: 16f4a033c3
am: 887e8f4bfd

Change-Id: Ic950499166a3e520253eed9a18ac46671c32908c
2019-04-02 15:24:05 -07:00
Mark Salyzyn 81e08d4c98 Merge "fs_mgr: remount: system is root"
am: 2b8e96bd64

Change-Id: I09e8809aaae61706a1b92139fa8127c1a3d67ff9
2019-04-02 15:18:38 -07:00
Tej Singh a7c1ff6906 stats_event_list changes for statsd mainline api
Cherry pick to aosp.
stats_event_list changes for creating a generic api for statsd mainline
logging.

Test: builds
Test: existing logs continue to flow
Change-Id: I4163edc80ffcca61db7ab2a1e14ae8c14aab2347
Merged-In: I4163edc80ffcca61db7ab2a1e14ae8c14aab2347
(cherry picked from commit 4c2f079dad)
2019-04-02 15:01:57 -07:00
Treehugger Robot 2b8e96bd64 Merge "fs_mgr: remount: system is root" 2019-04-02 21:54:34 +00:00
Josh Gao 887e8f4bfd Merge "adbd: demote CHECKs to warning logs."
am: 16f4a033c3

Change-Id: I15d430f0296231c56bd8e2a9826e2ede962145c6
2019-04-02 14:41:26 -07:00
Josh Gao 16f4a033c3 Merge "adbd: demote CHECKs to warning logs." 2019-04-02 21:30:15 +00:00
Mark Salyzyn b18aba0a9f fs_mgr: remount: system is root
For devices without overlayfs and system is root (Hikey, Hikey960)
correct "/system" to "/" if that is the mount point.

Test: adb-remount-test.sh
Bug: 129720614
Change-Id: I3bdbd5ea7b70d03477055e60521d8132b486c904
2019-04-02 21:22:27 +00:00
David Anderson 7f724ad4e9 Merge "Fix device mapper name clashes on non-A/B devices." am: 97d1fccd5b
am: d7874a2fa9

Change-Id: I5ea972dd4e28dc476a49ac623fd03004c4a21ee1
2019-04-02 14:08:25 -07:00
David Anderson d7874a2fa9 Merge "Fix device mapper name clashes on non-A/B devices."
am: 97d1fccd5b

Change-Id: Id47e289674eee3c17f0a267544e75cc48213fcb1
2019-04-02 14:05:20 -07:00
Nick Kralevich 6b38459ee5 Merge "Revert "relax /system/bin directory permissions"" am: 98880af580
am: 88b15b2b7c

Change-Id: I6781355d5502edf84dd5e493d532392b28f4aee3
2019-04-02 14:04:43 -07:00
David Anderson 97d1fccd5b Merge "Fix device mapper name clashes on non-A/B devices." 2019-04-02 20:16:36 +00:00
Nick Kralevich 88b15b2b7c Merge "Revert "relax /system/bin directory permissions""
am: 98880af580

Change-Id: Iee04f5127100e2115a8612d5c5a82f758b6bce69
2019-04-02 13:16:34 -07:00
Treehugger Robot 98880af580 Merge "Revert "relax /system/bin directory permissions"" 2019-04-02 19:48:26 +00:00
Vic Yang 270f65ffdb Version liblog LL-NDK library
The system version of liblog has been versioned.  Do the same for
LL-NDK verison as well.

Test: Build and examine the dynamic symbols.
Change-Id: Ie63cc845c891d9372fb1990e713b3fe4f0f2f723
2019-04-02 12:22:50 -07:00
Josh Gao 87afd52fb5 adbd: demote CHECKs to warning logs.
It seems like we don't actually always get these events in order, so
demote them to a log and restart the connection instead of aborting.

Bug: http://b/129464137
Test: mma
Change-Id: I7dffbf62f9dea665cf9f9f9e1bd18d444b6905ec
2019-04-02 10:56:07 -07:00
Nick Kralevich 8d1b43bbf4 Revert "relax /system/bin directory permissions"
It appears Chase has fixed their app, so we no longer need to keep these
permissions relaxed.

This reverts commit 53842f8a90.

Bug: 119605322
Test: compiles and boots
Change-Id: Iba5e9ecd685eb386997a5e92638b8a1b5943ad4b
2019-04-02 08:54:17 -07:00
Christopher Ferris 30aae74079 Merge "Add minimal support for Dwarf 5." am: e44bf1a4a2
am: b0f5022fad

Change-Id: Ib6ebe447f753ab67442ec63158bea9c52d657dfa
2019-04-02 07:51:24 -07:00
Christopher Ferris b0f5022fad Merge "Add minimal support for Dwarf 5."
am: e44bf1a4a2

Change-Id: I7cac4a4fbc8d5e77c9642cf2909c962bb12bad7c
2019-04-02 07:47:13 -07:00
Christopher Ferris e44bf1a4a2 Merge "Add minimal support for Dwarf 5." 2019-04-02 14:39:23 +00:00
Jiyong Park deeedf9783 Merge "Search rs namespace prior to vndk namespace" am: 5ccb6a5cdc
am: 8b524e9b45

Change-Id: I50a3280e0fcd1dd30535c32479ca452f7f3f31f1
2019-04-02 01:42:56 -07:00
Jiyong Park 8b524e9b45 Merge "Search rs namespace prior to vndk namespace"
am: 5ccb6a5cdc

Change-Id: I646ddc21e3965ffe3d9926a3c774d941291e5f5f
2019-04-02 01:38:46 -07:00
Treehugger Robot 5ccb6a5cdc Merge "Search rs namespace prior to vndk namespace" 2019-04-02 08:24:42 +00:00
Elliott Hughes 2dfbda57d1 Merge "libutils: more detailed logging." am: ee4cc04429
am: 0a9c29ddfb

Change-Id: I5cb7362e82681d55ce671ec4599c34368f43f5dd
2019-04-01 20:11:39 -07:00
Elliott Hughes 0a9c29ddfb Merge "libutils: more detailed logging."
am: ee4cc04429

Change-Id: I20187bbdd8363248c4ede8821723f4f71ec7a9dd
2019-04-01 20:03:30 -07:00
Treehugger Robot ee4cc04429 Merge "libutils: more detailed logging." 2019-04-02 02:45:41 +00:00
Jiyong Park fa4971f3c3 Search rs namespace prior to vndk namespace
With the recent change that removed get_exported_namespace out of libdl,
the RenderScript SP-HAL stopped using android_dlopen_ext which it used
to load libRS_internal.so in the "rs" namespace. Instead, it now falls
back to the ordinary dlopen() call. The dlopen() call tries to load the
lib in the current namespace (which is sphal) and then falls back to the
linked namespaces: default, vndk, rs.

The problem is that rs is listed as the last namespace and therefore the
linker tries the namespace only when it failed to load the library in
other namespaces: default and vndk. libRS_internal.so is accessible to
both vndk and rs namespaces. So, the dlopen() call always goes into the
vndk namespace and there is no chance for the lib to be loaded in the rs
namespace.

To fix the problem, the rs namespace is placed before vndk so that the
namespace is tried first.

Bug: 129550847
Test: runtest -x cts/tests/camera/src/android/hardware/
Change-Id: Idafc32f8a309dd12495768931d7ea17a2f791c50
2019-04-02 02:43:23 +00:00
Elliott Hughes c5134f93f1 Merge "grep: fix ASan heap-buffer-overflow." am: acf9cfbf80
am: 2b0467de5d

Change-Id: Icbb7ecb75e0b652a8088f3127bf19e09c46c834e
2019-04-01 17:55:17 -07:00
Steven Moreland a57b2aa8fe Merge "libutilscallstack: removed from darwin" am: 0e77120dfd
am: 061a663555

Change-Id: I22c6beffb7f5e18c132541e4e2d5f292a34ef3ea
2019-04-01 17:53:45 -07:00
Elliott Hughes 2b0467de5d Merge "grep: fix ASan heap-buffer-overflow."
am: acf9cfbf80

Change-Id: Ifcf8b3cf89e3f8b6d703e2a73cac7b036d013318
2019-04-01 17:45:33 -07:00
Steven Moreland 061a663555 Merge "libutilscallstack: removed from darwin"
am: 0e77120dfd

Change-Id: I104b2986f843224b95d63d9a51b6dad9eccab2fb
2019-04-01 17:40:41 -07:00
Elliott Hughes acf9cfbf80 Merge "grep: fix ASan heap-buffer-overflow." 2019-04-02 00:39:42 +00:00
Steven Moreland 0e77120dfd Merge "libutilscallstack: removed from darwin" 2019-04-02 00:23:30 +00:00
Christopher Ferris c312c9ac15 Add minimal support for Dwarf 5.
This is not full support for dwarf 5, this merely treats a Dwarf 5
version as Dwarf 4. There are new dwarf ops that are not supported yet,
but this minimally support should allow unwinding to work if those
ops are not present.

Bug: 127355724

Test: New Unit tests pass.
Change-Id: I35b24fbcb15a64acd49e1e0b6890dff4456ee6fd
2019-04-01 16:56:09 -07:00
Josh Gao e5a5a5b18f Merge "adb: make `adb reconnect` perform a USB reset." am: 3b25a17a8a
am: 0d9d5ef1bb

Change-Id: Id5b2114e90661025563e2eae19567a1eef13e779
2019-04-01 15:18:12 -07:00
Steven Moreland d33a2ee172 libutilscallstack: removed from darwin
libbacktrace only includes its Backtrace.cpp on the linux targets
but not windows or darwin targets. So, both should be disabled.

Previously, libutilscallstack was only ever a static library on
these platforms. Since nothing provided the symbols, these targets
couldn't have been used.

Fixes: 129636352
Test: m

Change-Id: I3f0b09e1d67c485b3ea57f58d1220d9516b326f2
2019-04-01 15:16:13 -07:00
Josh Gao 0d9d5ef1bb Merge "adb: make `adb reconnect` perform a USB reset."
am: 3b25a17a8a

Change-Id: Ic952e10f80684614a0f9da795c730bb52be5a259
2019-04-01 15:12:04 -07:00
Josh Gao 3b25a17a8a Merge "adb: make `adb reconnect` perform a USB reset." 2019-04-01 21:42:57 +00:00
Elliott Hughes fd12160087 libutils: more detailed logging.
The question arose on the bug of whether this is a legit errno or just
a stale value.

Bug: http://b/129139241
Test: ran tests
Change-Id: I486176496028f04d4fcccdd0b29a3df6b13849c9
2019-04-01 12:24:19 -07:00
Elliott Hughes bfd9d63c74 grep: fix ASan heap-buffer-overflow.
Like the regular fgetln(), grep_fgetln() doesn't NUL-terminate the
string, which regexec() doesn't like. ASan just gained the ability to
intercept regexec(), which is why we didn't find this previously.

Bug: http://b/129089665
Test: adb shell grep -R /system -e "abc"
Test: toybox grep tests
Change-Id: Id707cea66a873b83bd763a3dcdf726ac7d062ce0
2019-04-01 10:58:38 -07:00
Jaegeuk Kim e727f6612c Merge "init.rc: tune F2FS to be aligned to system settings" am: 99ba4b36e8
am: d2060b771d

Change-Id: Ic3a3a07eebbc66efef9a15db17b2ca5b8d2a15c8
2019-04-01 09:27:02 -07:00
Jaegeuk Kim d2060b771d Merge "init.rc: tune F2FS to be aligned to system settings"
am: 99ba4b36e8

Change-Id: I1321d587c6bfc5277a9ad16d74ef523e6bd9a789
2019-04-01 09:22:49 -07:00
Treehugger Robot 99ba4b36e8 Merge "init.rc: tune F2FS to be aligned to system settings" 2019-04-01 16:10:28 +00:00
Bowgo Tsai 7e4834ce7f Merge "Adding GSI public keys" am: ddaf736a88
am: aea89ed3ea

Change-Id: I3736607f4d8e4239475f792f81cee161258eb9eb
2019-04-01 07:05:42 -07:00