commit f213ca1345211b6e550e638230bd66e628acb6be
author Chalard Jean <jchalard@google.com> Tue Jan 16 18:43:05 2018 +0900
committer Chalard Jean <jchalard@google.com> Tue Jan 23 21:38:00 2018 +0900
tree 1485e18c51f3c76f974b4b199dd60d4b9b1bbbbc
parent ecacd5e00bccb7896d0f7cf81115a503584bce43

Remove UID_RANGES_ADDED and REMOVED.

Test: runtest frameworks-net
Test: also tested with VPN app
Test: also cts passing
Change-Id: I3530030996daeba05a8f2fffc5c6e21ed62e3f40

services/core/java/com/android/server/connectivity/Vpn.java

diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java
index e7c1f0a..6960abb 100644
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -1139,11 +1139,7 @@
                         addUserToRanges(existingRanges, userHandle, mConfig.allowedApplications,
                                 mConfig.disallowedApplications);
                         mNetworkCapabilities.setUids(existingRanges);
-                        if (mNetworkAgent != null) {
-                            final List<UidRange> ranges =
-                                uidRangesForUser(userHandle, mNetworkCapabilities.getUids());
-                            mNetworkAgent.addUidRanges(ranges.toArray(new UidRange[ranges.size()]));
-                        }
+                        updateCapabilities();
                     } catch (Exception e) {
                         Log.wtf(TAG, "Failed to add restricted user to owner", e);
                     }
@@ -1163,12 +1159,9 @@
                     try {
                         final List<UidRange> removedRanges =
                             uidRangesForUser(userHandle, existingRanges);
-                        if (mNetworkAgent != null) {
-                            mNetworkAgent.removeUidRanges(removedRanges.toArray(
-                                new UidRange[removedRanges.size()]));
-                        }
                         existingRanges.removeAll(removedRanges);
                         mNetworkCapabilities.setUids(existingRanges);
+                        updateCapabilities();
                     } catch (Exception e) {
                         Log.wtf(TAG, "Failed to remove restricted user to owner", e);
                     }