alexa
diff --git a/‎Alexa_Embedded_CX_Requirements_v12.0.xlsx‎
-93.1 KB b/‎Alexa_Embedded_CX_Requirements_v12.0.xlsx‎
-93.1 KB
diff --git a/‎Alexa_Embedded_CX_Requirements_v13.0.xlsx‎
92.1 KB b/‎Alexa_Embedded_CX_Requirements_v13.0.xlsx‎
92.1 KB
diff --git a/‎NOTICE‎
Lines changed: 13 additions & 2 deletions b/‎NOTICE‎
Lines changed: 13 additions & 2 deletions
diff --git a/‎aacs/android/README.md‎
Lines changed: 0 additions & 65 deletions b/‎aacs/android/README.md‎
Lines changed: 0 additions & 65 deletions
diff --git a/‎aacs/android/app-components/README.md‎
Lines changed: 2 additions & 2 deletions b/‎aacs/android/app-components/README.md‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎aacs/android/app-components/alexa-auto-apis/build.gradle‎
Lines changed: 7 additions & 4 deletions b/‎aacs/android/app-components/alexa-auto-apis/build.gradle‎
Lines changed: 7 additions & 4 deletions
diff --git a/‎aacs/android/app-components/alexa-auto-apis/src/main/java/com/amazon/alexa/auto/apis/app/AlexaAppRootComponent.java‎
Lines changed: 8 additions & 0 deletions b/‎aacs/android/app-components/alexa-auto-apis/src/main/java/com/amazon/alexa/auto/apis/app/AlexaAppRootComponent.java‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎aacs/android/app-components/alexa-auto-apis/src/main/java/com/amazon/alexa/auto/apis/communication/ContactsController.java‎
Lines changed: 7 additions & 0 deletions b/‎aacs/android/app-components/alexa-auto-apis/src/main/java/com/amazon/alexa/auto/apis/communication/ContactsController.java‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎aacs/android/app-components/alexa-auto-apis/src/main/java/com/amazon/alexa/auto/apis/media/MediaSourceInfo.kt‎
Lines changed: 21 additions & 0 deletions b/‎aacs/android/app-components/alexa-auto-apis/src/main/java/com/amazon/alexa/auto/apis/media/MediaSourceInfo.kt‎
Lines changed: 21 additions & 0 deletions
diff --git a/‎aacs/android/app-components/alexa-auto-apis/src/main/java/com/amazon/alexa/auto/apis/media/PlayerInfoCache.java‎
Lines changed: 90 additions & 0 deletions b/‎aacs/android/app-components/alexa-auto-apis/src/main/java/com/amazon/alexa/auto/apis/media/PlayerInfoCache.java‎
Lines changed: 90 additions & 0 deletions
@@ -40,6 +40,17 @@ an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
 or implied. See the License for the specific language governing permissions and
 limitations under the License.
 
+***************************
+ALEXA AUTO SDK COMPONENTS
+***************************
+The following Alexa Auto SDK sub-component is licensed under the Amazon Software License:
+- modules/core/Arbitrator
+
+You may not use this file except in compliance with the Amazon Software License. A copy
+of the Amazon Software License is located at:
+
+      http://aws.amazon.com/asl/
+  
 **********************
 THIRD PARTY COMPONENTS
 **********************
@@ -126,7 +137,7 @@ http://vadikom.com
 Licensed MIT
 ----------------------------------------
 
-AACS Sample App includes the following open source Google material design icons:
+Alexa Auto App includes the following open source Google material design icons:
 
 Google material design icons - v4.0.0 - August 31, 2020
 https://github.com/google/material-design-icons/blob/master/android/av/album/materialicons/black/res/drawable/baseline_album_24.xml
@@ -142,4 +153,4 @@ https://github.com/google/material-design-icons/blob/master/android/navigation/c
 
 Google material design icons are under Apache License Version 2.0
 https://github.com/google/material-design-icons/blob/master/LICENSE
-----------------------------------------
+----------------------------------------
@@ -33,63 +33,6 @@ supports streaming audio data to and from an external application. It builds int
 9. The core of the **HMI application** that holds the business logic need not change with
 `AlexaAutoClientService`. However, you must modify the application so that it can interface with the APIs defined by AACS.
 
