diff options
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 251b34bc3684..4dcab5e7abdd 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 @@ public class PackageManagerService extends IPackageManager.Stub 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; diff --git a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java index ffdfe572b330..871f9f862945 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 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { 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() { |