diff options
| -rw-r--r-- | media/java/android/media/MediaRoute2ProviderService.java | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/media/java/android/media/MediaRoute2ProviderService.java b/media/java/android/media/MediaRoute2ProviderService.java index 1e3c15419cff..cce3d4fc67d5 100644 --- a/media/java/android/media/MediaRoute2ProviderService.java +++ b/media/java/android/media/MediaRoute2ProviderService.java @@ -502,6 +502,10 @@ public abstract class MediaRoute2ProviderService extends Service { return; } + if (mProviderInfo == null) { + return; + } + try { mRemoteCallback.notifyProviderUpdated(mProviderInfo); } catch (RemoteException ex) { diff --git a/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java b/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java index 5d415c2f636f..67d3fe995160 100644 --- a/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java +++ b/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java @@ -662,7 +662,9 @@ final class MediaRoute2ProviderServiceProxy extends MediaRoute2Provider } @Override - public void notifyProviderUpdated(MediaRoute2ProviderInfo providerInfo) { + public void notifyProviderUpdated(@NonNull MediaRoute2ProviderInfo providerInfo) { + Objects.requireNonNull(providerInfo, "providerInfo must not be null"); + for (MediaRoute2Info route : providerInfo.getRoutes()) { if (route.isSystemRoute()) { throw new SecurityException( |