summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alex Buynytskyy <alexbuy@google.com> 2023-01-18 12:34:03 -0800
committer Song Chun Fan <schfan@google.com> 2023-05-03 21:32:06 +0000
commit3fae7a0c6a43fb05426196cbced549af9627270f (patch)
tree4ba98f96ce3b10291866be7cd7ef137fa0a853cb
parent3f60b9a1514d5dee4b096616a0a293f21750e63e (diff)
[RESTRICT AUTOMERGE] Null is a valid volume uuid.
Bug: 265477208 Fixes: 265477208 Test: atest InstallSessionParamsUnitTest Change-Id: Ib2af1afc78b3d9c6d8eb534e5f536aae153eeeb0 (cherry picked from commit ec8328db8145a7f895fa5d8aceedd7135c28b749) Merged-In: Ib2af1afc78b3d9c6d8eb534e5f536aae153eeeb0
-rw-r--r--core/java/com/android/internal/content/InstallLocationUtils.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/content/InstallLocationUtils.java b/core/java/com/android/internal/content/InstallLocationUtils.java
index 4d9c09e92617..a173ce16feea 100644
--- a/core/java/com/android/internal/content/InstallLocationUtils.java
+++ b/core/java/com/android/internal/content/InstallLocationUtils.java
@@ -292,7 +292,7 @@ public class InstallLocationUtils {
// For new installations of a predefined size, check property to let it through
// regardless of the actual free space.
- if (bestCandidate != null && Integer.MAX_VALUE == params.sizeBytes
+ if (!volumePaths.isEmpty() && Integer.MAX_VALUE == params.sizeBytes
&& SystemProperties.getBoolean("debug.pm.install_skip_size_check_for_maxint",
false)) {
return bestCandidate;