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

Commit 6c8dafdd authored by Ivan Chiang's avatar Ivan Chiang Committed by Android (Google) Code Review
Browse files

Merge "Use noteOpNoThrow instead of checkOpNoThrow in AssistDataRequester"

parents 76273bef 36e6fecf

boot/hiddenapi/hiddenapi-max-target-r-loprio.txt

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ Lcom/android/ims/internal/uce/options/IOptionsService$Stub;-><init>()V 
Lcom/android/ims/internal/uce/presence/IPresenceService$Stub;-><init>()V

Lcom/android/ims/internal/uce/uceservice/IUceListener$Stub;-><init>()V

Lcom/android/ims/internal/uce/uceservice/IUceService$Stub;-><init>()V

Lcom/android/internal/app/IVoiceInteractionManagerService$Stub$Proxy;->showSessionFromSession(Landroid/os/IBinder;Landroid/os/Bundle;I)Z

Lcom/android/internal/appwidget/IAppWidgetService$Stub;->TRANSACTION_bindAppWidgetId:I

Lcom/android/internal/telephony/ITelephony$Stub;->DESCRIPTOR:Ljava/lang/String;

Lcom/android/internal/telephony/ITelephony$Stub;->TRANSACTION_dial:I

core/java/android/app/IActivityTaskManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ interface IActivityTaskManager { 
            in IBinder activityToken, int flags);

    boolean isAssistDataAllowedOnCurrentActivity();

    boolean requestAssistDataForTask(in IAssistDataReceiver receiver, int taskId,

            in String callingPackageName);

            in String callingPackageName, String callingAttributionTag);



    /**

     * Notify the system that the keyguard is going away.

core/java/android/service/voice/VoiceInteractionManagerInternal.java

+6 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.service.voice;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.UserIdInt;

import android.os.Bundle;
@@ -33,9 +34,12 @@ public abstract class VoiceInteractionManagerInternal { 
     * Start a new voice interaction session when requested from within an activity

     * by Activity.startLocalVoiceInteraction()

     * @param callingActivity The binder token representing the calling activity.

     * @param options 

     * @param attributionTag The attribution tag of the calling context or {@code null} for default

     *                       attribution

     * @param options A Bundle of private arguments to the current voice interaction service

     */

    public abstract void startLocalVoiceInteraction(IBinder callingActivity, Bundle options);

    public abstract void startLocalVoiceInteraction(@NonNull IBinder callingActivity,

            @Nullable String attributionTag, @NonNull Bundle options);



    /**

     * Returns whether the currently selected voice interaction service supports local voice

core/java/android/service/voice/VoiceInteractionService.java

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ public class VoiceInteractionService extends Service { 
            throw new IllegalStateException("Not available until onReady() is called");

        }

        try {

            mSystemService.showSession(args, flags);

            mSystemService.showSession(args, flags, getAttributionTag());

        } catch (RemoteException e) {

        }

    }

core/java/android/service/voice/VoiceInteractionSession.java

+2 −1
Original line number Diff line number Diff line
@@ -1384,7 +1384,8 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall 
            throw new IllegalStateException("Can't call before onCreate()");

        }

        try {

            mSystemService.showSessionFromSession(mToken, args, flags);

            mSystemService.showSessionFromSession(mToken, args, flags,

                    mContext.getAttributionTag());

        } catch (RemoteException e) {

        }

    }