diff options
| author | Ryan Savitski <rsavitski@google.com> | 2022-07-06 18:48:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-07-06 18:48:22 +0000 |
| commit | b3b076ad30ea21c033b6798efd55c337e274279a (patch) | |
| tree | e452a0715a179a89ff350983509d755af4920f8d | |
| parent | 0c229b624a49282b146f7f1786ede7237bd9f0fd (diff) | |
| parent | 938185d82b7df7e8f5d7473294bf00cf058b1009 (diff) | |
| download | perfetto-b3b076ad30ea21c033b6798efd55c337e274279a.tar.gz | |
Revert "perfetto: Allow to profile system server on user" am: 257fdf188f am: 938185d82b
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/perfetto/+/19170127
Change-Id: Id336ecf12a36d2c8280a442ec290ac1520859d10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | src/profiling/common/producer_support.cc | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/profiling/common/producer_support.cc b/src/profiling/common/producer_support.cc index 544d3c5a2..8ab0b42a6 100644 --- a/src/profiling/common/producer_support.cc +++ b/src/profiling/common/producer_support.cc @@ -98,25 +98,18 @@ bool CanProfileAndroid(const DataSourceConfig& ds_config, const std::string& packages_list_path) { // These constants are replicated from libcutils android_filesystem_config.h, // to allow for building and testing the profilers outside the android tree. - constexpr auto kAidSystem = 1000; // AID_SYSTEM - constexpr auto kAidUserOffset = 100000; // AID_USER_OFFSET - constexpr auto kAidAppStart = 10000; // AID_APP_START - constexpr auto kAidAppEnd = 19999; // AID_APP_END - constexpr auto kAidSdkSandboxStart = 20000; // AID_SDK_SANDBOX_PROCESS_START - constexpr auto kAidSdkSandboxEnd = 29999; // AID_SDK_SANDBOX_PROCESS_END - constexpr auto kAidIsolatedStart = 90000; // AID_ISOLATED_START - constexpr auto kAidIsolatedEnd = 99999; // AID_ISOLATED_END + constexpr auto kAidUserOffset = 100000; // AID_USER_OFFSET + constexpr auto kAidAppStart = 10000; // AID_APP_START + constexpr auto kAidAppEnd = 19999; // AID_APP_END + constexpr auto kAidSdkSandboxStart = 20000; // AID_SDK_SANDBOX_PROCESS_START + constexpr auto kAidSdkSandboxEnd = 29999; // AID_SDK_SANDBOX_PROCESS_END + constexpr auto kAidIsolatedStart = 90000; // AID_ISOLATED_START + constexpr auto kAidIsolatedEnd = 99999; // AID_ISOLATED_END if (!build_type.empty() && build_type != "user") { return true; } - // TODO(b/217368496): remove this. - if (uid == kAidSystem) { - return ds_config.session_initiator() == - DataSourceConfig::SESSION_INITIATOR_TRUSTED_SYSTEM; - } - uint64_t uid_without_profile = uid % kAidUserOffset; uint64_t uid_for_lookup = 0; if (uid_without_profile >= kAidAppStart && |