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

Commit aa313948 authored by Benoit Goby's avatar Benoit Goby Committed by Android Git Automerger
Browse files

am d02b00dd: Merge "Fix UsbDebuggingActivity not shown in adb tcpip mode" into jb-mr2-dev

* commit 'd02b00dd':
  Fix UsbDebuggingActivity not shown in adb tcpip mode
parents 3b90af23 d02b00dd
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 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;
@@ -54,7 +55,10 @@ public class UsbDebuggingActivity extends AlertActivity
    public void onCreate(Bundle icicle) {
        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");