Commit Graph

4426 Commits

Author SHA1 Message Date
Yu Shan Emily Lau
3307fdcce1 Merge "Added the new keyword tap for the scripted monkey." into gingerbread 2010-08-19 15:46:51 -07:00
Yu Shan Emily Lau
39b0199222 Added the new keyword tap for the scripted monkey.
Change-Id: Iabfc462f8fc853b3235aa0d742fa46c97e980b77
2010-08-19 15:01:38 -07:00
Yu Shan Emily Lau
2929dce37a am b409cf9c: Merge "Add the monkey event which allows the scripted monkey to execute the shell command." into gingerbread
Merge commit 'b409cf9ca1251df1145139580f6809364fb3881f' into gingerbread-plus-aosp

* commit 'b409cf9ca1251df1145139580f6809364fb3881f':
  Add the monkey event which allows the scripted monkey to execute the shell command.
2010-08-19 11:14:05 -07:00
Yu Shan Emily Lau
b409cf9ca1 Merge "Add the monkey event which allows the scripted monkey to execute the shell command." into gingerbread 2010-08-19 11:11:28 -07:00
Yu Shan Emily Lau
4fbc8db891 Add the monkey event which allows the scripted monkey to execute the shell command.
Change-Id: Id5548fc42fc5c7bee6879fffc580e134a75572ab
2010-08-19 11:03:34 -07:00
Mathias Agopian
5b8ec51113 am b5c4c9e2: don\'t strip resources so it work on all devices
Merge commit 'b5c4c9e266c13bbd32a36f553ad0089ccedd6dc1' into gingerbread-plus-aosp

* commit 'b5c4c9e266c13bbd32a36f553ad0089ccedd6dc1':
  don't strip resources so it work on all devices
2010-08-18 13:37:58 -07:00
Mathias Agopian
b5c4c9e266 don't strip resources so it work on all devices
Change-Id: Ifc6be52151fcdecd0f8f622c7312ffa0ac4705e9
2010-08-17 20:04:34 -07:00
Svetoslav Ganov
b07724366e am 4b06026c: am 9f93186b: Adding a sample accessibility service
Merge commit '4b06026cb901d4a032ecc731a835767ff1bf27fe' into gingerbread-plus-aosp

* commit '4b06026cb901d4a032ecc731a835767ff1bf27fe':
  Adding a sample accessibility service
2010-08-17 10:48:34 -07:00
Svetoslav Ganov
4b06026cb9 am 9f93186b: Adding a sample accessibility service
Merge commit '9f93186beae13ea057a4b2e867928b357cd650a4' into gingerbread

* commit '9f93186beae13ea057a4b2e867928b357cd650a4':
  Adding a sample accessibility service
2010-08-17 10:45:23 -07:00
Mathias Agopian
9cd582f8cb am a37be42f: Reformat to Android style guidelines
Merge commit 'a37be42f9f4d0f54f8ff10524ee023177f0b7990' into gingerbread-plus-aosp

* commit 'a37be42f9f4d0f54f8ff10524ee023177f0b7990':
  Reformat to Android style guidelines
2010-08-16 16:54:37 -07:00
Mathias Agopian
056fe7952e am a7c85d92: Take screen rotation into account
Merge commit 'a7c85d92351070605b93176c1f691f4f80321ad5' into gingerbread-plus-aosp

* commit 'a7c85d92351070605b93176c1f691f4f80321ad5':
  Take screen rotation into account
2010-08-16 16:54:33 -07:00
Mathias Agopian
a37be42f9f Reformat to Android style guidelines
Change-Id: Ib9d7e39464a246dbaae38e00fbb325f153f89f65
2010-08-16 16:13:24 -07:00
Jean-Baptiste Queru
8930942de2 am 4388d2c3: Merge "Monkey: Set the name of the process to distinguish from generic name (app_process)"
Merge commit '4388d2c333c164ce67db6d4a59cded8dfea9fc9a' into gingerbread-plus-aosp

* commit '4388d2c333c164ce67db6d4a59cded8dfea9fc9a':
  Monkey: Set the name of the process to distinguish from generic name (app_process)
2010-08-16 13:16:44 -07:00
Mathias Agopian
a7c85d9235 Take screen rotation into account
Change-Id: I354c58eb1d28552d46b8fa269e12c00eaf6cbb99
2010-08-16 12:55:18 -07: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
0fd0e932d2 am 898004c4: 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 usi
Merge commit '898004c4b2322c8fece08944731eed9fc08a14a5' into gingerbread-plus-aosp

