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

import android.os.Bundle;

import android.os.Bundle;

import android.os.IBinder;

import android.os.IBinder;

import android.os.ServiceManager;

import android.os.ServiceManager;

import android.os.SystemProperties;

import android.util.Log;

import android.util.Log;

import android.view.LayoutInflater;

import android.view.LayoutInflater;

import android.view.View;

import android.view.View;

    public void onCreate(Bundle icicle) {

    public void onCreate(Bundle icicle) {

        super.onCreate(icicle);

        super.onCreate(icicle);

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

            mDisconnectedReceiver = new UsbDisconnectedReceiver(this);

            mDisconnectedReceiver = new UsbDisconnectedReceiver(this);

        }

        Intent intent = getIntent();

        Intent intent = getIntent();

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

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

        mKey = intent.getStringExtra("key");

        mKey = intent.getStringExtra("key");