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

Commit 4181d96a authored by Michael Groover's avatar Michael Groover Committed by Android (Google) Code Review
Browse files

Merge changes I50d5ce3a,I84a636ba into rvc-dev 

* changes:
  Notify adb service on usb disconnect and activity stop
  Revert "Don't dismiss adb authorization prompt upon USB disconnect."
parents b9aeb6ca d5d60d50

packages/SystemUI/src/com/android/systemui/dagger/DefaultActivityBinder.java

+15 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ import com.android.systemui.keyguard.WorkLockActivity; 
import com.android.systemui.screenrecord.ScreenRecordDialog;

import com.android.systemui.settings.BrightnessDialog;

import com.android.systemui.tuner.TunerActivity;

import com.android.systemui.usb.UsbDebuggingActivity;

import com.android.systemui.usb.UsbDebuggingSecondaryUserActivity;



import dagger.Binds;

import dagger.Module;
@@ -70,4 +72,17 @@ public abstract class DefaultActivityBinder { 
    @IntoMap

    @ClassKey(BubbleOverflowActivity.class)

    public abstract Activity bindBubbleOverflowActivity(BubbleOverflowActivity activity);



    /** Inject into UsbDebuggingActivity. */

    @Binds

    @IntoMap

    @ClassKey(UsbDebuggingActivity.class)

    public abstract Activity bindUsbDebuggingActivity(UsbDebuggingActivity activity);



    /** Inject into UsbDebuggingSecondaryUserActivity. */

    @Binds

    @IntoMap

    @ClassKey(UsbDebuggingSecondaryUserActivity.class)

    public abstract Activity bindUsbDebuggingSecondaryUserActivity(

            UsbDebuggingSecondaryUserActivity activity);

}

packages/SystemUI/src/com/android/systemui/usb/UsbDebuggingActivity.java

+90 −1
Original line number Diff line number Diff line
@@ -16,13 +16,19 @@ 


package com.android.systemui.usb;



import android.app.Activity;

import android.app.AlertDialog;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.DialogInterface;

import android.content.Intent;

import android.content.IntentFilter;

import android.debug.IAdbManager;

import android.hardware.usb.UsbManager;

import android.os.Bundle;

import android.os.IBinder;

import android.os.ServiceManager;

import android.os.SystemProperties;

import android.util.Log;

import android.view.LayoutInflater;

import android.view.View;
@@ -33,13 +39,25 @@ import android.widget.CheckBox; 
import com.android.internal.app.AlertActivity;

import com.android.internal.app.AlertController;

import com.android.systemui.R;

import com.android.systemui.broadcast.BroadcastDispatcher;



import javax.inject.Inject;



public class UsbDebuggingActivity extends AlertActivity

                                  implements DialogInterface.OnClickListener {

    private static final String TAG = "UsbDebuggingActivity";



    private CheckBox mAlwaysAllow;

    private UsbDisconnectedReceiver mDisconnectedReceiver;

    private final BroadcastDispatcher mBroadcastDispatcher;

    private String mKey;

    private boolean mServiceNotified;



    @Inject

    public UsbDebuggingActivity(BroadcastDispatcher broadcastDispatcher) {

        super();

        mBroadcastDispatcher = broadcastDispatcher;

    }



    @Override

    public void onCreate(Bundle icicle) {
@@ -50,6 +68,10 @@ public class UsbDebuggingActivity extends AlertActivity 


        super.onCreate(icicle);



        if (SystemProperties.getInt("service.adb.tcp.port", 0) == 0) {

            mDisconnectedReceiver = new UsbDisconnectedReceiver(this);

        }



        Intent intent = getIntent();

        String fingerprints = intent.getStringExtra("fingerprints");

        mKey = intent.getStringExtra("key");
@@ -83,10 +105,77 @@ public class UsbDebuggingActivity extends AlertActivity 
        super.onWindowAttributesChanged(params);

    }



    private class UsbDisconnectedReceiver extends BroadcastReceiver {

        private final Activity mActivity;

        UsbDisconnectedReceiver(Activity activity) {

            mActivity = activity;

        }



        @Override

        public void onReceive(Context content, Intent intent) {

            String action = intent.getAction();

            if (!UsbManager.ACTION_USB_STATE.equals(action)) {

                return;

            }

            boolean connected = intent.getBooleanExtra(UsbManager.USB_CONNECTED, false);

            if (!connected) {

                notifyService(false);

                mActivity.finish();

            }

        }

    }



    @Override

    public void onStart() {

        super.onStart();

        if (mDisconnectedReceiver != null) {

            IntentFilter filter = new IntentFilter(UsbManager.ACTION_USB_STATE);

            mBroadcastDispatcher.registerReceiver(mDisconnectedReceiver, filter);

        }

    }



    @Override

    protected void onStop() {

        if (mDisconnectedReceiver != null) {

            mBroadcastDispatcher.unregisterReceiver(mDisconnectedReceiver);

        }

        // If the ADB service has not yet been notified due to this dialog being closed in some

        // other way then notify the service to deny the connection to ensure system_server sends

        // a response to adbd.

        if (!mServiceNotified) {

            notifyService(false);

        }

        super.onStop();

    }



    @Override

    public void onClick(DialogInterface dialog, int which) {

        boolean allow = (which == AlertDialog.BUTTON_POSITIVE);

        boolean alwaysAllow = allow && mAlwaysAllow.isChecked();

        notifyService(allow, alwaysAllow);

        finish();

    }



    /**

     * Notifies the ADB service as to whether the current ADB request should be allowed; if the

     * request is allowed it is only allowed for this session, and the user should be prompted again

     * on subsequent requests from this key.

     *

     * @param allow whether the connection should be allowed for this session

     */

    private void notifyService(boolean allow) {

        notifyService(allow, false);

    }



    /**

     * Notifies the ADB service as to whether the current ADB request should be allowed, and if

     * subsequent requests from this key should be allowed without user consent.

     *

     * @param allow whether the connection should be allowed

     * @param alwaysAllow whether subsequent requests from this key should be allowed without user

     *                    consent

     */

    private void notifyService(boolean allow, boolean alwaysAllow) {

        try {

            IBinder b = ServiceManager.getService(ADB_SERVICE);

            IAdbManager service = IAdbManager.Stub.asInterface(b);
@@ -95,9 +184,9 @@ public class UsbDebuggingActivity extends AlertActivity 
            } else {

                service.denyDebugging();

            }

            mServiceNotified = true;

        } catch (Exception e) {

            Log.e(TAG, "Unable to notify Usb service", e);

        }

        finish();

    }

}

