summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormse1969 <mse1969@posteo.de>2017-10-22 14:18:18 (GMT)
committermse1969 <mse1969@posteo.de>2017-10-22 14:21:17 (GMT)
commit54b91b04a2dd9da928230eeb9d62a43fc40eefe4 (patch)
tree8e900880f1a9ca875bfa961aaffe398dfc87c01d
parent4a3de6674dc4ac89ea86a6e3951fef8f0d49283c (diff)
downloadandroid_packages_apps_PackageInstaller-54b91b04a2dd9da928230eeb9d62a43fc40eefe4.zip
android_packages_apps_PackageInstaller-54b91b04a2dd9da928230eeb9d62a43fc40eefe4.tar.gz
android_packages_apps_PackageInstaller-54b91b04a2dd9da928230eeb9d62a43fc40eefe4.tar.bz2
Revert "DO NOT MERGE Disable overlays while installer is resumed"replicant-6.0-0003
If mOkCanInstall is false when onResume() is called, the button gets disabled and never re-enabled. This fix is for branches that have change I42c15d05dffc1f6db69c9f67148f7ceb6e8bd8ae ("Split layout for confirm step.") which causes the button to be disabled and enabled for different reasons. Here the button is constantly enabled and its action changes depending on the value of mOkCanInstall. The attribute filterTouchesWhenObscured should prevent tapjacking when overlays are present, so revert this commit. This has also been done in branch cm-14.1 via commit 4b0c302eae8d772d09346718559cc42548485f75 This reverts commit 7a204a0e265a0a92537d57fd1bab594250c96149. Change-Id: I82b2c9ae0d588ef1696c8356a31c4204247823ad
-rw-r--r--src/com/android/packageinstaller/PackageInstallerActivity.java25
1 files changed, 2 insertions, 23 deletions
diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java
index 7cf5189..868872a 100644
--- a/src/com/android/packageinstaller/PackageInstallerActivity.java
+++ b/src/com/android/packageinstaller/PackageInstallerActivity.java
@@ -16,6 +16,7 @@
*/
package com.android.packageinstaller;
+import android.app.Activity;
import android.app.ActivityManagerNative;
import android.app.AlertDialog;
import android.app.Dialog;
@@ -51,8 +52,6 @@ import android.widget.Button;
import android.widget.TabHost;
import android.widget.TextView;
-import com.android.packageinstaller.permission.ui.OverlayTouchActivity;
-
import java.io.File;
import java.util.List;
@@ -66,8 +65,7 @@ import java.util.List;
* Based on the user response the package is then installed by launching InstallAppConfirm
* sub activity. All state transitions are handled in this activity
*/
-public class PackageInstallerActivity extends OverlayTouchActivity implements OnCancelListener,
- OnClickListener {
+public class PackageInstallerActivity extends Activity implements OnCancelListener, OnClickListener {
private static final String TAG = "PackageInstaller";
private int mSessionId = -1;
@@ -585,25 +583,6 @@ public class PackageInstallerActivity extends OverlayTouchActivity implements On
}
}
- @Override
- protected void onResume() {
- super.onResume();
-
- if (mOk != null) {
- mOk.setEnabled(mOkCanInstall);
- }
- }
-
- @Override
- protected void onPause() {
- super.onPause();
-
- if (mOk != null) {
- // Don't allow the install button to be clicked as there might be overlays
- mOk.setEnabled(false);
- }
- }
-
/** Get the ApplicationInfo for the calling package, if available */
private ApplicationInfo getSourceInfo() {
String callingPackage = getCallingPackage();