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

Commit d4b8064e authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 14bafef5: am 24922798: am b20a8ed9: am d9b0f843: Merge "Fix issue... 

am 14bafef5: am 24922798: am b20a8ed9: am d9b0f843: Merge "Fix issue #22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev

* commit '14bafef5':
  Fix issue #22860466: viapi security bug - rubber stamping in nested VIs
parents 1888ecb2 14bafef5

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -3341,6 +3341,7 @@ package android.app { 
    method public boolean isImmersive();

    method public boolean isTaskRoot();

    method public boolean isVoiceInteraction();

    method public boolean isVoiceInteractionRoot();

    method public final deprecated android.database.Cursor managedQuery(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String);

    method public boolean moveTaskToBack(boolean);

    method public boolean navigateUpTo(android.content.Intent);

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -3444,6 +3444,7 @@ package android.app { 
    method public boolean isImmersive();

    method public boolean isTaskRoot();

    method public boolean isVoiceInteraction();

    method public boolean isVoiceInteractionRoot();

    method public final deprecated android.database.Cursor managedQuery(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String);

    method public boolean moveTaskToBack(boolean);

    method public boolean navigateUpTo(android.content.Intent);

core/java/android/app/Activity.java

+16 −0
Original line number Diff line number Diff line
@@ -1228,6 +1228,22 @@ public class Activity extends ContextThemeWrapper 
        return mVoiceInteractor != null;

    }



    /**

     * Like {@link #isVoiceInteraction}, but only returns true if this is also the root

     * of a voice interaction.  That is, returns true if this activity was directly

     * started by the voice interaction service as the initiation of a voice interaction.

     * Otherwise, for example if it was started by another activity while under voice

     * interaction, returns false.

     */

    public boolean isVoiceInteractionRoot() {

        try {

            return mVoiceInteractor != null

                    && ActivityManagerNative.getDefault().isRootVoiceInteraction(mToken);

        } catch (RemoteException e) {

        }

        return false;

    }



    /**

     * Retrieve the active {@link VoiceInteractor} that the user is going through to

     * interact with this activity.

core/java/android/app/ActivityManagerNative.java

+23 −0
Original line number Diff line number Diff line
@@ -2582,6 +2582,15 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            reply.writeInt(res ? 1 : 0);

            return true;

        }



        case IS_ROOT_VOICE_INTERACTION_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            IBinder token = data.readStrongBinder();

            boolean res = isRootVoiceInteraction(token);

            reply.writeNoException();

            reply.writeInt(res ? 1 : 0);

            return true;

        }

        }



        return super.onTransact(code, data, reply, flags);
@@ -5962,5 +5971,19 @@ class ActivityManagerProxy implements IActivityManager 
        return res != 0;

    }



    @Override

    public boolean isRootVoiceInteraction(IBinder token) throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

        data.writeStrongBinder(token);

        mRemote.transact(IS_ROOT_VOICE_INTERACTION_TRANSACTION, data, reply, 0);

        reply.readException();

        int res = reply.readInt();

        data.recycle();

        reply.recycle();

        return res != 0;

    }



    private IBinder mRemote;

}

core/java/android/app/IActivityManager.java

+3 −0
Original line number Diff line number Diff line
@@ -515,6 +515,8 @@ public interface IActivityManager extends IInterface { 
    public boolean setProcessMemoryTrimLevel(String process, int uid, int level)

            throws RemoteException;



    public boolean isRootVoiceInteraction(IBinder token) throws RemoteException;



    /*

     * Private non-Binder interfaces

     */
@@ -861,4 +863,5 @@ public interface IActivityManager extends IInterface { 
    int IS_SCREEN_CAPTURE_ALLOWED_ON_CURRENT_ACTIVITY_TRANSACTION

            = IBinder.FIRST_CALL_TRANSACTION+299;

    int SHOW_ASSIST_FROM_ACTIVITY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+300;

    int IS_ROOT_VOICE_INTERACTION_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+301;

}