diff options
author | Junyu Lai <junyulai@google.com> | 2023-01-12 15:04:06 +0800 |
---|---|---|
committer | Junyu Lai <junyulai@google.com> | 2023-01-12 15:04:06 +0800 |
commit | 76a97e81f51cb28e9c2b9eaf039e4186029989a3 (patch) | |
tree | 1f1b5f24eb26e84d7f458dc23658d88f2a5d3523 | |
parent | 4935df14b1716a2932ef1af8715188f0a72782ce (diff) | |
download | net-76a97e81f51cb28e9c2b9eaf039e4186029989a3.tar.gz |
Return default value when getModuleVersion throwed
In aosp, getModuleVersion would always throw since there is
no meta-info for modules. Currently it would make
isFeatureEnabled method return false, which is not
a right thing for features are default enabled.
Change it to return default value when throwed.
Test: atest NetworkStaticLibTests
Bug: 263219497
Change-Id: Iadcdcedac1f1da7d894e03b76b3e985f87ca8b0e
-rw-r--r-- | common/device/com/android/net/module/util/DeviceConfigUtils.java | 2 | ||||
-rw-r--r-- | common/tests/unit/src/com/android/net/module/util/DeviceConfigUtilsTest.java | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/common/device/com/android/net/module/util/DeviceConfigUtils.java b/common/device/com/android/net/module/util/DeviceConfigUtils.java index f8f250d7..1225aa7e 100644 --- a/common/device/com/android/net/module/util/DeviceConfigUtils.java +++ b/common/device/com/android/net/module/util/DeviceConfigUtils.java @@ -194,7 +194,7 @@ public final class DeviceConfigUtils { return isFeatureEnabled(context, packageVersion, namespace, name, defaultEnabled); } catch (PackageManager.NameNotFoundException e) { Log.e(TAG, "Could not find the module name", e); - return false; + return defaultEnabled; } } diff --git a/common/tests/unit/src/com/android/net/module/util/DeviceConfigUtilsTest.java b/common/tests/unit/src/com/android/net/module/util/DeviceConfigUtilsTest.java index a8e7993a..302388db 100644 --- a/common/tests/unit/src/com/android/net/module/util/DeviceConfigUtilsTest.java +++ b/common/tests/unit/src/com/android/net/module/util/DeviceConfigUtilsTest.java @@ -223,9 +223,13 @@ public class DeviceConfigUtilsTest { TEST_EXPERIMENT_FLAG)); assertFalse(DeviceConfigUtils.isFeatureEnabled(mContext, TEST_NAME_SPACE, TEST_EXPERIMENT_FLAG, TEST_APEX_NAME, false /* defaultEnabled */)); + assertTrue(DeviceConfigUtils.isFeatureEnabled(mContext, TEST_NAME_SPACE, + TEST_EXPERIMENT_FLAG, TEST_APEX_NAME, true /* defaultEnabled */)); doThrow(NameNotFoundException.class).when(mPm).getModuleInfo(anyString(), anyInt()); assertFalse(DeviceConfigUtils.isFeatureEnabled(mContext, TEST_NAME_SPACE, TEST_EXPERIMENT_FLAG, TEST_APEX_NAME, false /* defaultEnabled */)); + assertTrue(DeviceConfigUtils.isFeatureEnabled(mContext, TEST_NAME_SPACE, + TEST_EXPERIMENT_FLAG, TEST_APEX_NAME, true /* defaultEnabled */)); } |