commit 85935e85e6dec88dae7d1f1200bd6125e836f99a
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 07 14:08:10 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 07 14:08:10 2019 +0000
tree 18cd1f20388348e07fda8aa88ae05b0afc1c44b5
parent a607501c250850f490ffdfdcef694802ae467cff
parent 6b85dac51fb06041aecec16181e246ccdacf3a20

Merge "Use updated DeviceConfig API's getLong method to simplify invocation."

services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java

diff --git a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
index e241ba6..d3e1a05 100644
--- a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
+++ b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
@@ -531,17 +531,10 @@
     }
 
     private void updateRollbackLifetimeDurationInMillis() {
-        String strRollbackLifetimeInMillis = DeviceConfig.getProperty(
+        mRollbackLifetimeDurationInMillis = DeviceConfig.getLong(
                 DeviceConfig.Rollback.BOOT_NAMESPACE,
-                DeviceConfig.Rollback.ROLLBACK_LIFETIME_IN_MILLIS);
-
-        try {
-            mRollbackLifetimeDurationInMillis = (strRollbackLifetimeInMillis == null)
-                    ? DEFAULT_ROLLBACK_LIFETIME_DURATION_MILLIS
-                    : Long.parseLong(strRollbackLifetimeInMillis);
-        } catch (NumberFormatException e) {
-            mRollbackLifetimeDurationInMillis = DEFAULT_ROLLBACK_LIFETIME_DURATION_MILLIS;
-        }
+                DeviceConfig.Rollback.ROLLBACK_LIFETIME_IN_MILLIS,
+                DEFAULT_ROLLBACK_LIFETIME_DURATION_MILLIS);
     }
 
     void onBootCompleted() {