commit 15c511f419553327ea22f4705e4b233bd29f2b7d
author shafik <shafik@google.com> Fri Mar 08 11:52:08 2019 +0000
committer shafik <shafik@google.com> Fri Mar 08 12:21:47 2019 +0000
tree 63b572ff7997a283eb462a7259faa1ba30fe02da
parent 0b69c75a7cba048b311f37358f56159b73288bd9

Rollback flags: handle cases where flag values are negative

Handle cases where ENABLE_ROLLBACK_TIMEOUT and
ROLLBACK_LIFETIME_IN_MILLIS are negative. So that if the values are
negative, the default values will be assigned.

Fixes: 127925227
Test: atest RollbackTest
Change-Id: I416716a0070907394cd0f61cfcabf521cec77874

services/core/java/com/android/server/pm/PackageManagerService.java

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 251b34bc..4dcab5e 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -14702,6 +14702,9 @@
                                             DeviceConfig.Rollback.NAMESPACE,
                                             DeviceConfig.Rollback.ENABLE_ROLLBACK_TIMEOUT,
                                             DEFAULT_ENABLE_ROLLBACK_TIMEOUT);
+                                    if (rollbackTimeout < 0) {
+                                        rollbackTimeout = DEFAULT_ENABLE_ROLLBACK_TIMEOUT;
+                                    }
                                     final Message msg = mHandler.obtainMessage(
                                             ENABLE_ROLLBACK_TIMEOUT);
                                     msg.arg1 = enableRollbackToken;

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 d3e1a05..f077f91 100644
--- a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
+++ b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
@@ -535,6 +535,9 @@
                 DeviceConfig.Rollback.BOOT_NAMESPACE,
                 DeviceConfig.Rollback.ROLLBACK_LIFETIME_IN_MILLIS,
                 DEFAULT_ROLLBACK_LIFETIME_DURATION_MILLIS);
+        if (mRollbackLifetimeDurationInMillis < 0) {
+            mRollbackLifetimeDurationInMillis = DEFAULT_ROLLBACK_LIFETIME_DURATION_MILLIS;
+        }
     }
 
     void onBootCompleted() {