commit fe5fd53865070b027bdbc834ede9d73e51b40569
author Sarah Chin <sarahchin@google.com> Wed Mar 03 20:24:13 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 03 20:24:13 2021 +0000
tree f73f69b3476cfc75c7bab491007589befb4e0489
parent bae12d75239b4336fd50c7d4a3b18afac302dfbe
parent 65c1964746058ecd1c8f091cab79150fbc6664f4

[automerger skipped] Merge "APIs for 5G slicing" am: 08b9f41364 am: 65c1964746 am: 770d3084d9 -s ours

am skip reason: Change-Id I7433976bfe25bcb2af85ffb9338959cbcc9f42f3 with SHA-1 e7ec282eee is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c13c91ef58cc52bceac6214aa3fef6f7802fe78

framework/Android.bp

diff --git a/framework/Android.bp b/framework/Android.bp
index 9da27d2..86b85e8 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 66e7da4..39ec2ed 100644
--- a/framework/src/android/net/ConnectivityManager.java
+++ b/framework/src/android/net/ConnectivityManager.java
@@ -2256,7 +2256,7 @@
             @NonNull String callingPackage, @Nullable String callingAttributionTag,
             boolean throwException) {
         return Settings.checkAndNoteWriteSettingsOperation(context, uid, callingPackage,
-                throwException);
+                callingAttributionTag, throwException);
     }
 
     /**