Commit Graph

4113 Commits

Author SHA1 Message Date
Raphael Moll
a3dc674543 Move <uses-sdk> before <application> in samples.
Change-Id: Iac2644d350235e19f5109aeb25a8d6d4eb1af3fe
2010-11-22 12:39:47 -08:00
Raphael Moll
4bd402f5f1 Merge "Fix DOS end-of-lines in winusb INF file." 2010-11-08 10:02:03 -08:00
Raphael Moll
66980b1877 Fix DOS end-of-lines in winusb INF file.
The file has a mix of unix and DOS-mode end-of-lines.
This CL just fixes the end-of-line to make it a consistent DOS-mode.
There is no change to the actualy content.

Change-Id: I6635ec87907f68e1d34c807f712723804eb0e698
2010-11-05 16:35:01 -07:00
Raphael Moll
4219799735 Merge "SDK Windows: Package customized proguard.bat scripts." 2010-10-26 15:32:23 -07:00
Raphael Moll
799754e18b Merge "Tools package was missing proguard.bat" 2010-10-25 14:43:05 -07:00
Raphael Moll
f4320c6b14 SDK Windows: Package customized proguard.bat scripts.
Requires Change: Ic1dc74cb3ff4dec9b419e2753290c361dffce48e
in platform/sdk.

Change-Id: Ieb2e308c0e9e655b2c047554563d753ac4cbb852
2010-10-25 14:41:16 -07:00
Raphael Moll
b04a4f947c Tools package was missing proguard.bat
SDK Bug: 3126278

Change-Id: I8bb9c2e2250b0da4303b09cdfe05717cee887c44
2010-10-23 22:11:37 -07:00
Bill Napier
66d61ef95f Merge "Add in MonkeyRunner to the Windows SDK." 2010-10-15 15:35:11 -07:00
Bill Napier
85c3f8e126 Add in MonkeyRunner to the Windows SDK.
Change-Id: Iecb23b5a2f790978246df9ab4a10cda884abf742
2010-10-10 13:34:38 -07:00
Jean-Baptiste Queru
e73f0dfc64 Merge "Added adb_interface.WaitForProcess and WaitForProcessEnd." 2010-10-08 13:43:42 -07:00
Xavier Ducrohet
682ec29335 Split the tools component from sdk.atree
This is now in sdk/build/tools.atree.

Change-Id: Ic0c5e14e22a5c760b686dee1a7e376667b9c651b
2010-09-28 08:37:24 -07:00
Xavier Ducrohet
64e53fe5dd Merge "Move adb to the platform-tools." 2010-09-27 16:24:25 -07:00
Raphael Moll
2f613967a0 Move adb to the platform-tools (windows SDK part).
This is the Win SDK counterpart to Change I4c2a11c1.

Change-Id: I660ba49154894b5e78d7e943258ed769efd393dc
2010-09-27 16:20:07 -07:00
Xavier Ducrohet
6a8e50f695 Move adb to the platform-tools.
Also fixed the packaging of hierarchyViewer in the SDK

Change-Id: I4c2a11c1d87867efdd5df2dcb90469b7b1c5065a
2010-09-27 13:58:45 -07:00
Xavier Ducrohet
d59647505d Package Proguard with the SDK.
Change-Id: Ia3effdf9465edbe55d5a691bf7bad163e95bb625
2010-09-16 15:54:37 -07:00
Vairavan Srinivasan
50d579d0ec GlobalTime: Perform Zoom In and Out only after initialization
Invoking zoom on mGLView before initialization causes Null pointer
exception. The usecase is to launch global time and immediately
press key 2 or 8 (just before the globe is seen on display).

Change-Id: I10e7736527a934029364c9c83f147f94574f5488
2010-09-07 19:13:46 -07:00
Jean-Baptiste Queru
d9380caf41 Merge "Make runtest --path smarter when choosing path to build." 2010-08-30 09:10:24 -07:00
Jean-Baptiste Queru
be97ad655d Merge "Replaced deprecated Contacts Api with ContactsContract" 2010-08-30 09:04:19 -07:00
Xavier Ducrohet
420b59fe21 Fix windows SDK build.
Location of hierarchyviewer is now in hierarchyviewer2/app/etc

