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

Commit 68f91528 authored by Beverly Tai's avatar Beverly Tai Committed by android-build-merger
Browse files

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev

am: 61bc3f3c

Change-Id: Iba63e8e9b1c543478c16e49c2f81a8cb32567529
parents 8462da77 61bc3f3c
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -1672,4 +1672,10 @@
    <!-- Label that replaces other notification controls when the notification is from the system
         and cannot be silenced (see @string/show_silently) or blocked (see @string/block) -->
    <string name="cant_silence_or_block">Notifications can\'t be silenced or blocked</string>

    <!-- Warning shown when user input has been blocked due to another app overlaying screen
         content. Since we don't know what the app is showing on top of the input target, we
         can't verify user consent. [CHAR LIMIT=NONE] -->
    <string name="touch_filtered_warning">Because an app is obscuring a permission request, Settings
        can’t verify your response.</string>
</resources>
+28 −0
Original line number Diff line number Diff line
@@ -31,8 +31,12 @@ import android.os.ServiceManager;
import android.os.SystemProperties;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import android.widget.CheckBox;
import android.widget.Toast;

import com.android.internal.app.AlertActivity;
import com.android.internal.app.AlertController;
@@ -48,6 +52,10 @@ public class UsbDebuggingActivity extends AlertActivity

    @Override
    public void onCreate(Bundle icicle) {
        Window window = getWindow();
        window.addPrivateFlags(WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
        window.setType(WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG);

        super.onCreate(icicle);

        if (SystemProperties.getInt("service.adb.tcp.port", 0) == 0) {
@@ -79,6 +87,26 @@ public class UsbDebuggingActivity extends AlertActivity
        ap.mView = checkbox;

        setupAlert();

        // adding touch listener on affirmative button - checks if window is obscured
        // if obscured, do not let user give permissions (could be tapjacking involved)
        final View.OnTouchListener filterTouchListener = new View.OnTouchListener() {

            public boolean onTouch(View v, MotionEvent event) {
                // Filter obscured touches by consuming them.
                if (((event.getFlags() & MotionEvent.FLAG_WINDOW_IS_OBSCURED) != 0)
                        || ((event.getFlags() & MotionEvent.FLAG_WINDOW_IS_PARTIALLY_OBSCURED) != 0)) {
                    if (event.getAction() == MotionEvent.ACTION_UP) {
                        Toast.makeText(v.getContext(),
                                R.string.touch_filtered_warning,
                                Toast.LENGTH_SHORT).show();
                    }
                    return true;
                }
                return false;
            }
        };
        mAlert.getButton(BUTTON_POSITIVE).setOnTouchListener(filterTouchListener);
    }

    private class UsbDisconnectedReceiver extends BroadcastReceiver {