aboutsummaryrefslogtreecommitdiffstats
path: root/sdkmanager
Commit message (Collapse)AuthorAgeFilesLines
...
* | Fix SdkManager.hasChangedRaphael Moll2012-08-282-18/+59
| | | | | | | | | | | | Also add a simple unit test. Change-Id: I8ed3dfbea07578528036f1dabd75c18f3161819c
* | SDK Manager: fix sdk-has-changed.Raphael Moll2012-08-271-6/+36
|/ | | | | | | | The SdkManager.hasChanged method was supposed to only look at direct folders in platforms and add-ons, not regular files. Change-Id: I87c3d51bfd7bd2578285f957a9838fadec703401
* Update annotations on overridden methodsTor Norbye2012-08-222-4/+8
| | | | | | Required when using Eclipse 4. Change-Id: Ie5f95794392ce46e0b04ae67b5eaf07efb19fbac
* Merge "SDK Manager: support for partial resume of downloads."Raphael Moll2012-08-217-89/+329
|\
| * SDK Manager: support for partial resume of downloads.Raphael Moll2012-08-217-89/+329
| | | | | | | | Change-Id: I248194b5764cf801e52ebd35c6b5963facf31a3e
* | Merge "SDK Lib: minor cleanup in UrlOpener."Raphael Moll2012-08-215-15/+47
|\ \ | |/
| * SDK Lib: minor cleanup in UrlOpener.Raphael Moll2012-08-215-15/+47
| | | | | | | | | | | | | | | | | | | | | | Makes UrlOpener private. All callers should use the DownloadCache class, and UrlOpener must remain purely an implementation detail. That's because UrlOpener is just a bunch of static whereas DownloadCache is an instance that gets passed around and can be overriden for testing. Change-Id: Idacd328616f6c11df298f4e2b8f4ac7668cf6ffd
* | Merge "SDK Lib: fix some javadoc references."Raphael Moll2012-08-216-26/+28
|\ \ | |/
| * SDK Lib: fix some javadoc references.Raphael Moll2012-08-216-26/+28
| | | | | | | | | | | | | | Fixes some warnings due to obsolete javadoc references, mostly classes that have moved around. Change-Id: I38179f84d42b033f6f1132db2759d00e5a301fa5
* | Merge "Fix nullability annotations"Tor Norbye2012-08-217-27/+34
|\ \ | |/ |/|
| * Fix nullability annotationsTor Norbye2012-08-217-27/+34
| | | | | | | | | | | | | | | | | | | | | | Eclipse 3.8/4.2 requires that any method which overrides another method with a @NonNull parameter (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=381443). This changeset adds @NonNull on various overriding methods in newly added code such that Eclispe 4.2 doesn't show errors. Change-Id: Ice4a4b4dc31ba68c4e0911bb37c15da090076a0d
* | SDK Manager: fix HTTP Auth cancel.Raphael Moll2012-08-204-18/+30
|/ | | | | | | | | | | | | | | | When the SDK Manager prompts the user for HTTP Auth or NTLM auth, the API says the result should be null if the user cancelled. It wasn't, it was instead empty string fields and the download would abort the a "failed: no content" error in the log. This fixes the UI to respect the convention. It also makes sure that if the HttpClient call fails due to the user cancelling, we don't try to fallback on the java.UrlConnection method. Change-Id: Ibf1807f4becd40dbced17f851b3fdc5b394788ea
* SDK Manager: socket read timeout.Raphael Moll2012-08-201-1/+29
| | | | | | | | | | | | | This adds a non-null default timeouts on the HttpClient and UrlConnection instances. Most important is the socket read timeout which seems to be infinite by default. The default is at 1 minute for that one, with an option to change it via an env variable. I might want to expose it in the options dialog later (in another CL.) SDK Bug/Request: 26382 Change-Id: I8b1da6505ea331d0520987ab8955f39cf123202b
* SDK Manager: fix "null" error some people are getting.Raphael Moll2012-08-203-8/+47
| | | | | | | | | | | | | | | Some users reported in some cases they see a line in the sdk manager log that just says "null". Turns out to be an NPE when trying to read the null InputStream returned by UrlOpener in case of a failed URL fetch. UrlOpener used to throw an IOException when a resource couldn't be fetched, but then I added an alternate download path (to handle file:// resources) and that made it fail with a null input stream instead. So now the code throws an exception like it used to before. Change-Id: I92ef53992290c5e6fde8b0400274bbee822f2a61
* Make sure android.bat copies all the jars it needs.Xavier Ducrohet2012-08-171-0/+1
| | | | | | Bug: 6995718 Change-Id: I88b96a84c7e04051808fce7b54adb4160b927af1
* Unify all loggers in the sdk tools.Xavier Ducrohet2012-08-1743-517/+342
| | | | | | | | | | Removed ILogger from ide_common Removed ISdkLog (and implementations) from sdklib Moved all existing code to com.android.utils.ILogger which is located in common. Change-Id: Icd674d4b8d10f6ae8b60a83acb43cc53c7a52137
* Merge "ADT: Detect when SDK platforms/addons might have changed."Raphael Moll2012-08-161-77/+260
|\
| * ADT: Detect when SDK platforms/addons might have changed.Raphael Moll2012-08-151-77/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a new functionality in SdkManager to keep track of the existing platforms/addons folder and detect later whether they might have changed. The check is a quick sanity check done on the presence of the target directory, its last-modified timestamp as well as the one of the source.properties. Whenever an SDK Manager instance updates an existing target or add/removes a new one, a change will be detected. Non-goal: this does not trigger when a user manually modifies the content of a target (e.g. its data files). A method is added in AdtPlugin to reload the SDK if the above method detects the targets have potentially changed. This is then used when there's a user interaction with something that depends on the latest state of the SDK, namely: opening XML files (layout, manifest, etc.) or opening a wizard (AVD manager, new project, new template.) These wizards already register for sdk/target change listeners and are notified asynchronously if the SDK has changed and is refreshed. Change-Id: Ia343c26321c0cb39c28a7c5d570c94e543344401
* | Merge "Create new logging class in the common library."Xavier Ducrohet2012-08-151-1/+1
|\ \
| * | Create new logging class in the common library.Xavier Ducrohet2012-08-151-1/+1
| |/ | | | | | | | | | | | | | | | | The goal is to later migrate all existing code to this new logger and get rid of all our duplicates. Also did a misc fix in AndroidLocation. Change-Id: Ia33a782b57c91b4e3d5fd2c0660e040be11b9cbb
* | Add Ant support for UI automation test.Xavier Ducrohet2012-08-152-0/+3
|/ | | | | | | Also fix a bug in a custom ant task where minSdkVersion and targetApi were swapped. Change-Id: Id9bac802377a04270e76def42eaf6a8fb4b3f874
* Fix build.Xavier Ducrohet2012-08-131-2/+1
| | | | | | For some reason "make sdk" doesn't build uiautomatorviewer? Change-Id: Ie390b8c517d4e5da1fbc9b13f56bf60812efecba
* More refactoring.Xavier Ducrohet2012-08-1372-2779/+73
| | | | | | | Move stuff out of sdklib into common and ide_common. Remove androidprefs and move the one class into common. Change-Id: I71d126a13cf2ba413692e29616f4968a37d7b33a
* Load devices defined in toolsMichael Wright2012-08-101-0/+9
| | | | Change-Id: Ib40dada5062e755b48bd3a62514ede14cef5ec1e
* Set default scaled screen size to device's screen sizeMichael Wright2012-08-093-6/+34
| | | | Change-Id: I6b169f0ef21d8f45da35dd10a7f76b30f3defcbb
* Make AVDs repairable when the base device changes or is deletedMichael Wright2012-08-0914-67/+250
| | | | Change-Id: I3b931ee511dc157320ca8658fe421fe28a1ff387
* Merge "Refactor common.jar"Xavier Ducrohet2012-08-0824-21/+27
|\
| * Refactor common.jarXavier Ducrohet2012-08-0724-21/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move resources and com.android.util.Pair into layoutlib_api where they belong since layoutlib depends on them and we need to control the API. Made a copy of Pair to stay in common.jar but moved it to com.android.utils.Pair (the one in com.android.util.Pair is marked as deprecated to prevent usage where applicable). Also moved XmlUtil and PositionXmlParser to com.android.utils to match Pair. Change-Id: I21d7057d3f2ce604f86a3bb1fa3c130948c93b89
* | Merge "Make using GPU Emulation and Snapshots an error"Michael Wright2012-08-081-0/+7
|\ \
| * | Make using GPU Emulation and Snapshots an errorMichael Wright2012-08-071-0/+7
| | | | | | | | | | | | Change-Id: I0e77931a034af5d005e73c4f54818595c0720ab3
* | | Merge "Make missing devices.xml a warning rather than an error"Michael Wright2012-08-081-0/+2
|\ \ \ | |/ /
| * | Make missing devices.xml a warning rather than an errorMichael Wright2012-08-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Since most users probably won't have custom devices, but instead use the ones we provide, it doesn't make sense to have the absence of a custom, user-specific devices.xml be an error instead of a warning. Change-Id: I9754be29e88377b8c2e594f1d790310da35897fc
* | | Merge "Add RAM, VM heap and internal storage size settings to AVDs"Michael Wright2012-08-082-13/+191
|\ \ \ | |/ /
| * | Add RAM, VM heap and internal storage size settings to AVDsMichael Wright2012-08-072-13/+191
| |/ | | | | | | Change-Id: Idb8807e07fddc912144b962de0a01b729071c92b
* | Cleanup: dos2unix some files in SdkController.Raphael Moll2012-08-072-547/+547
|/ | | | Change-Id: I7d53dd01cc9fc25794ed10bf053f093a4dda9af3
* Merge "Convert EOL from dos2unix in sdkuilib *.java"Raphael Moll2012-08-0727-7620/+7620
|\
| * Convert EOL from dos2unix in sdkuilib *.javaRaphael Moll2012-08-0727-7620/+7620
| | | | | | | | Change-Id: Ia046d63aac7800326effbe61364d2efa35581633
* | Merge "Convert EOL from Windows to Unix in sdklib *.java"Raphael Moll2012-08-0772-18556/+18612
|\ \ | |/
| * Convert EOL from Windows to Unix in sdklib *.javaRaphael Moll2012-08-0772-18556/+18612
| | | | | | | | | | | | | | | | This is just a "dos2unix" applied to all the sdklib *.java files. I meant to clean that a while ago. I'll do sdkuilib in a different CL. Change-Id: I5c7d65cea9205d8765961db0fea42d8b3dbd58eb
* | Include status-bar node when writing out Device's softwareMichael Wright2012-08-071-0/+2
|/ | | | Change-Id: I973d454d040ab537e10727f16f70270dc0bae7ce
* Merge "Java implementation of bspatch."Raphael Moll2012-08-061-0/+533
|\
| * Java implementation of bspatch.Raphael Moll2012-08-041-0/+533
| | | | | | | | Change-Id: I994ea6499c542fe43b16037e4a8cf184b95f91de
* | Merge "SDK Manager: allow user URLs to point to sys-img.xml too."Raphael Moll2012-08-061-1/+15
|\ \
| * | SDK Manager: allow user URLs to point to sys-img.xml too.Raphael Moll2012-08-021-1/+15
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "user defined sites" code originally only dealt with add-on XML sources. Now we'd like it to deal with system-image sources too, but we don't know which kind of object it is (at least not without trying to fetch it.) As a temporary workaround, just take a guess based on the leaf URI name. However ideally what we should simply do is add a checkbox "is system-image XML" in the user dialog and pass this info down here. Another alternative is to make a "dynamic" source object that tries to guess its type once the URI has been fetched. Change-Id: I019d1b0dee56a587bc917c9141ca4bd052e55876
* | Increment count when backing up bad devices.xmlMichael Wright2012-08-061-1/+1
| | | | | | | | | | | | | | | | Fixes a bug where if you had devices.xml.old.0 in ~/.android, then the DeviceManager would spin in an infinite loop because the count wouldn't be incremented each time. Change-Id: I525a0da120205ffb9e507bf1a83cb02f077ba76d
* | Added status bar qualifier to device schemaMichael Wright2012-08-063-1/+30
| | | | | | | | | | | | | | Since some tablets have a status bar at the top and others don't, we need to be able to configure this by API level for the GLE. Change-Id: I8c4fd7adb89636173421489f8a136d541d3de4eb
* | Merge "Add new AVD creation and edit dialog"Michael Wright2012-08-036-150/+967
|\ \
| * | Add new AVD creation and edit dialogMichael Wright2012-08-036-150/+967
| | | | | | | | | | | | | | | | | | | | | | | | Take advantage of the new device specifications and provide a much simplified AVD creation dialog, while retaining the old dialog for use with AVDs created prior to this. Change-Id: I2ab3613d6a1b58a96c330dc1d8c1df36afc88058
* | | Merge "Add listener interface for changes in device lists"Michael Wright2012-08-031-0/+44
|\ \ \ | |/ /
| * | Add listener interface for changes in device listsMichael Wright2012-08-021-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | Allows things like the GLE to be notified when a device is added or removed via the AVD Manager so they can update their menus accordingly. Change-Id: I616234e7dba3151712cf0d6df600a9104da4f806