Merge "Make getExtensionVersion a little more forward-proof" into rvc-dev am: ce316be991 am: ec39996379 am: 6fb99083aa

Change-Id: I064aa8027548109e4f6d3da47c3776cbb197b7ff
2020-04-20 16:01:08 +00:00
parent c8cebf7135 6fb99083aa
commit a6982b7a86
1 changed files with 5 additions and 1 deletions
--- a/apex/sdkextensions/framework/java/android/os/ext/SdkExtensions.java
+++ b/apex/sdkextensions/framework/java/android/os/ext/SdkExtensions.java
@@ -62,7 +62,11 @@ public class SdkExtensions {
        if (sdk < VERSION_CODES.R) {
            throw new IllegalArgumentException(String.valueOf(sdk) + " does not have extensions");
        }
-        return R_EXTENSION_INT;
+
+        if (sdk == VERSION_CODES.R) {
+            return R_EXTENSION_INT;
+        }
+        return 0;
    }

 }