drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Benoit Goby
2013-04-18 01:52:55 +00:00
committed by Android (Google) Code Review
parent ab15e6ab37 29a4b7277e
commit d02b00dd6e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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.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;
@ -54,7 +55,10 @@ public class UsbDebuggingActivity extends AlertActivity
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");