Merge "Make getExtensionVersion a little more forward-proof" am: aa4f4de230

Change-Id: I502b730bb7f08f87955fd0585b4e13593f13d41f
2020-04-20 18:13:48 +00:00
parent ce88f62e22 aa4f4de230
commit ad37fde507
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;
    }

 }