diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2016-01-14 02:05:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-14 02:05:44 +0000 |
| commit | 4f63fa7baf2115253ffcc06decefff4fec545865 (patch) | |
| tree | b334ffa3d0b67db2488310d05399def577e82adc /src/com/android | |
| parent | a42415ed530461cd5a7ce7bfb44ff4f2caf42782 (diff) | |
| parent | b02596cdfcd3fa0e02c309971d9f19f1de022230 (diff) | |
| download | android_packages_apps_PackageInstaller-4f63fa7baf2115253ffcc06decefff4fec545865.tar.gz android_packages_apps_PackageInstaller-4f63fa7baf2115253ffcc06decefff4fec545865.tar.bz2 android_packages_apps_PackageInstaller-4f63fa7baf2115253ffcc06decefff4fec545865.zip | |
Merge "Revert "Improve untrusted sources UX for app side-loading""
am: b02596cdfc
* commit 'b02596cdfcd3fa0e02c309971d9f19f1de022230':
Revert "Improve untrusted sources UX for app side-loading"
Diffstat (limited to 'src/com/android')
| -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 621da358..3ea3959d 100644 --- a/src/com/android/packageinstaller/PackageInstallerActivity.java +++ b/src/com/android/packageinstaller/PackageInstallerActivity.java @@ -68,8 +68,6 @@ import java.util.List; 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 @@ 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) @@ -352,19 +350,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) { |