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

Commit 121d3b89 authored by Beverly Tai's avatar Beverly Tai Committed by Android (Google) Code Review
Browse files

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

parents ba55b3be c8752a51
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -1701,4 +1701,9 @@
    <!-- Text body for dialog alerting user that their phone has reached a certain temperature and may start to slow down in order to cool down. [CHAR LIMIT=300] -->
    <string name="high_temp_dialog_message">Your phone will automatically try to cool down. You can still use your phone, but it may run slower.\n\nOnce your phone has cooled down, it will run normally.</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 −1
Original line number Diff line number Diff line
@@ -31,12 +31,15 @@ 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 com.android.internal.app.AlertActivity;
import com.android.internal.app.AlertController;
import com.android.systemui.R;
import android.widget.Toast;

public class UsbDebuggingActivity extends AlertActivity
                                  implements DialogInterface.OnClickListener {
@@ -48,6 +51,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 +86,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 {