github/android-dev-ext
1
1
Fork 0
mirror of https://github.com/adelphes/android-dev-ext.git synced 2025-12-22 17:39:19 +00:00
Code Issues 41 Packages Projects Releases Wiki Activity

v1.2.1 (#94)

Browse Source 
* update java-mti to support new type cache format

* add IP and platform info to events

* add warning about closing Android Studio if an ADB or JDWP error occurs

* version 1.2.1 notes

* add debug_mode to disconnect event
This commit is contained in:
Dave Holoway
2020-07-06 17:11:54 +01:00
committed by GitHub
parent 83eda790be
commit bfd55354c7
7 changed files with 61 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/debugMain.js
View File

@@ -438,17 +438,21 @@ class AndroidDebugSession extends DebugSession {
dbg_emulator: /^emulator/.test(this._device.serial),
})
} catch(e) {
const msg = e.message||e.msg;
//this.performDisconnect();
// exceptions use message, adbclient uses msg
this.LOG('Attach failed: '+(e.message||e.msg||'No additional information is available'));
this.LOG('Attach failed: '+(msg||'No additional information is available'));
// more info for adb connect errors
if (/^ADB server is not running/.test(e.msg)) {
this.LOG('Make sure the Android SDK Platform Tools are installed and run:');
this.LOG(' adb start-server');
this.LOG('If you are running ADB on a non-default port, also make sure the adbPort value in your launch.json is correct.');
}
if (/ADB|JDWP/.test(msg)) {
this.LOG('Ensure any instances of Android Studio are closed.');
}
// tell the client we're done
this.terminate_reason = `start-exception: ${e.message||e.msg}`;
this.terminate_reason = `start-exception: ${msg}`;
this.sendEvent(new TerminatedEvent(false));
}
}
@@ -595,16 +599,20 @@ class AndroidDebugSession extends DebugSession {
this.LOG('Application started');
} catch(e) {
const msg = e.message || e.msg;
// exceptions use message, adbclient uses msg
this.LOG('Launch failed: '+(e.message||e.msg||'No additional information is available'));
this.LOG('Launch failed: '+(msg || 'No additional information is available'));
// more info for adb connect errors
if (/^ADB server is not running/.test(e.msg)) {
this.LOG('Make sure the Android SDK Platform Tools are installed and run:');
this.LOG(' adb start-server');
this.LOG('If you are running ADB on a non-default port, also make sure the adbPort value in your launch.json is correct.');
}
if (/ADB|JDWP/.test(msg)) {
this.LOG('Ensure any instances of Android Studio are closed.');
}
// tell the client we're done
this.terminate_reason = `start-exception: ${e.message||e.msg}`;
this.terminate_reason = `start-exception: ${msg}`;
this.sendEvent(new TerminatedEvent(false));
}
}
@@ -787,6 +795,7 @@ class AndroidDebugSession extends DebugSession {
analytics.event('debug-end', {
dbg_session_id: this.session_id,
dbg_elapsed: Math.trunc((Date.now() - this.session_start.getTime())/1e3),
dbg_kind: this.debug_mode,
dbg_term_reason: this.terminate_reason,
});
if (this.debuggerAttached) {