Commit 88086950 authored Apr 21, 2020 by Anton Hansson Committed by Automerger Merge Worker Apr 21, 2020

Merge "Make getExtensionVersion a little more forward-proof" into rvc-dev am:...

Merge "Make getExtensionVersion a little more forward-proof" into rvc-dev am: ce316be9 am: 3bb8a442 am: 627681eb

Change-Id: Ide2b0cf2e376804709e37d0b4d362543779f9ce6

parents ea416398 627681eb

apex/sdkextensions/framework/java/android/os/ext/SdkExtensions.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,11 @@ public class SdkExtensions {
		if (sdk < VERSION_CODES.R) {
		throw new IllegalArgumentException(String.valueOf(sdk) + " does not have extensions");
		}

		if (sdk == VERSION_CODES.R) {
		return R_EXTENSION_INT;
		}
		return 0;
		}

		}