packages/SystemUI/src/com/android/systemui/usb/UsbDebuggingSecondaryUserActivity.java

+70 −0
Original line number Diff line number Diff line
@@ -16,19 +16,47 @@ 


package com.android.systemui.usb;



import android.app.Activity;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.DialogInterface;

import android.content.Intent;

import android.content.IntentFilter;

import android.debug.IAdbManager;

import android.hardware.usb.UsbManager;

import android.os.Bundle;

import android.os.IBinder;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemProperties;

import android.util.Log;



import com.android.internal.app.AlertActivity;

import com.android.internal.app.AlertController;

import com.android.systemui.R;

import com.android.systemui.broadcast.BroadcastDispatcher;



import javax.inject.Inject;



public class UsbDebuggingSecondaryUserActivity extends AlertActivity

        implements DialogInterface.OnClickListener {

    private static final String TAG = "UsbDebuggingSecondaryUserActivity";

    private UsbDisconnectedReceiver mDisconnectedReceiver;

    private final BroadcastDispatcher mBroadcastDispatcher;



    @Inject

    public UsbDebuggingSecondaryUserActivity(BroadcastDispatcher broadcastDispatcher) {

        mBroadcastDispatcher = broadcastDispatcher;

    }



    @Override

    public void onCreate(Bundle icicle) {

        super.onCreate(icicle);



        if (SystemProperties.getInt("service.adb.tcp.port", 0) == 0) {

            mDisconnectedReceiver = new UsbDisconnectedReceiver(this);

        }



        final AlertController.AlertParams ap = mAlertParams;

        ap.mTitle = getString(R.string.usb_debugging_secondary_user_title);

        ap.mMessage = getString(R.string.usb_debugging_secondary_user_message);
@@ -38,6 +66,48 @@ public class UsbDebuggingSecondaryUserActivity extends AlertActivity 
        setupAlert();

    }



    private class UsbDisconnectedReceiver extends BroadcastReceiver {

        private final Activity mActivity;

        UsbDisconnectedReceiver(Activity activity) {

            mActivity = activity;

        }



        @Override

        public void onReceive(Context content, Intent intent) {

            String action = intent.getAction();

            if (UsbManager.ACTION_USB_STATE.equals(action)) {

                boolean connected = intent.getBooleanExtra(UsbManager.USB_CONNECTED, false);

                if (!connected) {

                    mActivity.finish();

                }

            }

        }

    }



    @Override

    public void onStart() {

        super.onStart();

        if (mDisconnectedReceiver != null) {

            IntentFilter filter = new IntentFilter(UsbManager.ACTION_USB_STATE);

            mBroadcastDispatcher.registerReceiver(mDisconnectedReceiver, filter);

        }

    }



    @Override

    protected void onStop() {

        if (mDisconnectedReceiver != null) {

            mBroadcastDispatcher.unregisterReceiver(mDisconnectedReceiver);

        }

        try {

            IBinder b = ServiceManager.getService(ADB_SERVICE);

            IAdbManager service = IAdbManager.Stub.asInterface(b);

            service.denyDebugging();

        } catch (RemoteException e) {

            Log.e(TAG, "Unable to notify Usb service", e);

        }

        super.onStop();

    }



    @Override

    public void onClick(DialogInterface dialog, int which) {

        finish();