From 3483914b865307fb82ed67b9a9403bd1865d0d7b Mon Sep 17 00:00:00 2001 From: Adam Bookatz Date: Mon, 10 Feb 2020 13:56:46 -0800 Subject: [PATCH] Reword USER_TYPE_PACKAGE_WHITELIST_MODE_LOG UserSystemPackageInstaller's log mode doesn't currently log each non-whitelisted app's start (although it may in the future), so the documentation should be updated. It should be purposefully loose since the exact logging is likely to change in the future. Test: N/A. Just documentation. Change-Id: Id7c46339d2b884d01e1e2a32d619a3a03a33958e --- core/res/res/values/config.xml | 2 +- .../java/com/android/server/pm/UserSystemPackageInstaller.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 245aed1484f77..a834fca996f88 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2374,7 +2374,7 @@ type. These are flags and can be freely combined. 0 - disable whitelist (install all system packages; no logging) 1 - enforce (only install system packages if they are whitelisted) - 2 - log (log when a non-whitelisted package is run) + 2 - log (log non-whitelisted packages) 4 - any package not mentioned in the whitelist file is implicitly whitelisted on all users 8 - same as 4, but just for the SYSTEM user 16 - ignore OTAs (don't install system packages during OTAs) diff --git a/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java b/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java index 77bb48eadc41c..4c40448085ffd 100644 --- a/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java +++ b/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java @@ -89,7 +89,7 @@ class UserSystemPackageInstaller { *