diff options
author | Svetoslav Ganov <svetoslavganov@google.com> | 2016-01-13 21:58:20 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-01-13 21:58:20 +0000 |
commit | 7f116abe166bee396bffe22cac2b59e624e1cc5d (patch) | |
tree | aa691611e6730ad7409b29c708270d4694148b94 /src | |
parent | 7e9c36cd5374db3aec697ed92ad88eb8b96751db (diff) | |
parent | a42415ed530461cd5a7ce7bfb44ff4f2caf42782 (diff) | |
download | android_packages_apps_PackageInstaller-7f116abe166bee396bffe22cac2b59e624e1cc5d.tar.gz android_packages_apps_PackageInstaller-7f116abe166bee396bffe22cac2b59e624e1cc5d.tar.bz2 android_packages_apps_PackageInstaller-7f116abe166bee396bffe22cac2b59e624e1cc5d.zip |
Merge "Improve untrusted sources UX for app side-loading" am: 5bf65a7c43
am: a42415ed53
* commit 'a42415ed530461cd5a7ce7bfb44ff4f2caf42782':
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, 15 insertions, 6 deletions
diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java index 0385ecdf..7eea541e 100644 --- a/src/com/android/packageinstaller/PackageInstallerActivity.java +++ b/src/com/android/packageinstaller/PackageInstallerActivity.java @@ -64,6 +64,8 @@ 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; @@ -222,7 +224,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"); - launchSettingsAppAndFinish(); + launchSecuritySettings(); } }) .setOnCancelListener(this) @@ -327,12 +329,19 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen return null; } - private void launchSettingsAppAndFinish() { - // Create an intent to launch SettingsTwo activity + private void launchSecuritySettings() { Intent launchSettingsIntent = new Intent(Settings.ACTION_SECURITY_SETTINGS); - launchSettingsIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - startActivity(launchSettingsIntent); - finish(); + 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(); + } } private boolean isInstallRequestFromUnknownSource(Intent intent) { |