* commit '898004c4b2322c8fece08944731eed9fc08a14a5':
  Activity/provider used is restricted to the application's Package, but can be spread across other packages as well.
2010-08-16 08:24:20 -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
Ying Wang
a27eb4c7d9 am 8fc77898: Fix keycode. [Cherry-pick from master]
Merge commit '8fc778984cd0b737df102fca14be7c1815505b80' into gingerbread-plus-aosp

* commit '8fc778984cd0b737df102fca14be7c1815505b80':
  Fix keycode. [Cherry-pick from master]
2010-08-12 13:14:11 -07:00
Ying Wang
8fc778984c Fix keycode. [Cherry-pick from master]
see frameworks/base/core/java/android/view/KeyEvent.java.

Change-Id: Ic9a355b36815c4ac7db9c57c14bfe933585cf963
http://b/issue?id=2830562
2010-08-12 11:30:41 -07:00
Svetoslav Ganov
9f93186bea Adding a sample accessibility service
Change-Id: I5bd42157e263aac6d7a85db090319db168dea2fd
2010-08-11 14:45:56 -07:00
Dianne Hackborn
a7d7e653f0 am 79b946e8: Some native activity sample code cleanup.
Merge commit '79b946e8f2ccb552e1a3fe8222f660b9a76cc001' into gingerbread-plus-aosp

* commit '79b946e8f2ccb552e1a3fe8222f660b9a76cc001':
  Some native activity sample code cleanup.
2010-08-11 00:47:46 -07:00
Dianne Hackborn
79b946e8f2 Some native activity sample code cleanup.
Update to include newest headers and library, tweak glue code to
work better with state saving and add support for config changes.

Change-Id: I4d27bd4a0f542f217efaec86cf4f219aca020426
2010-08-11 00:31:37 -07:00
Raphael Moll
4336dcc64b am ff779c0f: Update win_sdk to put binaries in SDK/platform-tools.
Merge commit 'ff779c0f2a19985a9a6733d4864b4b56b20729bd' into gingerbread-plus-aosp

* commit 'ff779c0f2a19985a9a6733d4864b4b56b20729bd':
  Update win_sdk to put binaries in SDK/platform-tools.
2010-08-10 11:39:50 -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
Xavier Ducrohet
7d3106bebb am b86b7f72: Re-organize the SDK, moving the build tools out of the platforms.
Merge commit 'b86b7f72db1549cb526a141ca8b6158908483f1a' into gingerbread-plus-aosp

* commit 'b86b7f72db1549cb526a141ca8b6158908483f1a':
  Re-organize the SDK, moving the build tools out of the platforms.
2010-07-30 11:29:30 -07:00
David 'Digit' Turner
d1314040fe am f4790e6f: Separate platform files and samples by API level.
Merge commit 'f4790e6f9e47347996e62ecd27ff55b6499cf97a' into gingerbread-plus-aosp

* commit 'f4790e6f9e47347996e62ecd27ff55b6499cf97a':
  Separate platform files and samples by API level.
2010-07-29 18:27:20 -07:00
David 'Digit' Turner
f4790e6f9e Separate platform files and samples by API level.
Remove all duplicate platform files, i.e development/ndk/platforms/android-N now
only contains files that are introduced in API level 'N' and not found in level 'N-1'

(This makes it easier to manage independent platform release branches, and makes
 platform additions trivial to examine and maintain).

Move samples that depends on features of API level 'N' into platforms/android-N/samples

+ update tests/run-all.sh accordingly

Change-Id: I04c4c67c6c674c1714d5812d461d0524a4f4cfd9
2010-07-29 18:07:56 -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
d53cf3ba04 am 8ddb2873: Change hosttestlib to use ddm-prebuilt.
Merge commit '8ddb2873df96c7181c9358f5c9286e273648bf89' into gingerbread-plus-aosp

* commit '8ddb2873df96c7181c9358f5c9286e273648bf89':
  Change hosttestlib to use ddm-prebuilt.
2010-07-28 11:37:12 -07:00
Brett Chabot
8ddb2873df Change hosttestlib to use ddm-prebuilt.
Change-Id: Ibd1c44096893bc8804a4d7644fc83d2edd443bb2
2010-07-27 17:57:38 -07:00
Bill Napier
255ee00edc am 32553f52: Remove monkeyrunner so it can move to the SDK project.
Merge commit '32553f5291b1e0c5363db8bd7f280037f4f600e2' into gingerbread-plus-aosp

