Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9250826e authored by Christian Frank's avatar Christian Frank Committed by Android (Google) Code Review
Browse files

Merge "Add attribution context for MusicRecognitionManager attribution."

parents ee16d245 a5886b18

core/res/AndroidManifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -5592,6 +5592,10 @@ 
    <!-- Attribution for Gnss Time Update service. -->

    <attribution android:tag="GnssTimeUpdateService"

                 android:label="@string/gnss_time_update_service"/>

    <!-- Attribution for MusicRecognitionManagerService.

         <p>Not for use by third-party applications.</p> -->

    <attribution android:tag="MusicRecognitionManagerService"

        android:label="@string/music_recognition_manager_service"/>



    <application android:process="system"

                 android:persistent="true"

core/res/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -453,6 +453,9 @@ 
    <!-- Attribution for Gnss Time Update service. [CHAR LIMIT=NONE]-->

    <string name="gnss_time_update_service">GNSS Time Update Service</string>



    <!-- Attribution for MusicRecognitionManagerService. [CHAR LIMIT=NONE]-->

    <string name="music_recognition_manager_service">Music Recognition Manager Service</string>



    <!-- Factory reset warning dialog strings--> <skip />

    <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->

    <string name="factory_reset_warning">Your device will be erased</string>

media/java/android/media/musicrecognition/IMusicRecognitionAttributionTagCallback.aidl

0 → 100644
+10 −0
Original line number Diff line number Diff line 
package android.media.musicrecognition;



/**

 * Interface from {@link MusicRecognitionService} to system to pass attribution tag.

 *

 * @hide

 */

oneway interface IMusicRecognitionAttributionTagCallback {

  void onAttributionTag(in String attributionTag);

}
 
 No newline at end of file

media/java/android/media/musicrecognition/IMusicRecognitionService.aidl

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ import android.media.AudioFormat; 
import android.os.ParcelFileDescriptor;

import android.os.IBinder;

import android.media.musicrecognition.IMusicRecognitionServiceCallback;

import android.media.musicrecognition.IMusicRecognitionAttributionTagCallback;



/**

 * Interface from the system to a {@link MusicRecognitionService}.
@@ -15,4 +16,6 @@ oneway interface IMusicRecognitionService { 
      in ParcelFileDescriptor fd,

      in AudioFormat audioFormat,

      in IMusicRecognitionServiceCallback callback);



  void getAttributionTag(in IMusicRecognitionAttributionTagCallback callback);

}
 
 No newline at end of file

media/java/android/media/musicrecognition/IMusicRecognitionServiceCallback.aidl

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ import android.os.Bundle; 
import android.media.MediaMetadata;



/**

 * Interface from a {@MusicRecognitionService} the system.

 * Interface from a {@MusicRecognitionService} to the system.

 *

 * @hide

 */