aboutsummaryrefslogtreecommitdiffstats
path: root/ddms
Commit message (Collapse)AuthorAgeFilesLines
* Fix NON-NLS tokensTor Norbye2011-01-0412-47/+47
| | | | | | | | | | | | | There were a number of // $NON-NLS-1$ references in the codebase. Eclipse's "Externalize Strings" functionality will not handle these correctly; there must not be a space between the "//" and the "$NON" tokens. (I left AndroidXmlEditor.xml alone; it is the file I discovered the problem in but I fixed those references as part of another pending checkin.) Change-Id: If185c88a667273af614f0bee5959fd2618756c05
* Merge "use UTF-8 instead of ISO-8859-1"Xavier Ducrohet2011-01-041-1/+1
|\
| * use UTF-8 instead of ISO-8859-1Gasol Wu2010-12-031-1/+1
| | | | | | | | | | | | resolve issue #1590, logcat needs to support UTF-8. Change-Id: I226d8ab358a667cb3c37f76e81e5eda4f3f3b097
* | Fix DDMS and HierarchyViewer .bat files on WindowsRaphael Moll2010-12-151-69/+72
|/ | | | | | | | | | | | | | | These were not setting the "bin dir" properpty correctly, and as a consequence the tools complain they can't find adb.exe. The fix is to set it to the directory of the script but to avoid spaces-in-path issues we use the "~fs" modifier to get a space-free short name for the %cd% value. And since we can't use use %cd% combined with ~fs, we use a for loop trick to set it. Note that ddms.bat was in unix end-of-line mode so I changed it back to DOS end-of-line mode. Change-Id: Ic9e55643b551898043add27c12193a0949f40bb0
* Use env var com.android.ddms.bindir for ddms.Raphael Moll2010-11-151-0/+6
| | | | | | | The env var is used if the system property is not defined, which is convenient to start ddms in debug mode from Eclipse. Change-Id: I2a33c12399c703cf3194e2e67f39562ab0d59bd9
* Fix ddms filechooser behavior and Mac acceleratorTor Norbye2010-10-193-6/+32
| | | | | | | | | | | | | | | | | | | | | | Fix a couple of issues in ddms: First, fix the code to remember the path you last opened the file chooser with; if there is nothing in $lastImageSaveDir, it should look at $imageSaveDir (which is the variable the default setting ($user.home) is initialized into). Second, and this seems to be Mac specific, the FileDialog.getFilterPath() call does not return the path you have navigated to, which means that on the Mac it never sets $lastImageSaveDir correctly - it always sets it to the original suggestion. The fix is trivial - use File#getParent instead which does the String manipulation to extract the parent portion of a string which represents a path. Finally, on Macs (only), make the keybindings use the Command key instead of the Control key since that's the norm. Change-Id: I1b0f381606f5373ddad973754e49ce07856a9bae
* Update application icons for sdkmanager and ddmsTor Norbye2010-10-182-0/+0
| | | | | | | | | | | | | | | | Update the dock icon used on Macs for the sdkmanager to one that has transparency, just as the emulator icon already does. This is the norm on Macs. Update the application icon used for ddms to be an android with a wrench, in a similar style to the other tool icons. This icon is also transparent, which I hope will work on Windows - it would be great if Raphael could verify that (and I should probably try to get a Windows image into my VMWare install so I can do these checks myself in the future.) Change-Id: Icd0954cb77ba0845034a79bf9df6dd271019632e
* Fix a couple of bugs.Tor Norbye2010-10-091-1/+1
| | | | | | | | | | | Using File.toURL() is dangerous because the reverse operation (URLDecoder.decode, which for example is used by URLClassLoader to produce a path from URLs) doesn't always succeed - for example on a filename like "/tmp/te#st". Use File.toURI().toURL() instead. The second problem looks like an unintentional || instead of &&. Change-Id: Ib4e2ac13c914c002eff53455ed6d6ed898ce35fb
* Merge "Fix various warnings"Tor Norbye2010-10-084-8/+23
|\
| * Fix various warningsTor Norbye2010-10-074-8/+23
| | | | | | | | Change-Id: I4864b89347ed8756b1eae83d97990555144fb93a
* | Go to problem in source from Logcat via Double-click.Pierre Zurek2010-10-081-0/+20
|/ | | | | | | | | | | | The user can choose in the LogCat Preference Page what will be the default behaviour (go to method declaration or go to error line). There are now 2 available actions in the LogCat View instead of the unique "Go to Problem" (which is now called "Go to Problem (method declaration)"). Change-Id: I769771b29d26b625cfd0250fa23e6627821be16d
* Fix case where testRunEnded was called twice.Brett Chabot2010-10-041-2/+11
| | | | Change-Id: I14be6641c020baf0ad90f2f036e35fb854aed2ab
* Make ddmlb-tests optional.Brett Chabot2010-10-011-0/+1
| | | | Change-Id: Ia584549aae4bffe0ca9ddee860337cb20fa0e313
* Merge "Fix ddmlib test run failure and metric reporting."Brett Chabot2010-09-307-449/+296
|\
| * Fix ddmlib test run failure and metric reporting.Brett Chabot2010-09-307-449/+296
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This submit fixes two bugs: 1) Test run failures were not getting reported correctly in some scenarios, and in others testRunFailed was being called before testRunStarted was called. With this submit, the order of ITestRunListener callbacks is documented and strictly adhered to. 2) test metrics were getting reported for regularly occuring instrumentation output such as 'stream' and 'id'. Also cleaned up the associated unit tests and changed them to use easymock. Change-Id: I4cee3abebdf1c607ac1dc51a240c92ca9611ca31
* | Add missing dependency in the ddms manifest.Xavier Ducrohet2010-09-291-1/+1
| | | | | | | | Change-Id: Ifdfb8bbabf2b2aadf46ce0b27dcf99ef428d1ec9
* | Make the tools work with the new location of adb.Xavier Ducrohet2010-09-271-1/+10
|/ | | | | | | | | | | | adb has been moved to the platform-tools folder. This changes ADT, DDMS, HierarchyViewer which all care where adb is (to launch it). Also fixed the local SDK parser of the SDK Updater to find the platform-tools package. Change-Id: I3c869159d7b0e0ad9aaea06f376b7ba3e53bfc7f
* Add a runName parameter to ITestRunListener#testRunStarted.Brett Chabot2010-09-165-11/+26
| | | | Change-Id: Ibaab85879f5432a24f8d44dc8d22aa6b0965a0c2
* Add alloc number in the alloc tracker.Xavier Ducrohet2010-09-133-11/+41
| | | | | | | This lets the user sort the allocation in the order they happened (or reverse) Change-Id: I85ca3b190f3a5d63828d78882ee833e5523c2154
* Filter input in the alloc tracker panel.Xavier Ducrohet2010-09-122-3/+79
| | | | Change-Id: Ib8f591022228d3ec2a8d50c0dc3d2caadca86e81
* Allocation tracker content can now be sorted.Xavier Ducrohet2010-09-125-22/+209
| | | | Change-Id: I9f4009e5634e0c4a2b871082c2c281f62a67ca2f
* Handle instrumentation time output that contains a bracket.Brett Chabot2010-09-032-8/+27
| | | | | | Bug 2975380 Change-Id: I51bcb5b3aaaf320b25619b0b8b4679691c4bff7e
* Fix HierarchyViewer2 to run on MacOS X correctly.Xavier Ducrohet2010-08-311-8/+1
| | | | | | | | | | This also fix the issue with the app never closing correctly (throwing an exception). Also updated the launcher script to match the new ones we use in the other Java based tools. Change-Id: I851f0732a78c6e6c072728f05e611f01eee8fc19
* Make the HierarchyViewer plug-in not screw up DDMS.Xavier Ducrohet2010-08-311-1/+6
| | | | | | | | | | | The HV plug-in behaved like the standalone app and initialized the AndroidDebugBridge with no client support (even though this init is handled by DDMS) and would recreate the bridge object destroying the one created by DDMS. This completely broke DDMS. Change-Id: Ife1187c74daef69607d508aabb1f7234507a170f
* Fix ddmlib's classpath to not copy Android.mkXavier Ducrohet2010-08-301-1/+1
| | | | | | | | | With the recent change to build all folders under the root folder, there was an issue with Eclipse copying src/Android.mk into the bin folder. This prevented the sdk from building locally due to duplicate module names. Change-Id: I541d5198cb3501a55b7072fc3c6a8b58178e9661
* Write tests for the new ITestRunListener API methodOmari Stephens2010-08-272-7/+18
| | | | Change-Id: Ieea11742ae23cc30296fcc1cfe477d9814fa4a4e
* Fix the ddmlib makefiles to compile tests properlyOmari Stephens2010-08-273-14/+55
| | | | Change-Id: Id5012098dccbd264890251fdff57b91ca3ae1b85
* Store and report metrics emitted during each test caseOmari Stephens2010-08-272-10/+30
| | | | Change-Id: Ia7e7f6bef73e7ecd30b03973fd966d28ac90464b
* Merge "Add "suspended" state to thread display."Andy McFadden2010-08-271-1/+2
|\
| * Add "suspended" state to thread display.Andy McFadden2010-08-251-1/+2
| | | | | | | | Change-Id: Id13f96d1e490228a2fc9a7452a34cd4ac7e5aa46
* | Fix permissions: source files shouldn't be executableOmari Stephens2010-08-252-0/+0
|/ | | | Change-Id: I4030ca07fb40e171978d8eb366b6d403e3c9ea2c
* Force disconnect of all devices when adb connection is lost.Brett Chabot2010-08-121-0/+14
| | | | | | Bug 2873317 Change-Id: Idc56be6dbd8912ee463295ddfe6f3b0bbf0b5125
* Update ddms (all) and 'android' (linux/mac) to user explicit classpathXavier Ducrohet2010-07-266-6/+15
| | | | | | | | | | They were still using the old method of providing a jar folder through java.ext.dirs in which to look for jar files. The jar dependency is now explicit in the manifest, which allows us to target ddmlib explicitely and not ddmlib-prebuilt. Change-Id: Ic3c5708ab327a3e1fb7a7cd86fffda96e0d988dd
* Update the ddmlib api for push/pull/installXavier Ducrohet2010-07-2619-510/+724
| | | | | | | | | | | | | The API now throws SyncException instead of returning SyncResult. The IDevice API to install/uninstall now returns a single InstallException that encapsulate all the other ddmlib exception. Also, the recently added exceptions now don't extend IOException anymore. Change-Id: Ib334c4157a6add1882233dfaaa032aea1910eede
* parse instrumentation result bundlesGuang Zhu2010-07-164-23/+84
| | | | | | | | | | | During tests, there are per-instrumentation based results emmitted as key-value pairs. Examples include performance tests and normal tests in code coverage mode. Currently most of these are discarded by InstrumentationResultParser, this change adds parsing function, stores the key-value pairs in a map, and finally send it to ITestRunListeners at the end of test run. Change-Id: If04c5f8b10eeaca494a155ed6c4a25bf0d9d892c
* Add new exceptions to ddmlib.Xavier Ducrohet2010-07-1510-156/+359
| | | | | | | | | | | | | | | | | | | | - AdbCommandRejectedException is thrown when adb doesn't respond to the command with OKAY. This used to throw a normal IOException but it can be useful to throw a different type. The message of the exception is the error string returned by adb. - ShellCommandUnresponsiveException is the new "timeout" exception for output received by shell command running on devices. This makes the distinction between timeout when talking to adb and issue with shell command not outputting anything. Also made the javadoc for the IDevice.executeShellCommand clearer to what the "timeout" (renamed to maxTimeToOutputResponse) does. Also added a better timeout to the IDevice methods to install/uninstall apps as the default 5sec timeout was likely to be too low. Current default value is 2min. Change-Id: I4ecb9498926295a4e801e71b33df5d611e8120b8
* Add support for specifying adb timeout in ddms testrunner.Brett Chabot2010-07-142-1/+21
| | | | | | Also handle TimeoutException in ADT test runner. Change-Id: I585c2818f1c77ec80222bad282ae10b3ee8f5e1c
* Fix some javadocs regarding the timeout API change.Xavier Ducrohet2010-07-132-4/+10
| | | | Change-Id: I7e96c253aa07b124bceab99b6f5ce11e17f7b950
* Merge "Fix a possible deadlock in Eclipse/ADT."Xavier Ducrohet2010-07-1313-281/+415
|\
| * Fix a possible deadlock in Eclipse/ADT.Xavier Ducrohet2010-07-1313-281/+415
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue is that sometimes phones will stop responding to shell commands launched through adb. One of these commands is executed in DeviceMonitor#queryNewDeviceForInfo However this is done from a loop that acquires a lock that is used in other places, including building. This basically renders eclipse useless as Eclipse will refuse to do anything until the build is finished. The fix is twofold: First, move the call to queryNewDeviceForInfo outside of the synchronized block. This fixes the deadlock issue but this will not fix the problem that the device monitor will still be stuck with a shell command that never returns. The second part of the fix is to add a timeout to shell command execution. Additionnaly, this patch contains a lot of clean up of the adb API in ddmlib, especially around exceptions thrown during timeout. Change-Id: Ice8ef787c825e0e7b535ff0bb939bf6f25e3d7e4
* | Add hours to ddms log timestamp.Brett Chabot2010-07-121-5/+4
|/ | | | Change-Id: I293b049e73e4776d969706b28ae7533ed581dfcd
* Fix ddms projects in Eclipse for Windows/Cygwin.Raphael Moll2010-06-281-2/+5
| | | | Change-Id: Ie68b8c0dd9eecbc14a2bb86247b767ea47c6842c
* Make ddmlib/ddmuilib jar files inside the ddms plug-in instead of symlinks.Xavier Ducrohet2010-06-2415-327/+336
| | | | | | | Also cleaned up the abstraction layer to load images from ddmuilib since its image are now always located inside ddmuilib jar. Change-Id: Id9d283df18a05b7b5593e4593e90dac6e5548b94
* Fix a crash in DDMS when parsing an unexpected sync event format due to a ↵Xavier Ducrohet2010-06-231-0/+3
| | | | | | change in froyo. Change-Id: I878911b3167ff12b48fa3ea3a7bfb9129466b9bd
* Merge "Add a 'removeInstrumentationArg' method to ddms testrunner."Brett Chabot2010-06-102-0/+17
|\
| * Add a 'removeInstrumentationArg' method to ddms testrunner.Brett Chabot2010-06-102-0/+17
| | | | | | | | Change-Id: I85ba17eefbc5550dc2712b28b5d870e233c85058
* | Properly handle float/double in loc control when locale is not en.Xavier Ducrohet2010-06-092-59/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | String.format uses the decimal point of the current locale which we don't want since we pass the result to the emulator which expects decimal point to be '.' Double.parseDouble does not use the current locale and therefore failed to read values put in the UI that used a decimal point that is not '.' Also simplified the GPS command to use geo fix instead of geo nmea Change-Id: I275018e6a967c3d4fa37f25a149a840350e40bb8
* | Enforce english formatting for the geo string sent to the emulator.Xavier Ducrohet2010-06-081-2/+6
|/ | | | Change-Id: I1fc90e332fff41e40d2fce740bce8e07d88586ce
* Add a reboot command to IDevice to allow ddmlib users to reboot devices.Bill Napier2010-05-174-0/+50
| | | | Change-Id: I8f8b792c68ec869980805c06aecf249558c6dc3f
* Fix a typo.Xavier Ducrohet2010-05-141-1/+1
| | | | Change-Id: I699ee939436964e0c88b7b8423b5ed6fef84add1
generated by cgit v1.1 at 2025-02-07 19:48:16 +0000