am 805ad7d1: am 4749fcf7: More tricksy.

Merge commit '805ad7d1aa3d5177b383af3ad49df20092d2ef9d'

* commit '805ad7d1aa3d5177b383af3ad49df20092d2ef9d':
  More tricksy.

1 files changed, 13 insertions, 6 deletions

diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 7f9433879..0d6549aa0 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -20,6 +20,7 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.SystemClock;
 import android.os.SystemProperties;
 import android.preference.Preference;
 import android.preference.PreferenceGroup;
@@ -44,6 +45,8 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment {
     private static final String KEY_SYSTEM_UPDATE_SETTINGS = "system_update_settings";
     private static final String PROPERTY_URL_SAFETYLEGAL = "ro.url.safetylegal";
     
+    long[] mHits = new long[3];
+    
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -89,12 +92,16 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment {
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
         if (preference.getKey().equals("firmware_version")) {
-            Intent intent = new Intent(Intent.ACTION_MAIN);
-            intent.setClassName("android",
-                    com.android.internal.app.PlatLogoActivity.class.getName());
-            try {
-                startActivity(intent);
-            } catch (Exception e) {
+            System.arraycopy(mHits, 1, mHits, 0, mHits.length-1);
+            mHits[mHits.length-1] = SystemClock.uptimeMillis();
+            if (mHits[0] >= (SystemClock.uptimeMillis()-500)) {
+                Intent intent = new Intent(Intent.ACTION_MAIN);
+                intent.setClassName("android",
+                        com.android.internal.app.PlatLogoActivity.class.getName());
+                try {
+                    startActivity(intent);
+                } catch (Exception e) {
+                }
             }
         }
         return super.onPreferenceTreeClick(preferenceScreen, preference);