Android PCIE:修复设置中格式化固态硬盘会报错的问题

diff --git a/device/rockchip/common/overlay/frameworks/base/core/res/res/values-zh-rCN/strings.xml b/device/rockchip/common/overlay/frameworks/base/core/res/res/values-zh-rCN/st
new file mode 100644
index 0000000..21446ff
--- /dev/null
+++ b/device/rockchip/common/overlay/frameworks/base/core/res/res/values-zh-rCN/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="storage_pcie_drive">固态硬盘</string>
+</resources>
\ No newline at end of file
diff --git a/device/rockchip/common/overlay/frameworks/base/core/res/res/values-zh-rHK/strings.xml b/device/rockchip/common/overlay/frameworks/base/core/res/res/values-zh-rHK/st
new file mode 100644
index 0000000..56c3f57
--- /dev/null
+++ b/device/rockchip/common/overlay/frameworks/base/core/res/res/values-zh-rHK/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="storage_pcie_drive">固態硬碟</string>
+</resources>
\ No newline at end of file
diff --git a/device/rockchip/common/overlay/frameworks/base/core/res/res/values-zh-rTW/strings.xml b/device/rockchip/common/overlay/frameworks/base/core/res/res/values-zh-rTW/st
new file mode 100644
index 0000000..56c3f57
--- /dev/null
+++ b/device/rockchip/common/overlay/frameworks/base/core/res/res/values-zh-rTW/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="storage_pcie_drive">固態硬碟</string>
+</resources>
\ No newline at end of file
diff --git a/device/rockchip/common/overlay/frameworks/base/core/res/res/values/strings.xml b/device/rockchip/common/overlay/frameworks/base/core/res/res/values/strings.xml
index c2ccb8e..80b788c 100755
--- a/device/rockchip/common/overlay/frameworks/base/core/res/res/values/strings.xml
+++ b/device/rockchip/common/overlay/frameworks/base/core/res/res/values/strings.xml
@@ -18,4 +18,5 @@
     <add-resource type="string" name="storage_nand_flash" />
     <string name="storage_nand_flash" >NAND FLASH</string>
+    <string name="storage_pcie_drive">PCIE driver</string>
</resources>
diff --git a/frameworks/base/core/java/android/os/storage/DiskInfo.java b/frameworks/base/core/java/android/os/storage/DiskInfo.java
index a6edae5..b65e853 100644
--- a/frameworks/base/core/java/android/os/storage/DiskInfo.java
+++ b/frameworks/base/core/java/android/os/storage/DiskInfo.java
@@ -108,6 +108,8 @@ public class DiskInfo implements Parcelable {
             } else {
                 return res.getString(com.android.internal.R.string.storage_usb_drive);
             }
+        } else if ((flags & FLAG_PCIE) != 0) {
+            return res.getString(com.android.internal.R.string.storage_pcie_drive);
         } else {
             return null;
         }
diff --git a/frameworks/base/core/res/res/values/strings.xml b/frameworks/base/core/res/res/values/strings.xml
index 4172864..9b09975 100644
--- a/frameworks/base/core/res/res/values/strings.xml
+++ b/frameworks/base/core/res/res/values/strings.xml
@@ -3575,7 +3575,8 @@
     <!-- Storage description for USB storage. [CHAR LIMIT=NONE] -->
     <string name="storage_usb">USB storage</string>
-
+    
+    <string name="storage_pcie_drive">PCIE driver</string>
     <!-- Button text for the edit menu in input method extract mode. [CHAR LIMIT=16] -->
     <string name="extract_edit_menu_button">Edit</string>
diff --git a/frameworks/base/core/res/res/values/symbols.xml b/frameworks/base/core/res/res/values/symbols.xml
index 81d06af..a43eca5 100644
--- a/frameworks/base/core/res/res/values/symbols.xml
+++ b/frameworks/base/core/res/res/values/symbols.xml
@@ -2354,6 +2354,7 @@
   <java-symbol type="string" name="storage_usb_drive" />
   <java-symbol type="string" name="storage_usb_drive_label" />
   <java-symbol type="string" name="storage_usb" />
+  <java-symbol type="string" name="storage_pcie_drive" />
   <java-symbol type="drawable" name="ic_eject_24dp" />
   <java-symbol type="drawable" name="ic_folder_24dp" />
发布了234 篇原创文章 · 获赞 64 · 访问量 95万+

猜你喜欢

转载自blog.csdn.net/zhoumushui/article/details/101067592