* commit '32553f5291b1e0c5363db8bd7f280037f4f600e2':
  Remove monkeyrunner so it can move to the SDK project.
2010-07-27 17:12:57 -07:00
Eric Fischer
b5ebc48565 am cc7fc9e8: Update time zone data to the new version 2010k.
Merge commit 'cc7fc9e839cee6c33d099a94c5bdb655bd83ccd9' into gingerbread-plus-aosp

* commit 'cc7fc9e839cee6c33d099a94c5bdb655bd83ccd9':
  Update time zone data to the new version 2010k.
2010-07-27 16:35:22 -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
Eric Fischer
cc7fc9e839 Update time zone data to the new version 2010k.
Change-Id: Ifaadb0c75343bf271232dcd72f53fd34bb33aca1
2010-07-26 15:54:28 -07:00
Xavier Ducrohet
0637952dc1 am 235a95ae: Update the monkeyrunner to use the new DDMlib API.
Merge commit '235a95ae49e9dd40003e99c35bd79fe007347fb3' into gingerbread-plus-aosp

* commit '235a95ae49e9dd40003e99c35bd79fe007347fb3':
  Update the monkeyrunner to use the new DDMlib API.
2010-07-26 11:40:38 -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
17c61aaf46 resolved conflicts for merge of ecd4a4d0 to gingerbread-plus-aosp
Change-Id: I623544ad03ae1a750fac6b0f8a3427fc5590b5c9
2010-07-23 18:45:02 -07:00
Jean-Baptiste Queru
ecd4a4d09c Merge "Corrected Classpath" 2010-07-23 18:35:58 -07:00
Vairavan Srinivasan
474fe56acc am 688e62cd: Monkey: Changes to release lock before reporting ANR and meminfo
Merge commit '688e62cd116d0bc17ad162915908764c67dd6045' into gingerbread-plus-aosp

* commit '688e62cd116d0bc17ad162915908764c67dd6045':
  Monkey: Changes to release lock before reporting ANR and meminfo
2010-07-22 09:30:38 -07:00
Xavier Ducrohet
58e763b019 am 98de4a25: Update source.properties for SDK platform component.
Merge commit '98de4a25089c9e604e45e72db5fcde67add66643' into gingerbread-plus-aosp

* commit '98de4a25089c9e604e45e72db5fcde67add66643':
  Update source.properties for SDK platform component.
2010-07-21 17:01:40 -07:00
Xavier Ducrohet
98de4a2508 Update source.properties for SDK platform component.
Change-Id: I4226a31d33fffbeb326ef2aea792a0676139fb1a
2010-07-21 16:30:05 -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
Nick Kralevich
d3e98a4411 am ad0d46a4: Merge "documentation fix when downloading repo" into gingerbread
Merge commit 'ad0d46a4088ff24d8582a751f589d9006def9e0a' into gingerbread-plus-aosp

* commit 'ad0d46a4088ff24d8582a751f589d9006def9e0a':
  documentation fix when downloading repo
2010-07-19 17:03:10 -07:00
Nick Kralevich
ad0d46a408 Merge "documentation fix when downloading repo" into gingerbread 2010-07-19 17:00:42 -07:00
David 'Digit' Turner
06565c9d35 am ad77ed7d: ndk: fix samples compilation
Merge commit 'ad77ed7d47e7e4037905ccc220bde65d24825f71' into gingerbread-plus-aosp

* commit 'ad77ed7d47e7e4037905ccc220bde65d24825f71':
  ndk: fix samples compilation
2010-07-17 09:07:42 -07:00
David 'Digit' Turner
ad77ed7d47 ndk: fix samples compilation
Change-Id: I3e0f88f823c891cea5ca3f82f7c3a6284295425c
2010-07-17 09:00:01 -07:00
David 'Digit' Turner
110f6cd94a am 6d0ef0df: ndk: handle --verbose option in tests/run-all.sh script
Merge commit '6d0ef0df9852b3750f88bb38dfaeebe527df7be3' into gingerbread-plus-aosp

* commit '6d0ef0df9852b3750f88bb38dfaeebe527df7be3':
  ndk: handle --verbose option in tests/run-all.sh script
2010-07-16 14:42:46 -07:00