Merge "Add var to enable/disable tethering next APEX" am: e9370c5ef4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1962623 Change-Id: I5cf08bb97b66dbc1234bca87317125bddf51bffa
This commit is contained in:
@@ -31,6 +31,7 @@ apex_defaults {
|
|||||||
// package names and keys, so that apex will be unused anyway.
|
// package names and keys, so that apex will be unused anyway.
|
||||||
apps: ["Tethering"], // Replace to "Tethering" if ConnectivityNextEnableDefaults is false.
|
apps: ["Tethering"], // Replace to "Tethering" if ConnectivityNextEnableDefaults is false.
|
||||||
}
|
}
|
||||||
|
enable_tethering_next_apex = true
|
||||||
// This is a placeholder comment to avoid merge conflicts
|
// This is a placeholder comment to avoid merge conflicts
|
||||||
// as the above target may have different "enabled" values
|
// as the above target may have different "enabled" values
|
||||||
// depending on the branch
|
// depending on the branch
|
||||||
@@ -137,6 +138,7 @@ override_apex {
|
|||||||
name: "com.android.tethering.inprocess",
|
name: "com.android.tethering.inprocess",
|
||||||
base: "com.android.tethering",
|
base: "com.android.tethering",
|
||||||
package_name: "com.android.tethering.inprocess",
|
package_name: "com.android.tethering.inprocess",
|
||||||
|
enabled: enable_tethering_next_apex,
|
||||||
apps: [
|
apps: [
|
||||||
"ServiceConnectivityResources",
|
"ServiceConnectivityResources",
|
||||||
"InProcessTethering",
|
"InProcessTethering",
|
||||||
|
|||||||
Reference in New Issue
Block a user