Merge "Log correct number of whitelisted packages." into qt-dev am: fefd66a530

am: f10dc043bb Change-Id: Iabb703e04ed3664d55b8265646e1c2ecb8d09dd1
2019-06-19 03:58:09 -07:00
parent 0eb6cf764c f10dc043bb
commit af6720c269
1 changed files with 1 additions and 1 deletions
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -6443,7 +6443,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
                    .setAdmin(admin)
                    .setStrings(vpnPackage)
                    .setBoolean(lockdown)
-                    .setInt(/* number of vpn packages */ 0)
+                    .setInt(lockdownWhitelist != null ? lockdownWhitelist.size() : 0)
                    .write();
        } finally {
            mInjector.binderRestoreCallingIdentity(token);