summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2021-06-09 20:39:00 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-06-09 20:39:00 +0000
commitb0529bf65551959e844d2264d894e723bcb87241 (patch)
treec540ffaade515278be9a04df6377975f9f72467f
parent384a44c85a9b2754a17ef7c62f757ceb22bca0b9 (diff)
parent749210d092e7527b320cbe873777dd5e58e3c102 (diff)
downloadMessenger-android11-gsi.tar.gz
Snap for 7316203 from f31250016efa579245264d36e93f03e818fa2406 to rvc-platform-release am: 749210d092android11-gsi
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Messenger/+/14427779 Change-Id: I61bc4d75b7a00c5cfd02d459d19fbf57ef4e41d3
-rw-r--r--AndroidManifest.xml2
-rw-r--r--src/com/android/car/messenger/MessengerService.java4
2 files changed, 5 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 54e7162..0d5156d 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"/>
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.bluetooth.BluetoothMonitor;
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 @@ public class MessengerService extends Service {
mBluetoothMonitor = new BluetoothMonitor(this);
mBluetoothMonitor.registerListener(mMessengerDelegate);
sendServiceRunningNotification();
+ if (!InMemoryPhoneBook.isInitialized()) {
+ InMemoryPhoneBook.init(this);
+ }
}