Also, extends the client-side timeout to match that in ActivityManagerService. Test: atest FrameworksCoreTests:android.content.ContentResolverTest Fixes: 148987678 Change-Id: I1daf8625bd0306cc6f6f08c3268fa191d37bda7a
8de85f4b50
da086e20c0
031040a9b4
6d4004fc61
cd3f28071e
9514b54cfd
ede31cad1c
ad194f332d
a3243e8e6e
535739cdd7
16d8f3ccc6
402674f2a0
c3e31d6ac5
f8a4287915