Merge "Make getExtensionVersion a little more forward-proof" into rvc-dev am: ce316be991 am: 3bb8a4428e

Change-Id: I592373f9cba8b9f25d1bdcc8b08b1812a3793c03
2020-04-21 10:34:05 +00:00
parent ede4362b34 3bb8a4428e
commit 627681eba3
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;
    }

 }