Merge "Revert "Improve untrusted sources UX for app side-loading""

public class PackageInstallerActivity extends Activity implements OnCancelListener, OnClickListener {

    private static final String TAG = "PackageInstaller";

    private static final int REQUEST_ENABLE_UNKNOWN_SOURCES = 1;

    private int mSessionId = -1;

    private Uri mPackageURI;

    private Uri mOriginatingURI;

                    .setPositiveButton(R.string.settings, new DialogInterface.OnClickListener() {

                        public void onClick(DialogInterface dialog, int which) {

                            Log.i(TAG, "Launching settings");

                            launchSecuritySettings();

                            launchSettingsAppAndFinish();

                        }

                    })

                    .setOnCancelListener(this)

       return null;

   }

    private void launchSecuritySettings() {

    private void launchSettingsAppAndFinish() {

        // Create an intent to launch SettingsTwo activity

        Intent launchSettingsIntent = new Intent(Settings.ACTION_SECURITY_SETTINGS);

        startActivityForResult(launchSettingsIntent, REQUEST_ENABLE_UNKNOWN_SOURCES);

    }

    @Override

    public void onActivityResult(int request, int result, Intent data) {

        if (request == REQUEST_ENABLE_UNKNOWN_SOURCES

                && result == RESULT_OK && isUnknownSourcesEnabled()) {

            initiateInstall();

        } else {

        launchSettingsIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

        startActivity(launchSettingsIntent);

        finish();

    }

    }

    private boolean isInstallRequestFromUnknownSource(Intent intent) {

        String callerPackage = getCallingPackage();