| commit | e5a4a9a078d03d35226d98b8c9f6e152abdec793 | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Thu Mar 18 10:42:10 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 18 10:42:10 2021 +0000 |
| tree | 8cea2c6a0f089aa7e71e5664ea61a818769db5de | |
| parent | 2c196b64870c7bfd4029df5ea696b3ae3e8deecc [diff] | |
| parent | efd24e0f3a33ac37a42a2b0e156c4b44675840eb [diff] |
[automerger skipped] Remove extra comment am: efd24e0f3a am: 79672e35a3 -s ours am skip reason: skip tag Change-Id I0c0daa91ef272a19c548cf55eb2f764c95f8f844 with SHA-1 bcea4c8e06 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13906655 Change-Id: Ia8523fc8557bea3d9635d23472e4301e9b43fde5
diff --git a/framework/src/android/net/ConnectivityManager.java b/framework/src/android/net/ConnectivityManager.java index a621233..ba5eb10 100644 --- a/framework/src/android/net/ConnectivityManager.java +++ b/framework/src/android/net/ConnectivityManager.java
@@ -2319,7 +2319,7 @@ @NonNull String callingPackage, @Nullable String callingAttributionTag, boolean throwException) { return Settings.checkAndNoteWriteSettingsOperation(context, uid, callingPackage, - throwException); + callingAttributionTag, throwException); } /**