Change-Id: I14257c96552a16d19461cdf8194045a608dd03b3
2010-08-27 19:30:38 -07:00
Raphael Moll
f08d230ed0 SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
Change-Id: Id85ec31d80fc12a6907d9c3404a29d28d4923abd
2010-08-23 13:38:02 -07:00
Ot ten Thije
9290dd9c7d Added adb_interface.WaitForProcess and WaitForProcessEnd.
Relies mostly on common code factored out of WaitForDevicePm and
WaitForDeviceInstrumentation.
2010-08-20 11:18:58 +01:00
Jean-Baptiste Queru
4388d2c333 Merge "Monkey: Set the name of the process to distinguish from generic name (app_process)" 2010-08-16 09:19:10 -07:00
Jean-Baptiste Queru
898004c4b2 Merge "Activity/provider used is restricted to the application's Package, but can be spread across other packages as well. A better way to construct the activity name should be by getting the substring from the fully qualified classname itself and not using the PackageInfo. Credit:Ritu Srivastava" 2010-08-16 08:11:53 -07:00
Raphael Moll
ff779c0f2a Update win_sdk to put binaries in SDK/platform-tools.
This is requires as a follow up to Change I4526310a
with moved platform tools from $SDK/platform/*/tools
to $SDK/platform-tools/

SDK Bug: 2897406

Change-Id: I1563c88fc824db3d9c86fb65479820989d46895c
2010-08-05 13:32:03 -07:00
Vairavan Srinivasan
83c57574b7 Monkey: Set the name of the process to distinguish from generic name (app_process)
Change-Id: If58ff437bfbea421dc00a2d85547267c010871e4
2010-08-03 10:00:55 -07:00
Brett Chabot
12c6d3fb68 Make runtest --path smarter when choosing path to build.
The command 'runtest --path <path to parent folder>'
is intended to find and build all tests contained within that parent folder.

However, the runtest logic was flawed in that it assumed building a parent
folder's Android.mk file would build all sub-directories.

This commit changes runtest to explictly look for the rule to build
sub-dir makefiles when creating the set of dirs to build.

Change-Id: Ia7f2172c1be79be8589be5f435fc4fb32569c994
2010-07-29 16:00:53 -07:00
Xavier Ducrohet
b86b7f72db Re-organize the SDK, moving the build tools out of the platforms.
Change-Id: I4526310a1c882ad33084d94e118b1c74b3181a6a
2010-07-28 16:01:06 -07:00
Brett Chabot
8ddb2873df Change hosttestlib to use ddm-prebuilt.
Change-Id: Ibd1c44096893bc8804a4d7644fc83d2edd443bb2
2010-07-27 17:57:38 -07:00
Bill Napier
32553f5291 Remove monkeyrunner so it can move to the SDK project.
Change-Id: Ibedfae41cf8a71d66f25267cd3a360de222e2644
2010-07-27 16:08:06 -07:00
Xavier Ducrohet
235a95ae49 Update the monkeyrunner to use the new DDMlib API.
Change-Id: I0c1e17b450e264ca1e7d98523bde4ddfe1d97252
2010-07-26 10:53:14 -07:00
Jean-Baptiste Queru
ecd4a4d09c Merge "Corrected Classpath" 2010-07-23 18:35:58 -07:00
Vairavan Srinivasan
688e62cd11 Monkey: Changes to release lock before reporting ANR and meminfo
Report ANR, dumpsys after releasing lock on Monkey.this.
This ensures the availability of the lock to Activity controller's
appNotResponding.

Reporting dumpsys while holding the lock on this causes a cyclic
deadlock, when twoANRs are reported (one after the other).

Monkey's ActivityController is registered to ActivityManagerService
for handling ANR.The first ANR caused by either service timeout or
broadcast timeout is reported byActivityManagerService to Monkey's
ActivityController via Binder. Meanwhile, the lock on
ActivityManagerService is held by serviceTimeout or broadcastTimeout.

appNotResponding corresponding to first ANR reports procrank and
acquires a lock onMonkey.this and sets few bool variables like
mRequestAnrTraces and mRequestDumpsysMemInfoand returns the control
to ActivityManagerService's service/broadcast timeout.
VM executing monkey process switches the control to main monkey
thread and it acquires thelock on Monkey.this and proceeds to report
ANR traces.

Meanwhile, a second ANR occurs and Activity Manager Service invokes
ActivityController's appNotResponding (via binder). appNotResponding
reports the procrank and waits to acquire the lock on Monkey.this
which is being held by Monkey's main thread(busy reporting first ANR).
This results in a blocking wait for ActivityManagerService's
appNotRespondingLocked() (corresponding to second ANR).

Meanwhile, the monkey's main thread (holding lock on Monkey.this)
tries to report the meminfo for first ANR, invokes
reportDumpsysMemInfo(), which in turn causes the android runtime to
launch dumpsys process. The dumpsys process queries service manager
to get a reference to meminfo service and invoke dump() on the same.
The meminfo service is created by ActivityManagerService's
setSystemProcess(). The dump() method tries to acquire a lock on
ActivityManagerService which is held by ActivityManagerService's
service/broadcasttimeout (awaiting the response from
ActivityController for the second ANR).

This cyclic deadlock continues for a minute after which WatchDog
thread of system_server kills system_server as it hasn't got the
response from ActivityManagerService's monitor(). The monitor()
of ActivityManagerService too tries to acquire lock on this and is
invoked once in every minute.

DEADLOCK:
--------

ActivityManager --> ActivityController  --> Monkey Main  --> MemInfo
--> ActivityManager

Change-Id: I7718eff332e5551b1950ab1c45395bf1ff4b1bda
2010-07-20 16:07:25 -07:00
Christian Mehlmauer
be578863a7 Corrected Classpath
Removed Alarmclock app, due it's not needed any more and causes Errors with DeskClock
Removed not existing google Folders in out dir
Corrected path for frameworks/ex

Change-Id: I9d947f1e257cacc2142b141c2f2fe77076330705
2010-07-20 08:33:56 +02:00
Jean-Baptiste Queru
36a38df99c Merge "update 404'd source.android.com URLs" 2010-07-08 16:23:59 -07:00
Christian Mehlmauer
3eda8fc385 Cleaned up LunarLander sample
Change-Id: If2cc44c8312cebce170d07c34c64ea2ce1e5b7ab
2010-07-02 16:20:49 +02:00
Chris Peterson
b1e0c9653e update 404'd source.android.com URLs
Change-Id: I088f32ca3a8b8568230e068a78b78dee7d6e4924
2010-06-25 17:32:07 -07:00
Christian Mehlmauer
3a3e3ab2df Replaced deprecated Contacts Api with ContactsContract
Change-Id: I4816781c7b48b27ec64a63d51db02646c3d6c1a5
2010-06-25 18:39:40 +02:00
Madan Ankapura
39529c673a Activity/provider used is restricted to the application's Package, but can be spread across other packages as well.
A better way to construct the activity name should be by getting the substring from the fully qualified classname
itself and not using the PackageInfo.
Credit:Ritu Srivastava

Change-Id: I9ff5a27d828d5d3836bb55101cb947f670ea5941
2010-06-24 15:55:55 -07:00
Yu Shan Emily Lau
a96f73a683 am 1a132581: Merge "Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out." into froyo
Merge commit '1a132581a5ce6188989d8522d227392c05cb42f6' into froyo-plus-aosp

* commit '1a132581a5ce6188989d8522d227392c05cb42f6':
  Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out.
2010-06-24 15:42:29 -07:00
Yu Shan Emily Lau
1a132581a5 Merge "Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out." into froyo 2010-06-24 15:30:29 -07:00
Yu Shan Emily Lau
07aeb8c358 Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out.
Change-Id: I3d98d56128b8a96ba712c7e11280e3ab88a7cc4a
2010-06-24 14:20:16 -07:00
The Android Open Source Project
52cc9b9911 merge from open-source master
Change-Id: Ie72de601744653bcd7e9fa3debe71d3c8f2fe591
2010-06-24 14:02:21 -07:00
Raphael Moll
d63615fa69 Moving SDK howto docs from development.git into sdk.git.
See Change I7827d3f3cc6b8ba96822170949618dc75d879d28 for
the CL that adds them back in sdk.git

Change-Id: I37a5b27875fc3ed6b52202ab8435888d38644ca5
2010-06-23 16:00:58 -07:00
Scott Main
e655ff2ce1 am 81b9c9d8: docs: fix doc link bug
Merge commit '81b9c9d8ea3f6b13f03249b437ab5d51cdcb5590' into froyo-plus-aosp

* commit '81b9c9d8ea3f6b13f03249b437ab5d51cdcb5590':
  docs: fix doc link bug
2010-06-22 18:42:23 -07:00
Scott Main
81b9c9d8ea docs: fix doc link bug
bug: 2788457

Change-Id: Ia4ad8cfcee24db2e7cb509952c606508c2fd01c9
2010-06-22 10:38:04 -07:00
The Android Open Source Project
906d47573b merge from open-source master
Change-Id: I4e06b684dd46c317e1c206e584050dbee20be281
2010-06-18 11:33:52 -07:00
Xavier Ducrohet
1cabf853fd remove apkbuilder.jar from the sdk build.
Change-Id: I82cca5c159c1f3210b98deebfd78e2844728b2ac
2010-06-15 18:04:44 -07:00
The Android Open Source Project
e7a4c0910c merge from open-source master
Change-Id: I3e12f866966fda80db5a0795eba9ff82bfe6547d
2010-06-15 15:02:39 -07:00
Xavier Ducrohet
4c22d2bb7d remove jarutils from the sdk packaging.
Change-Id: Ic3c91ff5e20a5bf6b7c3ad11eb6e6f4250c7613d
2010-06-15 13:00:13 -07:00
The Android Open Source Project
ffe072e1a2 merge from open-source master
Change-Id: I7d0f3b08f6e632b689c870017374741a544bc7e8
2010-06-14 10:49:52 -07:00