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

Commit fad7266a authored by Charles Chen's avatar Charles Chen
Browse files

Add tag attribute for VisualQueryDetectionService 

The tag attribute is added to distinguish the
VisualQueryDetectionService that VoiceInteractor is using to build
service conncetion to. This is a prestep necessary of developing and
test the upcoming CLs regarding the implementation of VQDS.

Bug: 261783491
Test: Manual
Change-Id: I04855911256aa458be45707b49f369dc54c506de
parent 3fb248ae

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -388,6 +388,7 @@ package android { 
    field public static final int sdkVersion = 16844304; // 0x1010610

    field public static final int supportsAmbientMode = 16844173; // 0x101058d

    field public static final int userRestriction = 16844164; // 0x1010584

    field public static final int visualQueryDetectionService;

  }















  public static final class R.bool {

























core/java/android/service/voice/VoiceInteractionServiceInfo.java



+8
−0




























Original line number
Diff line number
Diff line








@@ -46,6 +46,7 @@ public class VoiceInteractionServiceInfo {













    private String mSessionService;















    private String mRecognitionService;















    private String mHotwordDetectionService;













    private String mVisualQueryDetectionService;















    private String mSettingsActivity;















    private boolean mSupportsAssist;















    private boolean mSupportsLaunchFromKeyguard;










@@ -137,6 +138,8 @@ public class VoiceInteractionServiceInfo {













                    R.styleable.VoiceInteractionService_supportsLocalInteraction, false);















            mHotwordDetectionService = array.getString(com.android.internal.R.styleable















                    .VoiceInteractionService_hotwordDetectionService);













            mVisualQueryDetectionService = array.getString(com.android.internal.R.styleable













                    .VoiceInteractionService_visualQueryDetectionService);















            array.recycle();















            if (mSessionService == null) {















                mParseError = "No sessionService specified";










@@ -190,4 +193,9 @@ public class VoiceInteractionServiceInfo {













    public String getHotwordDetectionService() {















        return mHotwordDetectionService;















    }



























    @Nullable













    public String getVisualQueryDetectionService() {













        return mVisualQueryDetectionService;













    }















}
























core/res/res/values/attrs.xml



+4
−0




























Original line number
Diff line number
Diff line








@@ -8987,6 +8987,10 @@













        <!-- The service that provides {@link android.service.voice.HotwordDetectionService}.















             @hide @SystemApi -->















        <attr name="hotwordDetectionService" format="string" />













        <!-- The service that provides {@link android.service.voice.VisualQueryDetectionService}.













             @hide @SystemApi -->













        <attr name="visualQueryDetectionService" format="string" />



























    </declare-styleable>





























    <!-- Use <code>game-service</code> as the root tag of the XML resource that

































core/res/res/values/public-staging.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -118,6 +118,7 @@













    <public name="enableTextStylingShortcuts" />















    <public name="requiredDisplayCategory"/>















    <public name="removed_maxConcurrentSessionsCount" />













    <public name="visualQueryDetectionService" />















  </staging-public-group>































  <staging-public-group type="id" first-id="0x01cd0000">