ec8c5511afb4a1f6e1f1b300ef7ac5263a990cc1 - platform_frameworks_base

commit	ec8c5511afb4a1f6e1f1b300ef7ac5263a990cc1	[log] [tgz]
author	Wenhao Wang <wenhaowang@google.com>	Wed Feb 02 13:20:00 2022 -0800
committer	Wenhao Wang <wenhaowang@google.com>	Wed Feb 02 16:08:19 2022 -0800
tree	b48a6b798ca27177167cb8da4e99390fa3a5c857
parent	0bfb83dbe52b247e4a149322f04e704cc6a87094 [diff]

Revert "Revert "User consent for Logcat data access""

This reverts commit d7138b445c54248b50dd879d08798e71cc1e94b4.
This patch fixes the breaking caused by
commit b4f8ed9bb8a94575989d689d37be523ee99bc589.

It's a workaround patch. The upcoming patch will have solid fix.

Bug: 193708292
Bug: 217482811
Bug: 217495147
Test: atest PlatformRuleTests -- --abi x86_64
Test: atest FrameworksServicesTests -- --abi x86_64
Ignore-AOSP-First: pending fix for logcat privacy issue
Change-Id: If18086130599f0ae027d16ccbb7b5b5cd73f2e72

core/java/android/app/ActivityManagerInternal.java[diff]
core/java/android/os/logcat/ILogcatManagerService.aidl[diff]
core/res/AndroidManifest.xml[diff]
core/res/res/values/strings.xml[diff]
core/res/res/values/symbols.xml[diff]
services/core/java/com/android/server/am/ActivityManagerService.java[diff]
services/core/java/com/android/server/logcat/LogAccessConfirmationActivity.java[Added - diff]
services/core/java/com/android/server/logcat/LogcatManagerService.java[diff]

8 files changed