diff options
| author | Dmitri Plotnikov <dplotnikov@google.com> | 2020-02-13 21:09:18 +0000 |
|---|---|---|
| committer | Dmitri Plotnikov <dplotnikov@google.com> | 2020-02-13 17:23:05 -0800 |
| commit | ab87b2766381e17d1ddae4772ecd96c4b4ba0a82 (patch) | |
| tree | cbf76c368ed0e96b995db10b8a47bac074efb777 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6988e11c8d131ae3fc006cde016a37e39645b4c0 (diff) | |
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
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions