| commit | 0e809640a8631d4b0d10decf7c1277857f3011fd | [log] [tgz] |
|---|---|---|
| author | Sungsoo Lim <sungsoo@google.com> | Wed Feb 19 20:31:51 2020 +0900 |
| committer | Sungsoo Lim <sungsoo@google.com> | Wed Feb 19 20:31:51 2020 +0900 |
| tree | a946b09f0565de079dc73d6a72f13e9396a7990b | |
| parent | 5b6fb2aea29c0835022fdfdda823ac7a24d6bc12 [diff] |
Fix NPE happened in the constructor of SystemMediaRoute2Provider Bug: 149751047 Test: build Change-Id: I7ce7bb3aa6f82aec8ca3cbd0b04cd68c3f88ea1f
diff --git a/services/core/java/com/android/server/media/SystemMediaRoute2Provider.java b/services/core/java/com/android/server/media/SystemMediaRoute2Provider.java index 8e38114..b2997cc 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 @@ * 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(