Merge "Fix permissions and targetSdkVersion for sample apps" into androidx-main
diff --git a/car/app/app-samples/navigation/automotive/build.gradle b/car/app/app-samples/navigation/automotive/build.gradle
index 531198c..9984ce7 100644
--- a/car/app/app-samples/navigation/automotive/build.gradle
+++ b/car/app/app-samples/navigation/automotive/build.gradle
@@ -26,6 +26,7 @@
defaultConfig {
applicationId "androidx.car.app.sample.navigation"
minSdkVersion 29
+ targetSdkVersion 33
versionCode 1
versionName "1.0"
}
diff --git a/car/app/app-samples/navigation/automotive/src/main/AndroidManifestWithSdkVersion.xml b/car/app/app-samples/navigation/automotive/src/main/AndroidManifestWithSdkVersion.xml
index 47c9404..ee2be84 100644
--- a/car/app/app-samples/navigation/automotive/src/main/AndroidManifestWithSdkVersion.xml
+++ b/car/app/app-samples/navigation/automotive/src/main/AndroidManifestWithSdkVersion.xml
@@ -37,6 +37,12 @@
<uses-permission android:name="androidx.car.app.ACCESS_SURFACE"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+ <!-- SDK 33 onwards, apps require this permission to send any notifications to the system -->
+ <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+
+ <!-- For the Microphone Recording demos. -->
+ <uses-permission android:name="android.permission.RECORD_AUDIO" />
+
<!-- Various required feature settings for an automotive app. -->
<uses-feature
android:name="android.hardware.type.automotive"
diff --git a/car/app/app-samples/navigation/mobile/build.gradle b/car/app/app-samples/navigation/mobile/build.gradle
index 5e80268..ece98f3 100644
--- a/car/app/app-samples/navigation/mobile/build.gradle
+++ b/car/app/app-samples/navigation/mobile/build.gradle
@@ -25,6 +25,7 @@
defaultConfig {
applicationId "androidx.car.app.sample.navigation"
minSdkVersion 23
+ targetSdkVersion 33
versionCode 1
versionName "1.0"
}
diff --git a/car/app/app-samples/navigation/mobile/src/main/AndroidManifestWithSdkVersion.xml b/car/app/app-samples/navigation/mobile/src/main/AndroidManifestWithSdkVersion.xml
index e2ec81f..d9473ac 100644
--- a/car/app/app-samples/navigation/mobile/src/main/AndroidManifestWithSdkVersion.xml
+++ b/car/app/app-samples/navigation/mobile/src/main/AndroidManifestWithSdkVersion.xml
@@ -39,6 +39,8 @@
<!-- For Microphone Recording -->
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
+
+ <!-- SDK 33 onwards, apps require this permission to send any notifications to the system -->
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<application
diff --git a/car/app/app-samples/showcase/automotive/src/main/AndroidManifest.xml b/car/app/app-samples/showcase/automotive/src/main/AndroidManifest.xml
index 83fb3b2..28758d6 100644
--- a/car/app/app-samples/showcase/automotive/src/main/AndroidManifest.xml
+++ b/car/app/app-samples/showcase/automotive/src/main/AndroidManifest.xml
@@ -24,6 +24,9 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+ <!-- SDK 33 onwards, apps require this permission to send any notifications to the system -->
+ <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+
<!-- For PlaceListMapTemplate -->
<uses-permission android:name="androidx.car.app.MAP_TEMPLATES"/>
diff --git a/car/app/app-samples/showcase/automotive/src/main/AndroidManifestWithSdkVersion.xml b/car/app/app-samples/showcase/automotive/src/main/AndroidManifestWithSdkVersion.xml
index 75945b7..96ad8b9 100644
--- a/car/app/app-samples/showcase/automotive/src/main/AndroidManifestWithSdkVersion.xml
+++ b/car/app/app-samples/showcase/automotive/src/main/AndroidManifestWithSdkVersion.xml
@@ -40,8 +40,12 @@
<uses-permission android:name="androidx.car.app.NAVIGATION_TEMPLATES"/>
<uses-permission android:name="androidx.car.app.ACCESS_SURFACE"/>
+ <!-- For the Microphone Recording demos. -->
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
+ <!-- SDK 33 onwards, apps require this permission to send any notifications to the system -->
+ <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+
<!-- For Access to Car Hardware. -->
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
diff --git a/car/app/app-samples/showcase/mobile/build.gradle b/car/app/app-samples/showcase/mobile/build.gradle
index 5466dad..ac1eaeb 100644
--- a/car/app/app-samples/showcase/mobile/build.gradle
+++ b/car/app/app-samples/showcase/mobile/build.gradle
@@ -25,7 +25,7 @@
defaultConfig {
applicationId "androidx.car.app.sample.showcase"
minSdkVersion 23
- targetSdkVersion 31
+ targetSdkVersion 33
// Increment this to generate signed builds for uploading to Playstore
// Make sure this is different from the showcase-automotive version
versionCode 106
diff --git a/car/app/app-samples/showcase/mobile/src/main/AndroidManifest.xml b/car/app/app-samples/showcase/mobile/src/main/AndroidManifest.xml
index 59a17ab..917662c 100644
--- a/car/app/app-samples/showcase/mobile/src/main/AndroidManifest.xml
+++ b/car/app/app-samples/showcase/mobile/src/main/AndroidManifest.xml
@@ -31,6 +31,9 @@
<uses-permission android:name="androidx.car.app.NAVIGATION_TEMPLATES"/>
<uses-permission android:name="androidx.car.app.ACCESS_SURFACE"/>
+ <!-- SDK 33 onwards, apps require this permission to send any notifications to the system -->
+ <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+
<!-- For Access to Car Hardware. -->
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
diff --git a/car/app/app-samples/showcase/mobile/src/main/AndroidManifestWithSdkVersion.xml b/car/app/app-samples/showcase/mobile/src/main/AndroidManifestWithSdkVersion.xml
index 1c9c267..6f205ae 100644
--- a/car/app/app-samples/showcase/mobile/src/main/AndroidManifestWithSdkVersion.xml
+++ b/car/app/app-samples/showcase/mobile/src/main/AndroidManifestWithSdkVersion.xml
@@ -27,12 +27,15 @@
<uses-sdk
android:minSdkVersion="23"
- android:targetSdkVersion="31" />
+ android:targetSdkVersion="33" />
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+ <!-- SDK 33 onwards, apps require this permission to send any notifications to the system -->
+ <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+
<!-- For PlaceListMapTemplate -->
<uses-permission android:name="androidx.car.app.MAP_TEMPLATES"/>
