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

am: 6e6bb06bfd Change-Id: I3bff0171c4c5404656b16e87b28a8c10b2a66ee6
2019-06-19 03:57:13 -07:00
parent 0eb6cf764c 6e6bb06bfd
commit 07a89fbf08
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);