[automerger skipped] Merge changes from topic "PSL_TelephonyCallback" am: e2e358f666 am: 4f453b8ad6 am: 4a8217abd9 -s ours
am skip reason: Change-Id Ia3b777b12142b104b5798804f50b34748f9bf28c with SHA-1 68d60cdb1a is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614981
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifaaf86e06bbd93df2b0d5265df41e055f6be9bad
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: [
diff --git a/framework/src/android/net/ConnectivityManager.java b/framework/src/android/net/ConnectivityManager.java
index 45ed317..bbf4559 100644
--- a/framework/src/android/net/ConnectivityManager.java
+++ b/framework/src/android/net/ConnectivityManager.java
@@ -2275,7 +2275,7 @@
@NonNull String callingPackage, @Nullable String callingAttributionTag,
boolean throwException) {
return Settings.checkAndNoteWriteSettingsOperation(context, uid, callingPackage,
- throwException);
+ callingAttributionTag, throwException);
}
/**