commit 1236b9e8092189892216b676157cf10e50ba8209
author Junyu Lai <junyulai@google.com> Thu Feb 16 02:29:42 2023 +0000
committer Junyu Lai <junyulai@google.com> Thu Feb 16 02:30:08 2023 +0000
tree 23b6a5944ae33a108743fab17d496a58593a5fdc
parent b4ecb5e750397554f39460305ad92ceffc1e775e

Revert "Return default value when getModuleVersion throwed"

This reverts commit 76a97e81f51cb28e9c2b9eaf039e4186029989a3.

Reason for revert: b/269391238

Fix: 269391238
Change-Id: Ic1fbe09c341f147350e64357f9f647ec61d7e828

staticlibs/device/com/android/net/module/util/DeviceConfigUtils.java

diff --git a/staticlibs/device/com/android/net/module/util/DeviceConfigUtils.java b/staticlibs/device/com/android/net/module/util/DeviceConfigUtils.java
index 1225aa7..f8f250d 100644
--- a/staticlibs/device/com/android/net/module/util/DeviceConfigUtils.java
+++ b/staticlibs/device/com/android/net/module/util/DeviceConfigUtils.java
@@ -194,7 +194,7 @@
             return isFeatureEnabled(context, packageVersion, namespace, name, defaultEnabled);
         } catch (PackageManager.NameNotFoundException e) {
             Log.e(TAG, "Could not find the module name", e);
-            return defaultEnabled;
+            return false;
         }
     }
 

staticlibs/tests/unit/src/com/android/net/module/util/DeviceConfigUtilsTest.java

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 302388d..a8e7993 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
@@ -223,13 +223,9 @@
                 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 */));
     }