diff options
| -rw-r--r-- | car_product/build/car_base.mk | 28 | ||||
| -rw-r--r-- | evs/app/RenderDirectView.cpp | 2 | ||||
| -rw-r--r-- | evs/app/RenderTopView.cpp | 2 | ||||
| -rw-r--r-- | evs/manager/HalCamera.cpp | 2 | ||||
| -rw-r--r-- | service/Android.mk | 2 | ||||
| -rw-r--r-- | service/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | service/res/values/strings.xml | 2 |
7 files changed, 9 insertions, 31 deletions
diff --git a/car_product/build/car_base.mk b/car_product/build/car_base.mk index 9138090267..6788a49dc1 100644 --- a/car_product/build/car_base.mk +++ b/car_product/build/car_base.mk @@ -20,8 +20,6 @@ PRODUCT_PACKAGE_OVERLAYS += packages/services/Car/car_product/overlay PRODUCT_PACKAGES += \ - ContactsProvider \ - DefaultContainerService \ Home \ BasicDreams \ CaptivePortalLogin \ @@ -46,39 +44,13 @@ PRODUCT_PACKAGES += \ ExternalStorageProvider \ atrace \ libandroidfw \ - libaudiopreprocessing \ libaudioutils \ - libfilterpack_imageproc \ - libgabi++ \ libmdnssd \ libnfc_ndef \ libpowermanager \ libspeexresampler \ - libstagefright_soft_aacdec \ - libstagefright_soft_aacenc \ - libstagefright_soft_amrdec \ - libstagefright_soft_amrnbenc \ - libstagefright_soft_amrwbenc \ - libstagefright_soft_avcdec \ - libstagefright_soft_avcenc \ - libstagefright_soft_flacdec \ - libstagefright_soft_flacenc \ - libstagefright_soft_g711dec \ - libstagefright_soft_gsmdec \ - libstagefright_soft_hevcdec \ - libstagefright_soft_mp3dec \ - libstagefright_soft_mpeg2dec \ - libstagefright_soft_mpeg4dec \ - libstagefright_soft_mpeg4enc \ - libstagefright_soft_opusdec \ - libstagefright_soft_rawdec \ - libstagefright_soft_vorbisdec \ - libstagefright_soft_vpxdec \ - libstagefright_soft_vpxenc \ libvariablespeed \ libwebrtc_audio_preprocessing \ - mdnsd \ - requestsync \ wifi-service \ A2dpSinkService \ diff --git a/evs/app/RenderDirectView.cpp b/evs/app/RenderDirectView.cpp index f0d26e404e..d7267cf53d 100644 --- a/evs/app/RenderDirectView.cpp +++ b/evs/app/RenderDirectView.cpp @@ -138,6 +138,6 @@ bool RenderDirectView::drawFrame(const BufferDesc& tgtBuffer) { // Wait for the rendering to finish glFinish(); - + detachRenderTarget(); return true; } diff --git a/evs/app/RenderTopView.cpp b/evs/app/RenderTopView.cpp index 80ccb11666..f09e76fdbf 100644 --- a/evs/app/RenderTopView.cpp +++ b/evs/app/RenderTopView.cpp @@ -217,7 +217,7 @@ bool RenderTopView::drawFrame(const BufferDesc& tgtBuffer) { // Wait for the rendering to finish glFinish(); - + detachRenderTarget(); return true; } diff --git a/evs/manager/HalCamera.cpp b/evs/manager/HalCamera.cpp index 41cff24260..ba2e9c62ef 100644 --- a/evs/manager/HalCamera.cpp +++ b/evs/manager/HalCamera.cpp @@ -130,6 +130,7 @@ Return<EvsResult> HalCamera::clientStreamStarting() { Return<EvsResult> result = EvsResult::OK; if (mStreamState == STOPPED) { + mStreamState = RUNNING; result = mHwCamera->startVideoStream(this); } @@ -149,6 +150,7 @@ void HalCamera::clientStreamEnding() { // If not, then stop the hardware stream if (!stillRunning) { + mStreamState = STOPPED; mHwCamera->stopVideoStream(); } } diff --git a/service/Android.mk b/service/Android.mk index d9ae9ecc71..9ab7df3633 100644 --- a/service/Android.mk +++ b/service/Android.mk @@ -76,6 +76,8 @@ LOCAL_STATIC_JAVA_LIBRARIES += \ car-systemtest \ com.android.car.procfsinspector-client \ +LOCAL_MIN_SDK_VERSION := 25 + include frameworks/base/packages/SettingsLib/common.mk include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/service/AndroidManifest.xml b/service/AndroidManifest.xml index 5212448ceb..7cef34161c 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"> diff --git a/service/res/values/strings.xml b/service/res/values/strings.xml index 9423e85ec6..1947e43eb9 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> |