From 9d83d35132d9b5695a86a6a68c3c1786d158fb7a Mon Sep 17 00:00:00 2001
From: Ricky Wai <rickywai@google.com>
Date: Mon, 13 Jul 2020 11:50:59 +0000
Subject: [PATCH] Do not use default locale to create file path

We should always use US locate to create file path otherwise
it may generate invalid file path for locale like
Arabic.

Bug: 160555146
Test: Able to boot successfully
Change-Id: Ief9b3b9747d0590cc4f6ccf86ac0e611d53b96bb
---
 .../core/java/com/android/server/StorageManagerService.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
index 84bd59b7730e4..816d663e09de4 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -4532,9 +4532,10 @@ class StorageManagerService extends IStorageManager.Stub
                         ServiceManager.getServiceOrThrow("vold"));
                 for (String pkg : packageList) {
                     final String packageObbDir =
-                            String.format("/storage/emulated/%d/Android/obb/%s/", userId, pkg);
+                            String.format(Locale.US, "/storage/emulated/%d/Android/obb/%s/",
+                                    userId, pkg);
                     final String packageDataDir =
-                            String.format("/storage/emulated/%d/Android/data/%s/",
+                            String.format(Locale.US, "/storage/emulated/%d/Android/data/%s/",
                                     userId, pkg);
 
                     // Create package obb and data dir if it doesn't exist.