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

Commit a8f47513 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Protect IME tracing IPCs with CONTROL_UI_TRACING"

parents 2f1b0110 010eef52

core/java/com/android/internal/inputmethod/ImeTracing.java

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.internal.inputmethod;



import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.app.ActivityThread;

import android.content.Context;

import android.os.RemoteException;
@@ -93,6 +94,7 @@ public abstract class ImeTracing { 
    /**

     * Calling {@link IInputMethodManager#startImeTrace()}} to capture IME trace.

     */

    @RequiresPermission(android.Manifest.permission.CONTROL_UI_TRACING)

    public final void startImeTrace() {

        try {

            mService.startImeTrace();
@@ -104,6 +106,7 @@ public abstract class ImeTracing { 
    /**

     * Calling {@link IInputMethodManager#stopImeTrace()} to stop IME trace.

     */

    @RequiresPermission(android.Manifest.permission.CONTROL_UI_TRACING)

    public final void stopImeTrace() {

        try {

            mService.stopImeTrace();

core/java/com/android/internal/view/IInputMethodManager.aidl

+7 −0
Original line number Diff line number Diff line
@@ -109,8 +109,15 @@ interface IInputMethodManager { 
    boolean isImeTraceEnabled();



    // Starts an ime trace.

    @EnforcePermission("CONTROL_UI_TRACING")

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(value = "

            + "android.Manifest.permission.CONTROL_UI_TRACING)")

    void startImeTrace();



    // Stops an ime trace.

    @EnforcePermission("CONTROL_UI_TRACING")

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(value = "

            + "android.Manifest.permission.CONTROL_UI_TRACING)")

    void stopImeTrace();



    /** Start Stylus handwriting session **/

services/core/java/com/android/server/inputmethod/InputMethodManagerService.java

+2 −0
Original line number Diff line number Diff line
@@ -4556,6 +4556,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
    }



    @BinderThread

    @EnforcePermission(Manifest.permission.CONTROL_UI_TRACING)

    @Override

    public void startImeTrace() {

        ImeTracing.getInstance().startTrace(null /* printwriter */);
@@ -4571,6 +4572,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
    }



    @BinderThread

    @EnforcePermission(Manifest.permission.CONTROL_UI_TRACING)

    @Override

    public void stopImeTrace() {

        ImeTracing.getInstance().stopTrace(null /* printwriter */);