Commit graph

49666 commits

Author SHA1 Message Date
yaochen
ae740d3bf6 [automerger skipped] Merge "Report last atom tag of the failed stats log." am: b7080aab9d am: 4f0c63c4f2
am: b3b1f10fff -s ours
am skip reason: change_id I4de61a2eea393e8518cb76147598778293440a81 with SHA1 cf776d9b83 is in history

Change-Id: Id47d1882263a2b47ca8bb8f2297a7db17c9cc9e2
2019-04-02 19:45:16 -07:00
Tej Singh
09989c3ebe [automerger skipped] Merge "stats_event_list changes for statsd mainline api" am: f95468d329 am: 930d04056f
am: f61390dafa -s ours
am skip reason: change_id I4163edc80ffcca61db7ab2a1e14ae8c14aab2347 with SHA1 4c2f079dad is in history

Change-Id: I2257736a6b71136cb46a415f726c46e0747d3bea
2019-04-02 19:23:10 -07:00
Vic Yang
8160c08d49 Merge "Version liblog LL-NDK library" am: 92c9e8ab7f am: 10c9004bf7
am: 6d9d411968

Change-Id: Ia626cd2248421450a2a82054d3a857cba8097062
2019-04-02 19:07:57 -07:00
yaochen
b3b1f10fff Merge "Report last atom tag of the failed stats log." am: b7080aab9d
am: 4f0c63c4f2

Change-Id: Idae39ddf564c5c4ffe0ac1b6eb7ebf9bcafce3ee
2019-04-02 18:51:08 -07:00
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
yaochen
4f0c63c4f2 Merge "Report last atom tag of the failed stats log."
am: b7080aab9d

Change-Id: I1dd7df47f782032ddf7ab1a0e325393b3a14a052
2019-04-02 18:16:20 -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
yaochen
b7080aab9d Merge "Report last atom tag of the failed stats log." 2019-04-02 23:18:14 +00: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
e3588d8b1b Merge "fs_mgr: remount: system is root" am: 2b8e96bd64 am: 81e08d4c98
am: a8611c0982

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

Change-Id: Id2ab6435ad2953cd4bb6348fc5166a07a598832f
2019-04-02 15:27:18 -07: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
David Anderson
e9d721e2f1 Merge "Fix device mapper name clashes on non-A/B devices." am: 97d1fccd5b am: d7874a2fa9
am: 7f724ad4e9

Change-Id: I6fb8145db60fbb27b158908e5bb40cc2120315ce
2019-04-02 15:08:58 -07:00
Nick Kralevich
eed675688d Merge "Revert "relax /system/bin directory permissions"" am: 98880af580 am: 88b15b2b7c
am: 6b38459ee5

Change-Id: I44ec7363697f52ee55284343f4f4f473b34de9ab
2019-04-02 15:05:19 -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
Yao Chen
14c6db6d65 Report last atom tag of the failed stats log.
Test: manually tested with statsd

Change-Id: I4de61a2eea393e8518cb76147598778293440a81
Merged-In: I4de61a2eea393e8518cb76147598778293440a81
(cherry picked from commit cf776d9b83)
2019-04-02 14:26:01 -07: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
ca3c8f7788 Merge "Add minimal support for Dwarf 5." am: e44bf1a4a2 am: b0f5022fad
am: 30aae74079

Change-Id: I57ac38379c69efc86d70448726ec5247cd770e12
2019-04-02 08:00:34 -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
28429ff8c1 Merge "Search rs namespace prior to vndk namespace" am: 5ccb6a5cdc am: 8b524e9b45
am: deeedf9783

Change-Id: Id1f3e8d310bd1b8f3b7c67e0ab7485d96fd541bb
2019-04-02 01:47:06 -07: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
370ad05c32 Merge "libutils: more detailed logging." am: ee4cc04429 am: 0a9c29ddfb
am: 2dfbda57d1

Change-Id: Ife4ac041f5ab8309b7c4c42ca11ed747dcb9dc52
2019-04-01 20:21:57 -07: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
e18b348e2d Merge "grep: fix ASan heap-buffer-overflow." am: acf9cfbf80 am: 2b0467de5d
am: c5134f93f1

Change-Id: I4611cb966f736bf4a69c2bfa14ed86b396c54661
2019-04-01 18:31:05 -07:00
Steven Moreland
8b0ab6c982 Merge "libutilscallstack: removed from darwin" am: 0e77120dfd am: 061a663555
am: a57b2aa8fe

Change-Id: I1873e614e0525615ddeb4f5916bfb149c60dc6e5
2019-04-01 18:29:47 -07: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