Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 805ad7d1 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 4749fcf7: More tricksy. 

Merge commit '4749fcf7' into gingerbread-plus-aosp

* commit '4749fcf7':
  More tricksy.
parents 2876ad62 4749fcf7

src/com/android/settings/DeviceInfoSettings.java

+13 −6
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.settings; 
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.PreferenceActivity;
@@ -45,6 +46,8 @@ public class DeviceInfoSettings extends PreferenceActivity { 
    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

    protected void onCreate(Bundle icicle) {

        super.onCreate(icicle);
@@ -90,6 +93,9 @@ public class DeviceInfoSettings extends PreferenceActivity { 
    @Override

    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {

        if (preference.getKey().equals("firmware_version")) {

            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());
@@ -98,6 +104,7 @@ public class DeviceInfoSettings extends PreferenceActivity { 
                } catch (Exception e) {

                }

            }

        }

        return super.onPreferenceTreeClick(preferenceScreen, preference);

    }