diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-09-30 14:26:27 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2013-10-01 09:50:41 -0700 |
| commit | 7aa7601c09ab5d87cc15a0ed9a8f511d494a4cbc (patch) | |
| tree | a22ca7e432de4309aedf7785babd5e1b73c28b09 /core/java/android/app/ContextImpl.java | |
| parent | 7eb5ce03d9697caa2e9caf0437036a937d081e90 (diff) | |
| download | frameworks_base-7aa7601c09ab5d87cc15a0ed9a8f511d494a4cbc.zip frameworks_base-7aa7601c09ab5d87cc15a0ed9a8f511d494a4cbc.tar.gz frameworks_base-7aa7601c09ab5d87cc15a0ed9a8f511d494a4cbc.tar.bz2 | |
Detect wedged ContentProviders, treat as ANR.
All ContentProvider calls are currently blocking, making it hard for
an app to recover when a remote provider is wedged. This change adds
hidden support to ContentProviderClient to timeout remote calls,
treating them as ANRs. This behavior is disabled by default.
Update DocumentsUI to use a 20 second timeout whenever interacting
with a storage provider.
Bug: 10993301, 10819461, 10852518
Change-Id: I10fa3c425c6a7225fff9cb7a0a07659028230cd3
Diffstat (limited to 'core/java/android/app/ContextImpl.java')
| -rw-r--r-- | core/java/android/app/ContextImpl.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 0ba2ac5..300424c 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -2200,5 +2200,10 @@ class ContextImpl extends Context { public void unstableProviderDied(IContentProvider icp) { mMainThread.handleUnstableProviderDied(icp.asBinder(), true); } + + @Override + public void appNotRespondingViaProvider(IContentProvider icp) { + mMainThread.appNotRespondingViaProvider(icp.asBinder()); + } } } |