diff options
| author | Suprabh Shukla <suprabh@google.com> | 2017-05-05 15:20:10 -0700 |
|---|---|---|
| committer | Suprabh Shukla <suprabh@google.com> | 2017-05-05 15:20:13 -0700 |
| commit | 38e0f956664f2997941e2087284366e0d0dadbf7 (patch) | |
| tree | 8b23cb0dde979e06df7452a5df295328ad8d50f4 | |
| parent | 569b4d0d4ca2b767d2bbba93fc75211995f31409 (diff) | |
| download | android_packages_apps_PackageInstaller-38e0f956664f2997941e2087284366e0d0dadbf7.tar.gz android_packages_apps_PackageInstaller-38e0f956664f2997941e2087284366e0d0dadbf7.tar.bz2 android_packages_apps_PackageInstaller-38e0f956664f2997941e2087284366e0d0dadbf7.zip | |
Using SecureTouchListener for install button during install confirmation
Dropping touches to the install button if the package installer window
is partly or wholly obscured by another window.
Test: gts-tradefed run gts-dev -m PackageInstallerTapjacking
Bug: 35056974
Change-Id: I2b548f16b291b6386c2a7d04c03f858c8afcd573
| -rw-r--r-- | res/values/strings.xml | 6 | ||||
| -rw-r--r-- | src/com/android/packageinstaller/PackageInstallerActivity.java | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 9992a41f..f59f8159 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -334,6 +334,12 @@ <!-- Help URL, application permissions [DO NOT TRANSLATE] --> <string name="help_app_permissions" translatable="false"></string> + <!-- Warning shown when user input has been blocked due to another app overlaying screen + content. Since we don't know what the app is showing on top of the input target, we + can't verify user consent. [CHAR LIMIT=NONE] --> + <string name="window_obscured_warning">Because another app is displaying on top of these options, + Package Installer can\u2019t respond to your action.</string> + <!-- Text to show in warning dialog on the tablet when the app source is not trusted [CHAR LIMIT=NONE] --> <string name="untrusted_external_source_warning" product="tablet">For your security, your tablet is not allowed to install unknown apps from this source.</string> diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java index 4d33a3af..558a8c9b 100644 --- a/src/com/android/packageinstaller/PackageInstallerActivity.java +++ b/src/com/android/packageinstaller/PackageInstallerActivity.java @@ -57,6 +57,8 @@ import android.widget.Button; import android.widget.TabHost; import android.widget.TextView; +import com.android.settingslib.SecureTouchListener; + import java.io.File; /** @@ -453,6 +455,8 @@ public class PackageInstallerActivity extends Activity implements OnClickListene mOk = (Button) findViewById(R.id.ok_button); mCancel = (Button)findViewById(R.id.cancel_button); + mOk.setOnTouchListener( + new SecureTouchListener(getString(R.string.window_obscured_warning))); mOk.setOnClickListener(this); mCancel.setOnClickListener(this); |