Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d86c8c06 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove Build.VERSION.SDK* appcompat overrides" into main

parents 966f9a46 2408c8de

core/jni/com_android_internal_os_Zygote.cpp

+0 −2
Original line number Diff line number Diff line
@@ -1736,7 +1736,6 @@ std::pair<const char*, const char*> build_version_constants[] = { 
        std::pair("RELEASE_OR_PREVIEW_DISPLAY", "ro.build.version.release_or_preview_display"),

        std::pair("BASE_OS", "ro.build.version.base_os"),

        std::pair("SECURITY_PATCH", "ro.build.version.security_patch"),

        std::pair("SDK", "ro.build.version.sdk"),

        std::pair("PREVIEW_SDK_FINGERPRINT", "ro.build.version.preview_sdk_fingerprint"),

        std::pair("CODENAME", "ro.build.version.codename"),

};
@@ -1805,7 +1804,6 @@ static void ReloadBuildJavaConstants(JNIEnv* env) { 


  // Reload the public int/long constants

  ReloadBuildJavaConstant(env, build_cls, "TIME", "J", "ro.build.date.utc");

  ReloadBuildJavaConstant(env, build_version_cls, "SDK_INT", "I", "ro.build.version.sdk");

  ReloadBuildJavaConstant(env, build_version_cls, "PREVIEW_SDK_INT", "I",

                          "ro.build.version.preview_sdk");