summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2011-06-07 12:03:08 -0700
committerBrian Carlstrom <bdc@google.com>2011-06-07 12:03:08 -0700
commit9e606dfda36c1a23f36724b7d45f97d2942573ee (patch)
treedb6738906b6b1ad6362e43aea6bd358785fe9065 /src
parentc5b990fbb787500c72f257dc92c9bfa69debb2bb (diff)
downloadandroid_packages_apps_KeyChain-9e606dfda36c1a23f36724b7d45f97d2942573ee.tar.gz
android_packages_apps_KeyChain-9e606dfda36c1a23f36724b7d45f97d2942573ee.tar.bz2
android_packages_apps_KeyChain-9e606dfda36c1a23f36724b7d45f97d2942573ee.zip
Make KeyChainActivity.onBackPressed return null response
Also add some negative permissions tests to KeyChainServiceTest Change-Id: I17d8c5e624db71b45f70c7c46ed49b8571ce323b
Diffstat (limited to 'src')
-rw-r--r--src/com/android/keychain/KeyChainActivity.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/keychain/KeyChainActivity.java b/src/com/android/keychain/KeyChainActivity.java
index 3952dfa..f637b09 100644
--- a/src/com/android/keychain/KeyChainActivity.java
+++ b/src/com/android/keychain/KeyChainActivity.java
@@ -162,6 +162,10 @@ public class KeyChainActivity extends ListActivity {
finish();
}
+ @Override public void onBackPressed() {
+ finish(null);
+ }
+
@Override protected void onSaveInstanceState(Bundle savedState) {
super.onSaveInstanceState(savedState);
if (mState != State.INITIAL) {