diff options
| author | 2020-08-19 05:01:06 +0000 | |
|---|---|---|
| committer | 2020-08-19 05:01:06 +0000 | |
| commit | f0d495611dcf22c2536e12b3b2e6ca0a71f5e52c (patch) | |
| tree | 621c85a5ebdd9ea145406e7e84e9d581e1d2112d | |
| parent | adf4934412d09d2c16e8b3463c42d779684c99dd (diff) | |
| parent | cbfb9f157cc36ab2fa5e50ce3b357dccb6d3d985 (diff) | |
Merge "Rename driver build time manifest flag." into rvc-dev-plus-aosp am: f2502dcd60 am: 5d8f13267b am: cbfb9f157c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12404439
Change-Id: Ia9cc42abafcda07569ba216b74457db43b70f530
| -rw-r--r-- | core/java/android/os/GraphicsEnvironment.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/java/android/os/GraphicsEnvironment.java b/core/java/android/os/GraphicsEnvironment.java index 1eb3fc11df7b..df1f1b21eba3 100644 --- a/core/java/android/os/GraphicsEnvironment.java +++ b/core/java/android/os/GraphicsEnvironment.java @@ -68,7 +68,7 @@ public class GraphicsEnvironment { private static final String PROPERTY_GFX_DRIVER_PRERELEASE = "ro.gfx.driver.1"; private static final String PROPERTY_GFX_DRIVER_BUILD_TIME = "ro.gfx.driver_build_time"; private static final String METADATA_DRIVER_BUILD_TIME = - "com.android.graphics.updatabledriver.build_time"; + "com.android.graphics.driver.build_time"; private static final String METADATA_DEVELOPER_DRIVER_ENABLE = "com.android.graphics.developerdriver.enable"; private static final String METADATA_INJECT_LAYERS_ENABLE = @@ -878,9 +878,10 @@ public class GraphicsEnvironment { throw new NullPointerException("apk's meta-data cannot be null"); } - final String driverBuildTime = driverAppInfo.metaData.getString(METADATA_DRIVER_BUILD_TIME); - if (driverBuildTime == null || driverBuildTime.isEmpty()) { - Log.v(TAG, "com.android.graphics.updatabledriver.build_time is not set"); + String driverBuildTime = driverAppInfo.metaData.getString(METADATA_DRIVER_BUILD_TIME); + if (driverBuildTime == null || driverBuildTime.length() <= 1) { + Log.v(TAG, "com.android.graphics.driver.build_time is not set"); + driverBuildTime = "L0"; } // driver_build_time in the meta-data is in "L<Unix epoch timestamp>" format. e.g. L123456. // Long.parseLong will throw if the meta-data "driver_build_time" is not set properly. |