From 2b97ecdc5a14dd523f6bc1984bc04391f5626c1e Mon Sep 17 00:00:00 2001 From: Jeongsik Mun Date: Mon, 22 Nov 2021 11:33:27 +0900 Subject: Migrate legacy obb only if first api level < 29 Since a device whose first api >= 29 doesn't have legacy obb, migrate it only if first api level < 29 to reduce unnecessary calls. Bug: 204097684 Test: compile & verify basic functions working Change-Id: I6899604717ceb3286402db48455ec5cf43b3500a --- services/core/java/com/android/server/StorageManagerService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index c7f4b4d03648..780afd86b373 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -80,6 +80,7 @@ import android.content.res.ObbInfo; import android.database.ContentObserver; import android.net.Uri; import android.os.Binder; +import android.os.Build; import android.os.DropBoxManager; import android.os.Environment; import android.os.Handler; @@ -1648,7 +1649,8 @@ class StorageManagerService extends IStorageManager.Stub // obb data to its new location. This may take time depending on the size of // the data to be copied so it's done on the StorageManager worker thread. // This needs to be finished before start mounting obb directories. - if (userId == 0) { + if (userId == 0 + && Build.VERSION.DEVICE_INITIAL_SDK_INT < Build.VERSION_CODES.Q) { mPmInternal.migrateLegacyObbData(); } -- cgit v1.2.3-59-g8ed1b