forked from AospExtended/platform_frameworks_base
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move Inet[4]AddressUtils to libs/net
The classes should not be picked up from frameworks/base, as they are part of several mainline modules. Also refine comments in DhcpResults following feedback in previous change. Bug: 151052811 Test: m; manual: flashed, wifi and telephony working Test: atest NetworkStackCoverageTests Change-Id: I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f
- Loading branch information
Showing
15 changed files
with
29 additions
and
257 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,11 @@ | ||
# These must be kept in sync with the framework-tethering-shared-srcs filegroup. | ||
# If there are files in that filegroup that do not appear here, the classes in the | ||
# Classes from the framework-tethering-shared-srcs filegroup. | ||
# If there are files in that filegroup that are not covered below, the classes in the | ||
# module will be overwritten by the ones in the framework. | ||
# Don't jar-jar the entire package because tethering still use some internal classes | ||
# (like TrafficStatsConstants in com.android.internal.util) | ||
# TODO: simply these when tethering is built as system_current. | ||
rule com.android.internal.util.BitUtils* com.android.networkstack.tethering.util.BitUtils@1 | ||
rule com.android.internal.util.IndentingPrintWriter.java* com.android.networkstack.tethering.util.IndentingPrintWriter.java@1 | ||
rule com.android.internal.util.IState.java* com.android.networkstack.tethering.util.IState.java@1 | ||
rule com.android.internal.util.MessageUtils* com.android.networkstack.tethering.util.MessageUtils@1 | ||
rule com.android.internal.util.State* com.android.networkstack.tethering.util.State@1 | ||
rule com.android.internal.util.StateMachine* com.android.networkstack.tethering.util.StateMachine@1 | ||
rule com.android.internal.util.TrafficStatsConstants* com.android.networkstack.tethering.util.TrafficStatsConstants@1 | ||
|
||
rule com.android.internal.util.** com.android.networkstack.tethering.util.@1 | ||
rule android.net.LocalLog* com.android.networkstack.tethering.LocalLog@1 | ||
|
||
rule android.net.shared.Inet4AddressUtils* com.android.networkstack.tethering.shared.Inet4AddressUtils@1 | ||
|
||
# Classes from net-utils-framework-common | ||
rule com.android.net.module.util.** com.android.networkstack.tethering.util.@1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.