Merge "Clean up T&C implementation" am: 1b3cd84d1c am: 6a810afd15 am: 064b340c56
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1583505
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I35f732fbfa73d8b207c0e1b22595d2fd0135152c
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: [
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);
}
/**