Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

platform_frameworks_base-old
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

ca854b42

Commit ca854b42 authored 5 years ago by Dmitri Plotnikov Committed by Android (Google) Code Review 5 years ago

Downloads
- Plain Diff

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

parents ccc0f8b5 ab87b276

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

core/java/android/content/ContentResolver.java 21 additions, 2 deletions

core/java/android/content/ContentResolver.java
core/tests/coretests/AndroidManifest.xml 6 additions, 0 deletions

core/tests/coretests/AndroidManifest.xml
core/tests/coretests/src/android/content/ContentResolverTest.java 25 additions, 0 deletions

...ts/coretests/src/android/content/ContentResolverTest.java
core/tests/coretests/src/android/content/SlowProvider.java 65 additions, 0 deletions

core/tests/coretests/src/android/content/SlowProvider.java
services/core/java/com/android/server/am/ActivityManagerService.java 13 additions, 16 deletions

...re/java/com/android/server/am/ActivityManagerService.java

with 130 additions and 18 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment