Skip to content
Commit 140fc2e9 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov
Browse files

Prevents an NPE when content provider is slow to start 

Also, extends the client-side timeout to match that
in ActivityManagerService.

Test: atest FrameworksCoreTests:android.content.ContentResolverTest
Fixes: 148987678
Change-Id: I1daf8625bd0306cc6f6f08c3268fa191d37bda7a
parent 04c84989
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment