tree cbf76c368ed0e96b995db10b8a47bac074efb777
parent 6988e11c8d131ae3fc006cde016a37e39645b4c0
author Dmitri Plotnikov <dplotnikov@google.com> 1581628158 +0000
committer Dmitri Plotnikov <dplotnikov@google.com> 1581643385 -0800

Prevents an NPE when content provider is slow to start

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

Also, fixes an ANR that could occur if getType is called for
an unknown content provider

---------------

Revert "Revert "Prevents an NPE when content provider is slow to start""

This reverts commit 3a54effffdb361ccd60169dcce93cf4e87fc6dac.

Reason for revert: Roll forward of the original CL,
  with a fix for the regression it caused

Original commit 140fc2e9c9382d5326b72ff28e8782e7bffc493d
Test: atest FrameworksCoreTests:android.content.ContentResolverTest
Fixes: 148987678

Change-Id: Ic60acceaabbf6b32c71d0b8bdf831a7d1f13d392