commit 4cd9ca834ba49ebd1d46a5786e0b6d9dca3e633a
author Nataniel Borges <natanieljr@google.com> Fri Feb 19 17:02:32 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 19 17:02:32 2021 +0000
tree b3a9f8b6cef421f7eaa7100b2791525befe2e192
parent aee047252260036a0184bad33d426f6d248418f3
parent 46f3a23d2863cdbbac9144b1de53a733c5d114ad

Merge "Revert "Delete VPN methods in ConnectivityManager."" am: fc15416480 am: 46f3a23d28 am: aa2b03ecea

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d80ea1c572a3eec58a67b0d7c4faa79b30c206a

framework/Android.bp

diff --git a/framework/Android.bp b/framework/Android.bp
index ffca971..73e1511 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -14,16 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "frameworks_base_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["frameworks_base_license"],
-}
-
-// TODO: use a java_library in the bootclasspath instead
 filegroup {
     name: "framework-connectivity-internal-sources",
     srcs: [
@@ -58,4 +48,4 @@
         "//frameworks/base",
         "//packages/modules/Connectivity:__subpackages__",
     ],
-}
+}
\ No newline at end of file

framework/src/android/net/ConnectivityManager.java

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

service/Android.bp

diff --git a/service/Android.bp b/service/Android.bp
index f20b89f..ed1716f 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -14,15 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "frameworks_base_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["frameworks_base_license"],
-}
-
 cc_library_shared {
     name: "libservice-connectivity",
     // TODO: build against the NDK (sdk_version: "30" for example)