commit 8d5d7ea44050a1e820bf8f5ea24a694c6702f5d9
author Svetoslav Ganov <svetoslavganov@google.com> Thu Jan 14 00:44:08 2016 +0000
committer Svetoslav Ganov <svetoslavganov@google.com> Thu Jan 14 00:44:08 2016 +0000
tree 5d330ffb06d523110c2e1b8e56973d9fb46e8d4b
parent 3ce5984c09403c0ef09f0826f5fe18520192bec2

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

This reverts commit 3ce5984c09403c0ef09f0826f5fe18520192bec2.

Change-Id: Ib2192354ef8851f3d9e14d27f767c799f93d133e

src/com/android/packageinstaller/PackageInstallerActivity.java

diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java
index 3693470..868872a 100644
--- a/src/com/android/packageinstaller/PackageInstallerActivity.java
+++ b/src/com/android/packageinstaller/PackageInstallerActivity.java
@@ -68,8 +68,6 @@
 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;
@@ -247,7 +245,7 @@
                     .setPositiveButton(R.string.settings, new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int which) {
                             Log.i(TAG, "Launching settings");
-                            launchSecuritySettings();
+                            launchSettingsAppAndFinish();
                         }
                     })
                     .setOnCancelListener(this)
@@ -352,19 +350,12 @@
        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 {
-            finish();
-        }
+        launchSettingsIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        startActivity(launchSettingsIntent);
+        finish();
     }
 
     private boolean isInstallRequestFromUnknownSource(Intent intent) {