diff options
author | Svetoslav Ganov <svetoslavganov@google.com> | 2016-01-14 02:10:50 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-01-14 02:10:50 +0000 |
commit | f425f12e926d1ef9f4baedc4c1d19ef835fcaa3c (patch) | |
tree | a172215c7db5f0298163ee1594984ad9b4ae5f95 /src | |
parent | 1a5cbbc593ac5468698d0a59d78bd8868e8235f6 (diff) | |
parent | 4f63fa7baf2115253ffcc06decefff4fec545865 (diff) | |
download | android_packages_apps_PackageInstaller-f425f12e926d1ef9f4baedc4c1d19ef835fcaa3c.tar.gz android_packages_apps_PackageInstaller-f425f12e926d1ef9f4baedc4c1d19ef835fcaa3c.tar.bz2 android_packages_apps_PackageInstaller-f425f12e926d1ef9f4baedc4c1d19ef835fcaa3c.zip |
Merge "Revert "Improve untrusted sources UX for app side-loading"" am: b02596cdfc
am: 4f63fa7baf
* commit '4f63fa7baf2115253ffcc06decefff4fec545865':
Revert "Improve untrusted sources UX for app side-loading"
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/packageinstaller/PackageInstallerActivity.java | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java index 7eea541e..0385ecdf 100644 --- a/src/com/android/packageinstaller/PackageInstallerActivity.java +++ b/src/com/android/packageinstaller/PackageInstallerActivity.java @@ -64,8 +64,6 @@ import java.io.File; 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; @@ -224,7 +222,7 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen .setPositiveButton(R.string.settings, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { Log.i(TAG, "Launching settings"); - launchSecuritySettings(); + launchSettingsAppAndFinish(); } }) .setOnCancelListener(this) @@ -329,19 +327,12 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen 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) { |