tree aabbd03e594ad3c210ceeaf5410cc0f65259c088
parent b020e552d834171e3bd844d342c7c4ef2b9320c6
author Jean Chalard <jchalard@google.com> 1639481439 +0000
committer Chiachang Wang <chiachangwang@google.com> 1645428086 +0000

Remove NetworkCapabilities#combine*

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1919248

This removes methods in NetworkCapabilities that have been
removed from the mainline module in aosp/1919248, and as such
the code no longer has these private methods (including on S-V2
because it has the module) and we can't test for them.

For this reason these tests should be removed, as they won't
pass on a device with a recent module, and they have served
no purpose for a long time anyway.

Test: FrameworksNetTests
      m
Bug: 218802331
Merged-In: Ia69c20afa16c2153839891f6e33331caa9da33ff
Merged-In: I58462f6d0303803ffd43333b67865c57edef39a3
Change-Id: Id5cca1972e115aeeb1061594dda07e39147630ac
(cherry picked from commit 28061cd1dd1c3153ff96e40f13c23118cd598acd)