diff options
| author | Joe Onorato <joeo@android.com> | 2010-07-27 09:05:05 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-07-27 09:05:05 -0700 |
| commit | 8c65ee2d509db7dcb50ce4530d52eb5bdca3f917 (patch) | |
| tree | 019b6138914ffdbc96e3f06cf2264c014f96de63 /core/java/android/content/ContentProvider.java | |
| parent | 0ac8ac301d056604485aeca9ffe5ce8d1e63ef19 (diff) | |
| parent | 7999bff154e96efb0bc9d2b89ec277f0f9ca0d2f (diff) | |
| download | frameworks_base-8c65ee2d509db7dcb50ce4530d52eb5bdca3f917.zip frameworks_base-8c65ee2d509db7dcb50ce4530d52eb5bdca3f917.tar.gz frameworks_base-8c65ee2d509db7dcb50ce4530d52eb5bdca3f917.tar.bz2 | |
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
Diffstat (limited to 'core/java/android/content/ContentProvider.java')
0 files changed, 0 insertions, 0 deletions