From 0e809640a8631d4b0d10decf7c1277857f3011fd Mon Sep 17 00:00:00 2001
From: Sungsoo Lim <sungsoo@google.com>
Date: Wed, 19 Feb 2020 20:31:51 +0900
Subject: [PATCH] Fix NPE happened in the constructor of
 SystemMediaRoute2Provider

Bug: 149751047
Test: build
Change-Id: I7ce7bb3aa6f82aec8ca3cbd0b04cd68c3f88ea1f
---
 .../com/android/server/media/SystemMediaRoute2Provider.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/core/java/com/android/server/media/SystemMediaRoute2Provider.java b/services/core/java/com/android/server/media/SystemMediaRoute2Provider.java
index 8e3811452cc18..b2997cc6223f7 100644
--- a/services/core/java/com/android/server/media/SystemMediaRoute2Provider.java
+++ b/services/core/java/com/android/server/media/SystemMediaRoute2Provider.java
@@ -214,6 +214,8 @@ class SystemMediaRoute2Provider extends MediaRoute2Provider {
      * Updates the mSessionInfo. Returns true if the session info is changed.
      */
     boolean updateSessionInfosIfNeededLocked() {
+        // Prevent to execute this method before mBtRouteProvider is created.
+        if (mBtRouteProvider == null) return false;
         RoutingSessionInfo oldSessionInfo = mSessionInfos.isEmpty() ? null : mSessionInfos.get(0);
 
         RoutingSessionInfo.Builder builder = new RoutingSessionInfo.Builder(