-## Obtaining the AACS AAR
-AACS is packaged as an Android library (AAR). You can obtain the AACS AAR in one of two ways:
-
-* To obtain the pre-built AACS AAR and the other dependency AARs which are required for using AACS, contact your Amazon Solutions Architect (SA) or Partner Manager for more information.
-
-* To build the AACS AAR from source code, following the steps below.
-
-    1. Enter the following command to change the directory:
-        ```
-        cd ${AAC_SDK_HOME}/aacs/android/service
-        ```  
-
-    2. Enter the following command to start the local build.
-        ```
-          ./gradlew assembleLocalRelease
-        ```
-    
-          This command builds AACS core service, as well as all the other needed dependencies (such as Auto SDK) required for AACS to function. It also generates AAR files that are used for communicating with AACS from your application.
-
-          To install all the generated AARs to your application, add the `installDeps` task after the build command. Specify the path you want the artifacts to be installed to by using the `-PinstallPath` option. If `-PinstallPath` is not specified, the artifacts will be copied to `alexa-auto-sdk/aacs/android/service/deploy` by default.
-          
-          ```
-              ./gradlew assembleLocalRelease installDeps -PinstallPath=<path/to/your/application/directory>
-          ```
-
-## Using AACS with Your Application
-This section provides information about how AACS works with your application.
-
-To build your application with AACS, you can either include AACS and the other dependencies as local sub-projects, or you can build them as AARs and copy to the libs folder of your application.
-
-1. Using AACS as a local module
-
-    Include AACS and the other dependency libraries as sub-projects in the `settings.gradle` file of your project.
-    In the `build.gradle` file of your application, add the following `implementation` statements:
-    ~~~
-      implementation project(':aacs')
-      implementation project(':aacs-extra')
-      implementation project(':aacs-maccandroid')
-      implementation project(':aacsconstants')
-      implementation project(':aacsipc')
-      implementation project(':aacscommonutils')
-      implementation project(':alexa-auto-tts')
-      
-      // replace the <path/to/Auto/SDK/AARs> placeholder with your path
-      implementation fileTree(include: ['*.aar'], dir: <path/to/Auto/SDK/AARs>)
-    ~~~
-    See the `${AUTO_SDK_HOME}/aacs/android/sample-app/settings.gradle` and `${AUTO_SDK_HOME}/aacs/android/sample-app/alexa-auto-app/build.gradle` files of the AACS Sample App for more information.
-
-2. Using AACS as a local binary
-
-    Include the AARs in the libs folder of your application. See [Obtaining the AACS AAR](#obtaining-the-aacs-aar) for instructions of how to obtain the AACS AARs.
-    
-    Add the following `implementation` statement to the `build.gradle` file of your application:
-    ~~~
-        implementation fileTree(dir: 'libs', include: ['*.aar'])
-    ~~~
-
 ### AACS as Foreground Service or System Service
 AACS runs as a started service on Android. The [Initialization](#initialization) section describes how it is started; this section describes what you do to run AACS as a foreground service or a system service. 
 
@@ -812,11 +755,3 @@ String payload = intent.getStringExtra(AACSConstants.PAYLOAD);
 You can use AACS instrumentation to log AASB messages for debugging purposes. For more information about how to use instrumentation, see the [AACS Instrumentation README](./service/core-service/src/debug/java/com/amazon/alexaautoclientservice/README.md).
 
 >**Note:** You can use instrumentation only if you use the debug option when building the Auto SDK with AACS.
-
-## Including App Components with AACS AAR in your application
-The Auto SDK provides packages (also called "app components") in the [`$AAC_SDK_HOME/aacs/android/app-components`](./app-components) directory. App components could be included in your application along with AACS AAR to speed up the Alexa integration.
-
->**Note:** Some app components implement the handling of AASB messages for certain topics, allowing your applications to interface with AACS by using standard Android APIs. If you include such app components in your application with AACS AAR, your application does not need to handle the AASB messages for those particular AASB topics.
-
-## AACS Sample App
-The Auto SDK includes an Android-based application that demonstrates how an application uses AACS. For more information about the AACS Sample App, see the [AACS Sample App README](sample-app/README.md).
@@ -1,3 +1,3 @@
-# AACS App Components
+# Alexa Auto app components
 
-The AACS App Components are modularized, pre-made Android implementation libraries for Auto SDK features. The AACS Sample App uses the AACS App Components, but they are decoupled from the sample app and build independently into standalone AARs for use in any AACS client application. You can speed up your integration by reusing the App Components in your own application. See the documentation of each App Component library for its respective build and usage instructions.
+The Alexa Auto app components are modularized Android implementation libraries for Alexa features. 
@@ -2,11 +2,12 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 32
     defaultConfig {
-        minSdkVersion 25
-        versionCode 1
-        versionName "4.1.1"
+        minSdkVersion 27
+        targetSdkVersion 27
+        versionCode Integer.parseInt(new Date().format("yyyyMMdd"))
+        versionName "4.2"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
@@ -47,4 +48,6 @@ dependencies {
     implementation deps.androidx_appcompat
     implementation deps.rxjava3
     implementation deps.androidx_navigation_fragment
+
+    implementation project(':aacscommonutils')
 }
@@ -17,6 +17,7 @@
 import androidx.annotation.NonNull;
 
 import com.amazon.alexa.auto.apis.auth.AuthController;
+import com.amazon.alexa.auto.apis.media.PlayerInfoCache;
 import com.amazon.alexa.auto.apis.setup.AlexaSetupController;
 
 import java.util.Optional;
@@ -53,6 +54,13 @@ public interface AlexaAppRootComponent {
      */
     AuthController getAuthController();
 
+    /**
+     * Provides the {@link PlayerInfoCache}.
+     *
+     * @return PlayerInfoCache.
+     */
+    PlayerInfoCache getPlayerInfoCache();
+
     /**
      * Activate the scoped component and bring it in scope.
      *
 
@@ -42,6 +42,13 @@ public interface ContactsController extends ScopedComponent {
      */
     void setContactsUploadPermission(String deviceAddress, String permission);
 
+    /**
+     * Set messaging permission.
+     * @param deviceAddress device unique address
+     * @param permission messaging permission
+     */
+    void setMessagingPermission(String deviceAddress, String permission);
+
     /**
      * Observe contacts upload consent.
      * @return contacts consent observable, returning true if contacts consent is needed.
 
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package com.amazon.alexa.auto.apis.media
+
+data class MediaSourceInfo (
+    var url : String,
+    var token: String,
+    var repeating: Boolean
+)
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package com.amazon.alexa.auto.apis.media;
+
+import android.content.Intent;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.amazon.alexa.auto.aacs.common.RenderPlayerInfo;
+
+import java.util.Optional;
+
+import io.reactivex.rxjava3.core.Observable;
+
+/**
+ * Cache (in memory) the most recent AudioPlayer info for the lifetime of AACS to facilitate re-populating a media
+ * session the right metadata if the session is destroyed and re-created within a single AACS runtime cycle.
+ *
+ * Note that it is intentionally not implemented to cache the data across reboots because Auto SDK does not yet support
+ * initializing AudioPlayer and TemplateRuntime capability agents with data from the last cycle. Restoring the data
+ * into the MediaSession without doing the same to the capability agents would produce unexpected behavior.
+ */
+public interface PlayerInfoCache {
+    /**
+     * Update the current RenderPlayerInfo.
+     * @param playerInfo The current RenderPlayerInfo. Empty Optional to reset the player info.
+     **/
+    void setPlayerInfo(@NonNull Optional<RenderPlayerInfo> playerInfo);
+
+    /**
+     * Get the current RenderPlayerInfo.
+     * @return An Optional<RenderPlayerInfo>. Empty optional when there is no active player metadata.
+     **/
+    Optional<RenderPlayerInfo> getPlayerInfo();
+
+    /**
+     * Observe the current RenderPlayerInfo.
+     * @return An Observable of the RenderPlayerInfo. The Optional<RenderPlayerInfo> will be empty when there is no
+     * active player metadata.
+     **/
+    Observable<Optional<RenderPlayerInfo>> observePlayerInfo();
+
+    /**
+     * Update the info for the current media item.
+     * @param url The current media info. Null to reset.
+     **/
+    void setMediaSourceInfo(Optional<MediaSourceInfo> info);
+
+    /**
+     * Get the current media source info.
+     * @return An Optional<MediaSourceInfo>. Empty optional when there is no active media item.
+     **/
+    Optional<MediaSourceInfo> getMediaSourceInfo();
+
+    /**
+     * Observe the current media source info.
+     * @return An Observable of the media source info. Optional empty when there is no active media item.
+     **/
+    Observable<Optional<MediaSourceInfo>> observeMediaSourceInfo();
+
+    /**
+     * Set the current position of the media buffered in the player.
+     * @param position The current playback position.
+     **/
+    void setPlaybackPosition(long position);
+
+    /**
+     * Get the last known position of the media buffered in the player.
+     * @return The last known playback position.
+     **/
+    long getPlaybackPosition();
+
+    /**
+     * Clear all data from the cache.
+     **/
+    void clearAllData();
+}