commit 2eb96e2b097d36dec45f8817625fdc22ebadeb3b
author Xin Li <delphij@google.com> Fri Jun 18 12:24:39 2021 -0700
committer Xin Li <delphij@google.com> Fri Jun 18 12:24:39 2021 -0700
tree 6dea7a21128eead8d0cc9d31aa73101f5ae5747e
parent 8bb7103c0ebd8336fe85259e391bdb745249f9f0
parent 7c45f95db78d0e76eddbc4b11152aa241425172e

DO NOT MERGE - Merge RQ3A.210605.005

Bug: 190855093
Merged-In: If575e61edf2757ca3a24d3eb1a5a14e7674d440d
Change-Id: I969a3adcc754d51e9685324cd54216a342eca47b

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3d74ff7..5438926 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,7 +17,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.android.car.messenger">
 
-    <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="26"/>
+    <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29"/>
 
     <uses-permission android:name="android.permission.BLUETOOTH"/>
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>

src/com/android/car/messenger/MessengerService.java

diff --git a/src/com/android/car/messenger/MessengerService.java b/src/com/android/car/messenger/MessengerService.java
index 905109f..35c5900 100644
--- a/src/com/android/car/messenger/MessengerService.java
+++ b/src/com/android/car/messenger/MessengerService.java
@@ -27,6 +27,7 @@
 import com.android.car.messenger.common.BaseNotificationDelegate;
 import com.android.car.messenger.common.ConversationKey;
 import com.android.car.messenger.log.L;
+import com.android.car.telephony.common.InMemoryPhoneBook;
 
 /** Service responsible for handling SMS messaging events from paired Bluetooth devices. */
 public class MessengerService extends Service {
@@ -81,6 +82,9 @@
         mBluetoothMonitor = new BluetoothMonitor(this);
         mBluetoothMonitor.registerListener(mMessengerDelegate);
         sendServiceRunningNotification();
+        if (!InMemoryPhoneBook.isInitialized()) {
+            InMemoryPhoneBook.init(this);
+        }
     }