summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphirasit <phirasit@google.com>2024-04-09 23:51:21 +0000
committerJag Ghoshal <jagghoshal@google.com>2024-04-10 21:10:29 +0000
commit7cf366dffc4a3de8158f7a8bc565b9d18d3edf8c (patch)
treed102dbed339c5e476ad524e464e73da3a288c2ba
parente7af7b002faa5370973c581445efd9d5d32600a6 (diff)
downloadsdk-7cf366dffc4a3de8158f7a8bc565b9d18d3edf8c.tar.gz
Update android-incompatible.txt with latest API update
There is a recent Connectivity API update aosp/2953588 which impacts the Connectivity SDK prebuilt drop on udc-thgtv-dev. Technically, this API change isn't incompatible. However, the metalava tool doesn't support this kind of change until aosp/2692268 which is not present on this branch. The effort to backport the metalava change is too much compared to just waive this issue from the baseline file. Bug: 325859633 Test: m checkapi with the latest Tethering drop ab/11481658 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:130d27588504b1224bd08f7be89ca3ff9e512bfb) Merged-In: Iaac6e2752b0324dd0a3430b9159ad2e6b3524eff Merged-In: Ic486d2df3d750e183285682f2cbe57f9e80da7b5 Change-Id: Iaac6e2752b0324dd0a3430b9159ad2e6b3524eff
-rw-r--r--34/system/api/android-incompatibilities.txt14
-rw-r--r--34/system/api/framework-tethering-incompatibilities.txt13
2 files changed, 27 insertions, 0 deletions
diff --git a/34/system/api/android-incompatibilities.txt b/34/system/api/android-incompatibilities.txt
index 2b8649852..3a04010a1 100644
--- a/34/system/api/android-incompatibilities.txt
+++ b/34/system/api/android-incompatibilities.txt
@@ -64,3 +64,17 @@ RemovedMethod: android.content.ContextWrapper#sendBroadcast(android.content.Inte
Removed method android.content.ContextWrapper.sendBroadcast(android.content.Intent,String,android.os.Bundle)
RemovedMethod: android.content.ContextWrapper#sendOrderedBroadcast(android.content.Intent, String, android.os.Bundle, android.content.BroadcastReceiver, android.os.Handler, int, String, android.os.Bundle):
Removed method android.content.ContextWrapper.sendOrderedBroadcast(android.content.Intent,String,android.os.Bundle,android.content.BroadcastReceiver,android.os.Handler,int,String,android.os.Bundle)
+
+
+AddedFinal: android.net.TetheringManager.TetheringRequest#getClientStaticIpv4Address():
+ Method android.net.TetheringManager.TetheringRequest.getClientStaticIpv4Address has added 'final' qualifier
+AddedFinal: android.net.TetheringManager.TetheringRequest#getConnectivityScope():
+ Method android.net.TetheringManager.TetheringRequest.getConnectivityScope has added 'final' qualifier
+AddedFinal: android.net.TetheringManager.TetheringRequest#getLocalIpv4Address():
+ Method android.net.TetheringManager.TetheringRequest.getLocalIpv4Address has added 'final' qualifier
+AddedFinal: android.net.TetheringManager.TetheringRequest#getShouldShowEntitlementUi():
+ Method android.net.TetheringManager.TetheringRequest.getShouldShowEntitlementUi has added 'final' qualifier
+AddedFinal: android.net.TetheringManager.TetheringRequest#getTetheringType():
+ Method android.net.TetheringManager.TetheringRequest.getTetheringType has added 'final' qualifier
+AddedFinal: android.net.TetheringManager.TetheringRequest#isExemptFromEntitlementCheck():
+ Method android.net.TetheringManager.TetheringRequest.isExemptFromEntitlementCheck has added 'final' qualifier
diff --git a/34/system/api/framework-tethering-incompatibilities.txt b/34/system/api/framework-tethering-incompatibilities.txt
new file mode 100644
index 000000000..74f24d8be
--- /dev/null
+++ b/34/system/api/framework-tethering-incompatibilities.txt
@@ -0,0 +1,13 @@
+// Baseline format: 1.0
+AddedFinal: android.net.TetheringManager.TetheringRequest#getClientStaticIpv4Address():
+ Method android.net.TetheringManager.TetheringRequest.getClientStaticIpv4Address has added 'final' qualifier
+AddedFinal: android.net.TetheringManager.TetheringRequest#getConnectivityScope():
+ Method android.net.TetheringManager.TetheringRequest.getConnectivityScope has added 'final' qualifier
+AddedFinal: android.net.TetheringManager.TetheringRequest#getLocalIpv4Address():
+ Method android.net.TetheringManager.TetheringRequest.getLocalIpv4Address has added 'final' qualifier
+AddedFinal: android.net.TetheringManager.TetheringRequest#getShouldShowEntitlementUi():
+ Method android.net.TetheringManager.TetheringRequest.getShouldShowEntitlementUi has added 'final' qualifier
+AddedFinal: android.net.TetheringManager.TetheringRequest#getTetheringType():
+ Method android.net.TetheringManager.TetheringRequest.getTetheringType has added 'final' qualifier
+AddedFinal: android.net.TetheringManager.TetheringRequest#isExemptFromEntitlementCheck():
+ Method android.net.TetheringManager.TetheringRequest.isExemptFromEntitlementCheck has added 'final' qualifier