fix(core.runtime): getDatabasePath支持传绝对路径

对齐ContextImpl的逻辑。 https://cs.android.com/android/platform/superproject/main/+/main:frameworks/base/core/java/android/app/ContextImpl.java;l=1018;drc=88bbe8206f93272a610e9d24182c6e80b94d8548?hl=zh-cn fix #1049
Tencent · Apr 22, 2024 · ee7ab99 · ee7ab99
1 parent 4880701
commit ee7ab99
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/...core/runtime/src/main/java/com/tencent/shadow/core/runtime/SubDirContextThemeWrapper.java b/...core/runtime/src/main/java/com/tencent/shadow/core/runtime/SubDirContextThemeWrapper.java
@@ -301,7 +301,8 @@ public boolean deleteDatabase(String name) {
 
     @Override
     public File getDatabasePath(String name) {
-        if (getSubDirName() == null) {
+        if (getSubDirName() == null
+                || name.charAt(0) == File.separatorChar) {
             return super.getDatabasePath(name);
         } else {
             return super.getDatabasePath(makeSubName(name));

diff --git a/...oidTest/java/com/tencent/shadow/test/cases/plugin_main/SubDirContextThemeWrapperTest.java b/...oidTest/java/com/tencent/shadow/test/cases/plugin_main/SubDirContextThemeWrapperTest.java
@@ -317,6 +317,10 @@ public void testGetDatabasePath() {
                 "TAG_GET_DATABASE_PATH_BAR",
                 hostDatabasePath + "/" + EXPECT_NAME + "_bar"
         );
+        matchTextWithViewTag(
+                "TAG_GET_DATABASE_ABSOLUTE_PATH_FOO_BAR",
+                "/foo/bar"
+        );
     }
 
     @Test

diff --git a/...test/plugin/general_cases/lib/usecases/context/SubDirContextThemeWrapperTestActivity.java b/...test/plugin/general_cases/lib/usecases/context/SubDirContextThemeWrapperTestActivity.java
@@ -237,6 +237,11 @@ protected void fillTestValues(Context testContext) {
                 testContext.getDatabasePath("bar").getAbsolutePath()
         );
 
+        // 传绝对路径给getDatabasePath应该返回路径不变的文件
+        makeItem("getDatabasePath(\"/foo/bar\")", "TAG_GET_DATABASE_ABSOLUTE_PATH_FOO_BAR",
+                testContext.getDatabasePath("/foo/bar").getAbsolutePath()
+        );
+
 
         Context hostContext = getApplication().getBaseContext();
         hostContext.openOrCreateDatabase("foo", MODE_PRIVATE, null);