| commit | 140fc2e9c9382d5326b72ff28e8782e7bffc493d | [log] [tgz] |
|---|---|---|
| author | Dmitri Plotnikov <dplotnikov@google.com> | Wed Feb 05 18:42:01 2020 -0800 |
| committer | Dmitri Plotnikov <dplotnikov@google.com> | Fri Feb 07 13:58:06 2020 -0800 |
| tree | caae0b5987a186c86e258da7969d18052b683dfb | |
| parent | 04c84989d3d4dba39887fffc0989fe6a5b3f24b1 [diff] |
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