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

Commit 3aabbc7e authored by Gabriele M's avatar Gabriele M
Browse files

Use single return statement in onStartCommand() 

This should prevent future changes from accidentally turning a
sticky service into a not sticky one.

Change-Id: I89f172626a98635149441a63536e0aa5a27f8280
parent 2ec8fc6c

src/org/lineageos/updater/controller/UpdaterService.java

+3 −7
Original line number Diff line number Diff line
@@ -167,9 +167,7 @@ public class UpdaterService extends Service { 
                // The service is being restarted.

                ABUpdateInstaller installer = ABUpdateInstaller.getInstance(this,

                        mUpdaterController);

                if (installer.reconnect()) {

                    return START_STICKY;

                }

                installer.reconnect();

            }

        } else if (ACTION_DOWNLOAD_CONTROL.equals(intent.getAction())) {

            String downloadId = intent.getStringExtra(EXTRA_DOWNLOAD_ID);
@@ -191,9 +189,7 @@ public class UpdaterService extends Service { 
                if (Utils.isABUpdate(update.getFile())) {

                    ABUpdateInstaller installer = ABUpdateInstaller.getInstance(this,

                            mUpdaterController);

                    if (installer.install(downloadId)) {

                        return START_STICKY;

                    }

                    installer.install(downloadId);

                } else {

                    UpdateInstaller installer = new UpdateInstaller(this, mUpdaterController);

                    installer.install(downloadId);
@@ -215,7 +211,7 @@ public class UpdaterService extends Service { 
                installer.cancel();

            }

        }

        return START_NOT_STICKY;

        return ABUpdateInstaller.isInstallingUpdate(this) ? START_STICKY : START_NOT_STICKY;

    }



    public Controller getUpdaterController() {