summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--car-lib/Android.bp23
-rw-r--r--car-lib/Android.mk30
-rw-r--r--car-lib/src_feature_current/com/android/car/internal/FeatureConfiguration.java28
-rw-r--r--car_product/build/car_base.mk28
-rw-r--r--evs/app/RenderDirectView.cpp2
-rw-r--r--evs/app/RenderTopView.cpp2
-rw-r--r--evs/manager/HalCamera.cpp2
-rw-r--r--service/Android.mk2
-rw-r--r--service/AndroidManifest.xml2
-rw-r--r--service/res/values/strings.xml2
10 files changed, 36 insertions, 85 deletions
diff --git a/car-lib/Android.bp b/car-lib/Android.bp
index 5c719e98..806121f3 100644
--- a/car-lib/Android.bp
+++ b/car-lib/Android.bp
@@ -47,3 +47,26 @@ cc_library {
47 ], 47 ],
48} 48}
49 49
50java_library {
51 name: "android.car",
52 srcs: [
53 "src/**/*.java",
54 "src_feature_future/**/*.java",
55 "src/**/I*.aidl",
56 ],
57 aidl: {
58 include_dirs: [
59 "system/bt/binder",
60 ],
61 },
62 exclude_srcs: [
63 "src/android/car/storagemonitoring/IoStats.aidl",
64 "src/android/car/storagemonitoring/IoStatsEntry.aidl",
65 ],
66 product_variables: {
67 pdk: {
68 enabled: false,
69 },
70 },
71 installable: true,
72}
diff --git a/car-lib/Android.mk b/car-lib/Android.mk
index 3cb7d82f..e0fa4823 100644
--- a/car-lib/Android.mk
+++ b/car-lib/Android.mk
@@ -21,21 +21,8 @@ LOCAL_PATH:= $(call my-dir)
21 21
22include $(CLEAR_VARS) 22include $(CLEAR_VARS)
23 23
24LOCAL_MODULE := android.car
25LOCAL_MODULE_TAGS := optional
26
27ifneq ($(TARGET_USES_CAR_FUTURE_FEATURES),true)
28#TODO need a tool to generate proguard rule to drop all items under @FutureFeature
29#LOCAL_PROGUARD_ENABLED := custom
30#LOCAL_PROGUARD_FLAG_FILES := proguard_drop_future.flags
31endif
32
33car_lib_sources := $(call all-java-files-under, src) 24car_lib_sources := $(call all-java-files-under, src)
34ifeq ($(TARGET_USES_CAR_FUTURE_FEATURES),true)
35car_lib_sources += $(call all-java-files-under, src_feature_future) 25car_lib_sources += $(call all-java-files-under, src_feature_future)
36else
37car_lib_sources += $(call all-java-files-under, src_feature_current)
38endif
39 26
40car_lib_sources += $(call all-Iaidl-files-under, src) 27car_lib_sources += $(call all-Iaidl-files-under, src)
41 28
@@ -47,24 +34,15 @@ car_lib_sources += $(call all-Iaidl-files-under, src)
47car_lib_sources := $(filter-out src/android/car/storagemonitoring/IoStats.aidl,$(car_lib_sources)) 34car_lib_sources := $(filter-out src/android/car/storagemonitoring/IoStats.aidl,$(car_lib_sources))
48car_lib_sources := $(filter-out src/android/car/storagemonitoring/IoStatsEntry.aidl,$(car_lib_sources)) 35car_lib_sources := $(filter-out src/android/car/storagemonitoring/IoStatsEntry.aidl,$(car_lib_sources))
49 36
50LOCAL_AIDL_INCLUDES += system/bt/binder
51
52LOCAL_SRC_FILES := $(car_lib_sources)
53
54ifeq ($(EMMA_INSTRUMENT_FRAMEWORK),true)
55LOCAL_EMMA_INSTRUMENT := true
56endif
57
58include $(BUILD_JAVA_LIBRARY)
59
60ifeq ($(BOARD_IS_AUTOMOTIVE), true) 37ifeq ($(BOARD_IS_AUTOMOTIVE), true)
61$(call dist-for-goals,dist_files,$(full_classes_jar):$(LOCAL_MODULE).jar) 38full_classes_jar := $(call intermediates-dir-for,JAVA_LIBRARIES,android.car,,COMMON)/classes.jar
39$(call dist-for-goals,dist_files,$(full_classes_jar):android.car.jar)
62endif 40endif
63 41
64# API Check 42# API Check
65# --------------------------------------------- 43# ---------------------------------------------
66car_module := $(LOCAL_MODULE) 44car_module := android.car
67car_module_src_files := $(LOCAL_SRC_FILES) 45car_module_src_files := $(car_lib_sources)
68car_module_api_dir := $(LOCAL_PATH)/api 46car_module_api_dir := $(LOCAL_PATH)/api
69car_module_java_libraries := framework 47car_module_java_libraries := framework
70car_module_include_systemapi := true 48car_module_include_systemapi := true
diff --git a/car-lib/src_feature_current/com/android/car/internal/FeatureConfiguration.java b/car-lib/src_feature_current/com/android/car/internal/FeatureConfiguration.java
deleted file mode 100644
index 462f3204..00000000
--- a/car-lib/src_feature_current/com/android/car/internal/FeatureConfiguration.java
+++ /dev/null
@@ -1,28 +0,0 @@
1/*
2 * Copyright (C) 2017 The Android Open Source Project
3 *
4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License.
6 * You may obtain a copy of the License at
7 *
8 * http://www.apache.org/licenses/LICENSE-2.0
9 *
10 * Unless required by applicable law or agreed to in writing, software
11 * distributed under the License is distributed on an "AS IS" BASIS,
12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 * See the License for the specific language governing permissions and
14 * limitations under the License.
15 */
16package com.android.car.internal;
17
18/**
19 * Class to hold static boolean flag for enabling / disabling features.
20 *
21 * @hide
22 */
23public class FeatureConfiguration {
24 /** Disable future feature by default. */
25 public static final boolean DEFAULT = false;
26 /** product configuration in CarInfoManager */
27 public static final boolean ENABLE_PRODUCT_CONFIGURATION_INFO = DEFAULT;
28}
diff --git a/car_product/build/car_base.mk b/car_product/build/car_base.mk
index 91380902..6788a49d 100644
--- a/car_product/build/car_base.mk
+++ b/car_product/build/car_base.mk
@@ -20,8 +20,6 @@
20PRODUCT_PACKAGE_OVERLAYS += packages/services/Car/car_product/overlay 20PRODUCT_PACKAGE_OVERLAYS += packages/services/Car/car_product/overlay
21 21
22PRODUCT_PACKAGES += \ 22PRODUCT_PACKAGES += \
23 ContactsProvider \
24 DefaultContainerService \
25 Home \ 23 Home \
26 BasicDreams \ 24 BasicDreams \
27 CaptivePortalLogin \ 25 CaptivePortalLogin \
@@ -46,39 +44,13 @@ PRODUCT_PACKAGES += \
46 ExternalStorageProvider \ 44 ExternalStorageProvider \
47 atrace \ 45 atrace \
48 libandroidfw \ 46 libandroidfw \
49 libaudiopreprocessing \
50 libaudioutils \ 47 libaudioutils \
51 libfilterpack_imageproc \
52 libgabi++ \
53 libmdnssd \ 48 libmdnssd \
54 libnfc_ndef \ 49 libnfc_ndef \
55 libpowermanager \ 50 libpowermanager \
56 libspeexresampler \ 51 libspeexresampler \
57 libstagefright_soft_aacdec \
58 libstagefright_soft_aacenc \
59 libstagefright_soft_amrdec \
60 libstagefright_soft_amrnbenc \
61 libstagefright_soft_amrwbenc \
62 libstagefright_soft_avcdec \
63 libstagefright_soft_avcenc \
64 libstagefright_soft_flacdec \
65 libstagefright_soft_flacenc \
66 libstagefright_soft_g711dec \
67 libstagefright_soft_gsmdec \
68 libstagefright_soft_hevcdec \
69 libstagefright_soft_mp3dec \
70 libstagefright_soft_mpeg2dec \
71 libstagefright_soft_mpeg4dec \
72 libstagefright_soft_mpeg4enc \
73 libstagefright_soft_opusdec \
74 libstagefright_soft_rawdec \
75 libstagefright_soft_vorbisdec \
76 libstagefright_soft_vpxdec \
77 libstagefright_soft_vpxenc \
78 libvariablespeed \ 52 libvariablespeed \
79 libwebrtc_audio_preprocessing \ 53 libwebrtc_audio_preprocessing \
80 mdnsd \
81 requestsync \
82 wifi-service \ 54 wifi-service \
83 A2dpSinkService \ 55 A2dpSinkService \
84 56
diff --git a/evs/app/RenderDirectView.cpp b/evs/app/RenderDirectView.cpp
index f0d26e40..d7267cf5 100644
--- a/evs/app/RenderDirectView.cpp
+++ b/evs/app/RenderDirectView.cpp
@@ -138,6 +138,6 @@ bool RenderDirectView::drawFrame(const BufferDesc& tgtBuffer) {
138 138
139 // Wait for the rendering to finish 139 // Wait for the rendering to finish
140 glFinish(); 140 glFinish();
141 141 detachRenderTarget();
142 return true; 142 return true;
143} 143}
diff --git a/evs/app/RenderTopView.cpp b/evs/app/RenderTopView.cpp
index 80ccb116..f09e76fd 100644
--- a/evs/app/RenderTopView.cpp
+++ b/evs/app/RenderTopView.cpp
@@ -217,7 +217,7 @@ bool RenderTopView::drawFrame(const BufferDesc& tgtBuffer) {
217 217
218 // Wait for the rendering to finish 218 // Wait for the rendering to finish
219 glFinish(); 219 glFinish();
220 220 detachRenderTarget();
221 return true; 221 return true;
222} 222}
223 223
diff --git a/evs/manager/HalCamera.cpp b/evs/manager/HalCamera.cpp
index 41cff242..ba2e9c62 100644
--- a/evs/manager/HalCamera.cpp
+++ b/evs/manager/HalCamera.cpp
@@ -130,6 +130,7 @@ Return<EvsResult> HalCamera::clientStreamStarting() {
130 Return<EvsResult> result = EvsResult::OK; 130 Return<EvsResult> result = EvsResult::OK;
131 131
132 if (mStreamState == STOPPED) { 132 if (mStreamState == STOPPED) {
133 mStreamState = RUNNING;
133 result = mHwCamera->startVideoStream(this); 134 result = mHwCamera->startVideoStream(this);
134 } 135 }
135 136
@@ -149,6 +150,7 @@ void HalCamera::clientStreamEnding() {
149 150
150 // If not, then stop the hardware stream 151 // If not, then stop the hardware stream
151 if (!stillRunning) { 152 if (!stillRunning) {
153 mStreamState = STOPPED;
152 mHwCamera->stopVideoStream(); 154 mHwCamera->stopVideoStream();
153 } 155 }
154} 156}
diff --git a/service/Android.mk b/service/Android.mk
index d9ae9ecc..9ab7df36 100644
--- a/service/Android.mk
+++ b/service/Android.mk
@@ -76,6 +76,8 @@ LOCAL_STATIC_JAVA_LIBRARIES += \
76 car-systemtest \ 76 car-systemtest \
77 com.android.car.procfsinspector-client \ 77 com.android.car.procfsinspector-client \
78 78
79LOCAL_MIN_SDK_VERSION := 25
80
79include frameworks/base/packages/SettingsLib/common.mk 81include frameworks/base/packages/SettingsLib/common.mk
80 82
81include $(BUILD_STATIC_JAVA_LIBRARY) 83include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/service/AndroidManifest.xml b/service/AndroidManifest.xml
index 870ed100..24c9cd74 100644
--- a/service/AndroidManifest.xml
+++ b/service/AndroidManifest.xml
@@ -231,7 +231,7 @@
231 <uses-permission android:name="android.permission.LOCATION_HARDWARE" /> 231 <uses-permission android:name="android.permission.LOCATION_HARDWARE" />
232 <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> 232 <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
233 233
234 <application android:label="Car service" 234 <application android:label="@string/app_title"
235 android:directBootAware="true" 235 android:directBootAware="true"
236 android:allowBackup="false" 236 android:allowBackup="false"
237 android:persistent="true"> 237 android:persistent="true">
diff --git a/service/res/values/strings.xml b/service/res/values/strings.xml
index 9423e85e..1947e43e 100644
--- a/service/res/values/strings.xml
+++ b/service/res/values/strings.xml
@@ -14,6 +14,8 @@
14 limitations under the License. 14 limitations under the License.
15--> 15-->
16<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> 16<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
17 <string name="app_title">Car service</string>
18
17 <!-- For permissions --> 19 <!-- For permissions -->
18 <!-- Permission text: can access your car's information [CHAR LIMIT=NONE] --> 20 <!-- Permission text: can access your car's information [CHAR LIMIT=NONE] -->
19 <string name="car_permission_label">Car information</string> 21 <string name="car_permission_label">Car information</string>