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

Commit 6fdd93b3 authored by Svetoslav Ganov's avatar Svetoslav Ganov
Browse files

Finish package installer activity on a cancel result 

We made a change to the PackageInstaller to start settings for
a result to allow partners to return OK to continue the install
flow, otherwise requiring the user to start install again (the
desired behavior on Nexus). This change finishes the package
installer activity if settings does not return success to
continue the install flow.

bug:28838075

Change-Id: I4ff1b1a713d46a8584baf66f379ab070226c125f
parent 622c5b56

src/com/android/packageinstaller/PackageInstallerActivity.java

+3 −0
Original line number Diff line number Diff line
@@ -324,6 +324,8 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen 
        // implement a "allow untrusted source once" feature.

        if (request == REQUEST_ENABLE_UNKNOWN_SOURCES && result == RESULT_OK) {

            initiateInstall();

        } else {

            clearCachedApkIfNeededAndFinish();

        }

    }
@@ -474,6 +476,7 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen 
            showDialogInner(DLG_ADMIN_RESTRICTS_UNKNOWN_SOURCES);

        } else if (!isUnknownSourcesEnabled()) {

            // Ask user to enable setting first



            showDialogInner(DLG_UNKNOWN_SOURCES);

        } else {

            processPackageUri(packageUri);