Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename driver build time manifest flag." into rvc-dev-plus-aosp

Browse Source
This commit is contained in:
TreeHugger Robot
2020-08-19 04:27:47 +00:00
committed by Android (Google) Code Review
parent db764300eb b0ce703e9a
commit f2502dcd60
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/os/GraphicsEnvironment.java
View File

@@ -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_PRERELEASE = "ro.gfx.driver.1";
private static final String PROPERTY_GFX_DRIVER_BUILD_TIME = "ro.gfx.driver_build_time"; private static final String PROPERTY_GFX_DRIVER_BUILD_TIME = "ro.gfx.driver_build_time";
private static final String METADATA_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 = private static final String METADATA_DEVELOPER_DRIVER_ENABLE =
"com.android.graphics.developerdriver.enable"; "com.android.graphics.developerdriver.enable";
private static final String METADATA_INJECT_LAYERS_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"); throw new NullPointerException("apk's meta-data cannot be null");
} }
final String driverBuildTime = driverAppInfo.metaData.getString(METADATA_DRIVER_BUILD_TIME); String driverBuildTime = driverAppInfo.metaData.getString(METADATA_DRIVER_BUILD_TIME);
if (driverBuildTime == null || driverBuildTime.isEmpty()) { if (driverBuildTime == null || driverBuildTime.length() <= 1) {
Log.v(TAG, "com.android.graphics.updatabledriver.build_time is not set"); 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. // 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. // Long.parseLong will throw if the meta-data "driver_build_time" is not set properly.