Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15c511f4 authored by shafik's avatar shafik
Browse files

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
parent 0b69c75a

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

+3 −0
Original line number Diff line number Diff line
@@ -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;

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

+3 −0
Original line number Diff line number Diff line
@@ -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() {