Sync up to v300.l
This commit is contained in:
@@ -0,0 +1,26 @@
|
||||
From cc94e422c0a8b2680e7f9cfc391b2b03a56da765 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Tue, 5 Jan 2021 23:44:00 +0100
|
||||
Subject: [PATCH 11/11] unshared_oob didn't exist in O/P, so detect its
|
||||
supported based on vndk version
|
||||
|
||||
---
|
||||
cmds/installd/migrate_legacy_obb_data.sh | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cmds/installd/migrate_legacy_obb_data.sh b/cmds/installd/migrate_legacy_obb_data.sh
|
||||
index 7399681c3..9d5b73eae 100644
|
||||
--- a/cmds/installd/migrate_legacy_obb_data.sh
|
||||
+++ b/cmds/installd/migrate_legacy_obb_data.sh
|
||||
@@ -18,7 +18,7 @@
|
||||
rm -rf /data/media/0/Android/obb/test_probe
|
||||
mkdir -p /data/media/0/Android/obb/
|
||||
touch /data/media/0/Android/obb/test_probe
|
||||
-if ! test -f /data/media/0/Android/obb/test_probe ; then
|
||||
+if ! test -f /data/media/0/Android/obb/test_probe || [ "$(adb shell getprop ro.vndk.version)" -le 28 ]; then
|
||||
log -p i -t migrate_legacy_obb_data "No support for 'unshared_obb'. Not migrating"
|
||||
rm -rf /data/media/0/Android/obb/test_probe
|
||||
exit 0
|
||||
--
|
||||
2.25.1
|
||||
|
||||
Reference in New Issue
Block a user