commit 33ae23768649441dda87d5754af791fdd7e57a2d
author Treehugger Robot <treehugger-gerrit@google.com> Tue Feb 23 22:56:21 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 23 22:56:21 2021 +0000
tree 1821d80e893744e860f6c4c7caeb1a2c74ceed4e
parent 727b672919bf964d1ae2ba03d8be830619f3e869
parent bdbd425a3b26b980bd8a22954047f0efd770b51f

Merge "Revert "Revert "Delete VPN methods in ConnectivityManager.""" am: 10de86f5e5 am: bdbd425a3b am: ec81e831f6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597635

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff8ce4686f52a73c4a5a2d66218c9a6e3e883a3b

framework/Android.bp

diff --git a/framework/Android.bp b/framework/Android.bp
index ffca971..c7e261c 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -23,7 +23,6 @@
     default_applicable_licenses: ["frameworks_base_license"],
 }
 
-// TODO: use a java_library in the bootclasspath instead
 filegroup {
     name: "framework-connectivity-internal-sources",
     srcs: [

framework/src/android/net/ConnectivityManager.java

diff --git a/framework/src/android/net/ConnectivityManager.java b/framework/src/android/net/ConnectivityManager.java
index 6273f4b..e7ab0a1 100644
--- a/framework/src/android/net/ConnectivityManager.java
+++ b/framework/src/android/net/ConnectivityManager.java
@@ -2267,7 +2267,7 @@
             int uid, @NonNull String callingPackage, @Nullable String callingAttributionTag,
             boolean throwException) {
         return Settings.checkAndNoteChangeNetworkStateOperation(context, uid, callingPackage,
-                throwException);
+                callingAttributionTag, throwException);
     }
 
     /**
@@ -2281,7 +2281,7 @@
             @NonNull String callingPackage, @Nullable String callingAttributionTag,
             boolean throwException) {
         return Settings.checkAndNoteWriteSettingsOperation(context, uid, callingPackage,
-                throwException);
+                callingAttributionTag, throwException);
     }
 
     /**