Merge "UpsideDownCake is now 34" into main
diff --git a/staticlibs/device/com/android/net/module/util/DeviceConfigUtils.java b/staticlibs/device/com/android/net/module/util/DeviceConfigUtils.java
index bea227d..5edf1b9 100644
--- a/staticlibs/device/com/android/net/module/util/DeviceConfigUtils.java
+++ b/staticlibs/device/com/android/net/module/util/DeviceConfigUtils.java
@@ -335,15 +335,19 @@
/**
* Check whether one specific experimental feature in tethering module from {@link DeviceConfig}
- * is disabled by setting a non-zero value in the property.
+ * is not disabled. Feature can be disabled by setting a non-zero value in the property.
+ * If the feature is enabled by default and disabled by flag push (kill switch), this method
+ * should be used.
+ * If the feature is disabled by default and enabled by flag push,
+ * {@link #isFeatureEnabled(Context, String, String, String, boolean)} should be used.
*
* @param name The name of the property to look up.
- * @return true if this feature is force disabled, or false if not disabled.
+ * @return true if this feature is enabled, or false if disabled.
*/
- public static boolean isTetheringFeatureForceDisabled(String name) {
+ public static boolean isTetheringFeatureNotChickenedOut(String name) {
final int propertyVersion = getDeviceConfigPropertyInt(NAMESPACE_TETHERING, name,
0 /* default value */);
- return propertyVersion != 0;
+ return propertyVersion == 0;
}
/**
diff --git a/staticlibs/lint-baseline.xml b/staticlibs/lint-baseline.xml
new file mode 100644
index 0000000..d413b2a
--- /dev/null
+++ b/staticlibs/lint-baseline.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 8.0.0-dev" type="baseline" dependencies="true" variant="all" version="8.0.0-dev">
+
+ <issue
+ id="NewApi"
+ message="Call requires API level 30 (current min is 29): `android.net.LinkProperties#getAddresses`"
+ errorLine1=" final Collection<InetAddress> leftAddresses = left.getAddresses();"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="frameworks/libs/net/common/framework/com/android/net/module/util/LinkPropertiesUtils.java"
+ line="158"
+ column="60"/>
+ </issue>
+
+ <issue
+ id="NewApi"
+ message="Call requires API level 30 (current min is 29): `android.net.LinkProperties#getAddresses`"
+ errorLine1=" final Collection<InetAddress> rightAddresses = right.getAddresses();"
+ errorLine2=" ~~~~~~~~~~~~">
+ <location
+ file="frameworks/libs/net/common/framework/com/android/net/module/util/LinkPropertiesUtils.java"
+ line="159"
+ column="62"/>
+ </issue>
+
+ <issue
+ id="NewApi"
+ message="Call requires API level 30 (current min is 29): `android.net.NetworkStats#addEntry`"
+ errorLine1=" stats = stats.addEntry(entry);"
+ errorLine2=" ~~~~~~~~">
+ <location
+ file="frameworks/libs/net/common/framework/com/android/net/module/util/NetworkStatsUtils.java"
+ line="113"
+ column="27"/>
+ </issue>
+
+ <issue
+ id="NewApi"
+ message="Call requires API level 30 (current min is 29): `new android.net.NetworkStats.Entry`"
+ errorLine1=" return new android.net.NetworkStats.Entry("
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="frameworks/libs/net/common/framework/com/android/net/module/util/NetworkStatsUtils.java"
+ line="120"
+ column="16"/>
+ </issue>
+
+ <issue
+ id="NewApi"
+ message="Call requires API level 30 (current min is 29): `new android.net.NetworkStats`"
+ errorLine1=" android.net.NetworkStats stats = new android.net.NetworkStats(0L, 0);"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="frameworks/libs/net/common/framework/com/android/net/module/util/NetworkStatsUtils.java"
+ line="108"
+ column="42"/>
+ </issue>
+
+ <issue
+ id="NewApi"
+ message="Call requires API level 31 (current min is 29): `new android.system.NetlinkSocketAddress`"
+ errorLine1=" return new NetlinkSocketAddress(portId, groupsMask);"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="frameworks/libs/net/common/device/com/android/net/module/util/SocketUtils.java"
+ line="44"
+ column="16"/>
+ </issue>
+
+</issues>
\ No newline at end of file
diff --git a/staticlibs/tests/unit/src/com/android/net/module/util/DeviceConfigUtilsTest.java b/staticlibs/tests/unit/src/com/android/net/module/util/DeviceConfigUtilsTest.java
index 7946244..cc17f9f 100644
--- a/staticlibs/tests/unit/src/com/android/net/module/util/DeviceConfigUtilsTest.java
+++ b/staticlibs/tests/unit/src/com/android/net/module/util/DeviceConfigUtilsTest.java
@@ -424,10 +424,10 @@
public void testIsTetheringFeatureForceDisabled() throws Exception {
doReturn("0").when(() -> DeviceConfig.getProperty(
eq(NAMESPACE_TETHERING), eq(TEST_EXPERIMENT_FLAG)));
- assertFalse(DeviceConfigUtils.isTetheringFeatureForceDisabled(TEST_EXPERIMENT_FLAG));
+ assertTrue(DeviceConfigUtils.isTetheringFeatureNotChickenedOut(TEST_EXPERIMENT_FLAG));
doReturn(TEST_FLAG_VALUE_STRING).when(
() -> DeviceConfig.getProperty(eq(NAMESPACE_TETHERING), eq(TEST_EXPERIMENT_FLAG)));
- assertTrue(DeviceConfigUtils.isTetheringFeatureForceDisabled(TEST_EXPERIMENT_FLAG));
+ assertFalse(DeviceConfigUtils.isTetheringFeatureNotChickenedOut(TEST_EXPERIMENT_FLAG));
}
}