tree 12877fa8fb09b4b27e1a569552d856952a91b8e2
parent 213dbe30a1b0cfaa45c4a5cef141b96e6ffce3b1
author Eric Biggers <ebiggers@google.com> 1597082156 -0700
committer Eric Biggers <ebiggers@google.com> 1597085108 -0700

vold: use __ANDROID_API_Q__ instead of pre_gki_level

The name "pre_gki_level" is causing some confusion because not all
devices launching with Android R are subject to the GKI requirement.
(See b/161563110#comment11.)  E.g., devices that use a 4.14-based kernel
are exempt from GKI.  However, the encryption requirements still apply.

Just use __ANDROID_API_Q__ directly instead.

No change in behavior.

Change-Id: Id02ae1140845ac1ae7cf78be4e57fe34da028abf