Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bfbadb2 authored by Adam Bookatz's avatar Adam Bookatz Committed by Android (Google) Code Review
Browse files

Merge "Reword USER_TYPE_PACKAGE_WHITELIST_MODE_LOG"

parents 63010999 3483914b

core/res/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -2351,7 +2351,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)

services/core/java/com/android/server/pm/UserSystemPackageInstaller.java

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ class UserSystemPackageInstaller { 
     * <ul>

     * <li> 0  - disable whitelist (install all system packages; no logging)</li>

     * <li> 1  - enforce (only install system packages if they are whitelisted)</li>

     * <li> 2  - log (log when a non-whitelisted package is run)</li>

     * <li> 2  - log (log non-whitelisted packages)</li>

     * <li> 4  - for all users: implicitly whitelist any package not mentioned in the whitelist</li>

     * <li> 8  - for SYSTEM: implicitly whitelist any package not mentioned in the whitelist</li>

     * <li> 16 - ignore OTAs (don't install system packages during OTAs)</li>