| commit | 8c65ee2d509db7dcb50ce4530d52eb5bdca3f917 | [log] [tgz] |
|---|---|---|
| author | Joe Onorato <joeo@android.com> | Tue Jul 27 09:05:05 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jul 27 09:05:05 2010 -0700 |
| tree | 019b6138914ffdbc96e3f06cf2264c014f96de63 | |
| parent | 0ac8ac301d056604485aeca9ffe5ce8d1e63ef19 [diff] | |
| parent | 7999bff154e96efb0bc9d2b89ec277f0f9ca0d2f [diff] |
Merge "Add a method to let a properly permissioned app directly manipulate the user activity timeout. We should come up with a better API for this, but this is for a last minute power manager hack to turn off the screen sooner after a phone call ends." into froyo