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

Commit 45614ed4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 062d560a 7dda7041

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

+4 −8
Original line number Diff line number Diff line
@@ -14698,14 +14698,10 @@ public class PackageManagerService extends IPackageManager.Stub 
                                @Override

                                public void onReceive(Context context, Intent intent) {

                                    // the duration to wait for rollback to be enabled, in millis

                                    long rollbackTimeout = DEFAULT_ENABLE_ROLLBACK_TIMEOUT;

                                    try {

                                        rollbackTimeout = Long.valueOf(

                                            DeviceConfig.getProperty(

                                    long rollbackTimeout = DeviceConfig.getLong(

                                            DeviceConfig.Rollback.NAMESPACE,

                                                DeviceConfig.Rollback.ENABLE_ROLLBACK_TIMEOUT));

                                    } catch (NumberFormatException ignore) {

                                    }

                                            DeviceConfig.Rollback.ENABLE_ROLLBACK_TIMEOUT,

                                            DEFAULT_ENABLE_ROLLBACK_TIMEOUT);

                                    final Message msg = mHandler.obtainMessage(

                                            ENABLE_ROLLBACK_TIMEOUT);

                                    msg.arg1 = enableRollbackToken;