commit 5859a194b89cf205c63aa309c17d131a17bb0f5a
author Colin Cross <ccross@android.com> Fri Jun 15 15:47:47 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Jun 15 15:47:47 2018 -0700
tree 119b1ac77ac66a53d8bfe8a56c4a01b62939cf7f
parent 70162c34d954c1aa4d545261826a86a7c6903a71
parent ba7a14b0b0ee18cf2233087feb5b9575d0b61c7d

Fix ManifestMerger issues am: 4543e61753
am: ba7a14b0b0

Change-Id: I1239207ab56123e8c225fa76b30809e4ffe14132

service/Android.mk

diff --git a/service/Android.mk b/service/Android.mk
index c03042d..2ec4c4a 100644
--- a/service/Android.mk
+++ b/service/Android.mk
@@ -72,6 +72,8 @@
         car-systemtest \
         com.android.car.procfsinspector-client \
 
+LOCAL_MIN_SDK_VERSION := 25
+
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))

service/AndroidManifest.xml

diff --git a/service/AndroidManifest.xml b/service/AndroidManifest.xml
index 5212448..7cef341 100644
--- a/service/AndroidManifest.xml
+++ b/service/AndroidManifest.xml
@@ -236,7 +236,7 @@
     <uses-permission android:name="android.permission.LOCATION_HARDWARE" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
-    <application android:label="Car service"
+    <application android:label="@string/app_title"
                  android:directBootAware="true"
                  android:allowBackup="false"
                  android:persistent="true">

service/res/values/strings.xml

diff --git a/service/res/values/strings.xml b/service/res/values/strings.xml
index 9423e85..1947e43 100644
--- a/service/res/values/strings.xml
+++ b/service/res/values/strings.xml
@@ -14,6 +14,8 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_title">Car service</string>
+
     <!--  For permissions -->
     <!-- Permission text: can access your car's information [CHAR LIMIT=NONE] -->
     <string name="car_permission_label">Car information</string>