PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a3c3bf1d: Merge "Notification alert every 5s and start after 30s." into jb-dev

Browse Source 
* commit 'a3c3bf1dee34940ade909306486a9bb12c75b8b7':
  Notification alert every 5s and start after 30s.
This commit is contained in:
Vikram Aggarwal
2012-05-02 16:09:15 -07:00
committed by Android Git Automerger
parent 33dbfab051 a3c3bf1dee
commit c6cce54189
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/CryptKeeper.java
View File

@@ -98,7 +98,6 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
private boolean mEncryptionGoneBad; private boolean mEncryptionGoneBad;
/** A flag to indicate when the back event should be ignored */ /** A flag to indicate when the back event should be ignored */
private boolean mIgnoreBack = false; private boolean mIgnoreBack = false;
private int mCooldown; private int mCooldown;
PowerManager.WakeLock mWakeLock; PowerManager.WakeLock mWakeLock;
private EditText mPasswordEntry; private EditText mPasswordEntry;
@@ -248,9 +247,9 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
Log.w(TAG, "notifyUser: Exception while playing sound: " + e); Log.w(TAG, "notifyUser: Exception while playing sound: " + e);
} }
} }
// Notify the user again in 30 seconds. // Notify the user again in 5 seconds.
mHandler.removeMessages(MESSAGE_NOTIFY); mHandler.removeMessages(MESSAGE_NOTIFY);
mHandler.sendEmptyMessageDelayed(MESSAGE_NOTIFY, 30 * 1000); mHandler.sendEmptyMessageDelayed(MESSAGE_NOTIFY, 5 * 1000);
} }
/** /**
@@ -510,9 +509,9 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
}, 0); }, 0);
updateEmergencyCallButtonState(); updateEmergencyCallButtonState();
// Notify the user that we are waiting for him to enter the password to get the device // Notify the user in 30 seconds that we are waiting for him to enter the password.
// out of this completely dead state. mHandler.removeMessages(MESSAGE_NOTIFY);
notifyUser(); mHandler.sendEmptyMessageDelayed(MESSAGE_NOTIFY, 30 * 1000);
} }
/** /**