Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'aa313948752a427281aa8d22066fc2d71e369cb7':
  Fix UsbDebuggingActivity not shown in adb tcpip mode
This commit is contained in:
Benoit Goby
2013-04-17 18:59:02 -07:00
committed by Android Git Automerger
parent 59ecf6d383 aa31394875
commit 95be338f9b
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/usb/UsbDebuggingActivity.java
View File

@@ -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);
mDisconnectedReceiver = new UsbDisconnectedReceiver(this);
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");