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

Commit b26321f6 authored by Shashwat Razdan's avatar Shashwat Razdan
Browse files

Adding CSHelper in VoiceInteractionManagerService 

Bug: 326143814
Test: Local integration with Omnient, atest
Change-Id: I75ea7a47a5733eafa5843f14a25d014f3c7a1ae1
parent 73396979

core/res/res/values/config.xml

+12 −0
Original line number Diff line number Diff line
@@ -6967,4 +6967,16 @@ 


    <!-- Whether to use file hashes cache in watchlist-->

    <bool name="config_watchlistUseFileHashesCache">false</bool>



    <!-- Name of the package responsible to handle Contextual Search. -->

    <string name="config_defaultContextualSearchPackageName" translatable="false" />



    <!-- The key containing the entrypoint for Contextual Search. -->

    <string name="config_defaultContextualSearchKey" translatable="false" />



    <!-- The key containing the branching boolean for Contextual Search. -->

    <string name="config_defaultContextualSearchEnabled" translatable="false" />



    <!-- The key containing the branching boolean for legacy Search. -->

    <string name="config_defaultContextualSearchLegacyEnabled" translatable="false" />

</resources>

core/res/res/values/symbols.xml

+4 −0
Original line number Diff line number Diff line
@@ -5364,4 +5364,8 @@ 
  <java-symbol type="drawable" name="ic_satellite_alt_24px" />



  <java-symbol type="bool" name="config_watchlistUseFileHashesCache" />

  <java-symbol type="string" name="config_defaultContextualSearchPackageName" />

  <java-symbol type="string" name="config_defaultContextualSearchKey" />

  <java-symbol type="string" name="config_defaultContextualSearchEnabled" />

  <java-symbol type="string" name="config_defaultContextualSearchLegacyEnabled" />

</resources>

services/core/java/com/android/server/wm/ActivityAssistInfo.java

+7 −0
Original line number Diff line number Diff line
@@ -30,12 +30,14 @@ public class ActivityAssistInfo { 
    private final IBinder mAssistToken;

    private final int mTaskId;

    private final ComponentName mComponentName;

    private final int mUserId;



    public ActivityAssistInfo(ActivityRecord activityRecord) {

        this.mActivityToken = activityRecord.token;

        this.mAssistToken = activityRecord.assistToken;

        this.mTaskId = activityRecord.getTask().mTaskId;

        this.mComponentName = activityRecord.mActivityComponent;

        this.mUserId = activityRecord.mUserId;

    }



    /** @hide */
@@ -57,4 +59,9 @@ public class ActivityAssistInfo { 
    public ComponentName getComponentName() {

        return mComponentName;

    }



    /** @hide */

    public int getUserId() {

        return mUserId;

    }

}

services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java

+3 −0
Original line number Diff line number Diff line
@@ -822,4 +822,7 @@ public abstract class ActivityTaskManagerInternal { 
     */

    public abstract void unregisterCompatScaleProvider(

            @CompatScaleProvider.CompatScaleModeOrderId int id);



    /** Returns whether assist data is allowed. */

    public abstract boolean isAssistDataAllowed();

}

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

+9 −0
Original line number Diff line number Diff line
@@ -6018,6 +6018,10 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        public int startActivityWithScreenshot(@NonNull Intent intent,

                @NonNull String callingPackage, int callingUid, int callingPid,

                @Nullable IBinder resultTo, @Nullable Bundle options, int userId) {

            userId = getActivityStartController().checkTargetUser(userId,

                    false /* validateIncomingUser */, Binder.getCallingPid(),

                    Binder.getCallingUid(), "startActivityWithScreenshot");



            return getActivityStartController()

                    .obtainStarter(intent, "startActivityWithScreenshot")

                    .setCallingUid(callingUid)
@@ -7344,6 +7348,11 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
                @CompatScaleProvider.CompatScaleModeOrderId int id) {

            ActivityTaskManagerService.this.unregisterCompatScaleProvider(id);

        }



        @Override

        public boolean isAssistDataAllowed() {

            return ActivityTaskManagerService.this.isAssistDataAllowed();

        }

    }



    static boolean isPip2ExperimentEnabled() {