Merge "Add var to enable/disable tethering next APEX"

This commit is contained in:
Remi NGUYEN VAN 2022-01-27 11:41:26 +00:00 • committed by Gerrit Code Review
commit e9370c5ef4

View file

@ -31,6 +31,7 @@ apex_defaults {
// package names and keys, so that apex will be unused anyway.
apps: ["TetheringNext"], // Replace to "Tethering" if ConnectivityNextEnableDefaults is false.
}
enable_tethering_next_apex = true
// This is a placeholder comment to avoid merge conflicts
// as the above target may have different "enabled" values
// depending on the branch
@ -141,6 +142,7 @@ override_apex {
name: "com.android.tethering.inprocess",
base: "com.android.tethering",
package_name: "com.android.tethering.inprocess",
enabled: enable_tethering_next_apex,
apps: [
"ServiceConnectivityResources",
"InProcessTethering",