Commit Graph

4704 Commits

Author SHA1 Message Date
Brian Muramatsu
ea1113825c Merge "Add Android CTS Download Link to 2.2_r1" 2010-07-27 14:14:37 -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
9eca9eb6ce Fix Monkeyrunner to use new ddmlib API.
Change-Id: Iaa042e53bf645ec574faabb2f8b62693836afc7a
2010-07-26 12:09:01 -07:00
Xavier Ducrohet
61eba5b68c am 0637952d: (-s ours) am 235a95ae: Update the monkeyrunner to use the new DDMlib API.
Merge commit '0637952dc18fcaae9192d0301a233b3b650bb094'

* commit '0637952dc18fcaae9192d0301a233b3b650bb094':
  Update the monkeyrunner to use the new DDMlib API.
2010-07-26 12:00:48 -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
Dianne Hackborn
22e3194cf0 Merge "Add API demo for DialogFragment." 2010-07-24 11:44:12 -07:00
Dianne Hackborn
cdb8af8170 Add API demo for DialogFragment.
Change-Id: Id02cba60d661f747c36bc113bd81a2b6fe45573a
2010-07-24 11:43:26 -07:00
Jean-Baptiste Queru
cfb814bd81 resolved conflicts for merge of 17c61aaf to master
Change-Id: I288054a9e6997ec3e8e2906058b83c7d629a239a
2010-07-23 18:51:47 -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
5a48825cc0 am 474fe56a: am 688e62cd: Monkey: Changes to release lock before reporting ANR and meminfo
Merge commit '474fe56acccc1372d1b21a7dbf74309005d699c6'

* commit '474fe56acccc1372d1b21a7dbf74309005d699c6':
  Monkey: Changes to release lock before reporting ANR and meminfo
2010-07-22 09:32:25 -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
bf844b1fdc am 58e763b0: am 98de4a25: Update source.properties for SDK platform component.
Merge commit '58e763b01994cae774439534d50c4f6a3f3aaa8b'

* commit '58e763b01994cae774439534d50c4f6a3f3aaa8b':
  Update source.properties for SDK platform component.
2010-07-21 18:13:57 -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
Andrew Stadler
fd199df40a Fix classpath:
* add launcher2's renderscript intermediates
* add media provider intermediates

Change-Id: I48ec899635c396db3dec08441aa04e4dd8552b8b
2010-07-21 15:13:36 -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
3bf0f8165b am d3e98a44: am ad0d46a4: Merge "documentation fix when downloading repo" into gingerbread
Merge commit 'd3e98a44112d066586b2824b8943e7282dca7327'

* commit 'd3e98a44112d066586b2824b8943e7282dca7327':
  documentation fix when downloading repo
2010-07-19 17:05:24 -07: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
Brian Muramatsu
688e2fdb20 Add Android CTS Download Link to 2.2_r1
Bug 2814482

Change-Id: Id2a91eec5efa2ebb10fdfa54b13264dfa6b821a2
2010-07-19 14:11:12 -07:00
David 'Digit' Turner
59c7a2646c am 06565c9d: am ad77ed7d: ndk: fix samples compilation
Merge commit '06565c9d35dbbc744bc6355dd418505855e7ce5e'

* commit '06565c9d35dbbc744bc6355dd418505855e7ce5e':
  ndk: fix samples compilation
2010-07-17 09:11:44 -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
Amith Yamasani
5618ef3b82 Merge "Generate English Dictionary (version : 200 - may contain bigrams) - created separate class for bigram" 2010-07-16 17:42:40 -07:00
David 'Digit' Turner
08cd7cacf3 am 110f6cd9: am 6d0ef0df: ndk: handle --verbose option in tests/run-all.sh script
Merge commit '110f6cd94a5c2f68ffc19223679d8c16b6d3ab51'

* commit '110f6cd94a5c2f68ffc19223679d8c16b6d3ab51':
  ndk: handle --verbose option in tests/run-all.sh script
2010-07-16 16:24:55 -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
David 'Digit' Turner
6d0ef0df98 ndk: handle --verbose option in tests/run-all.sh script
Change-Id: Ib99020a8b5c76c34bcbf8244426221bb3b6d2663
2010-07-16 14:31:30 -07:00
Dianne Hackborn
66aad28a21 am 05648a1d: am e551875b: Update NDK for pre-key-dispatching changes.
Merge commit '05648a1dfd948b4d74231a995b1de3d6d2eff0d1'

* commit '05648a1dfd948b4d74231a995b1de3d6d2eff0d1':
  Update NDK for pre-key-dispatching changes.
2010-07-16 09:12:24 -07:00
David 'Digit' Turner
b998b47441 am 0471ba82: am 3d81d6a2: Merge "ndk: add tests/run-all.sh to run all automated tests." into gingerbread
Merge commit '0471ba82ca41b6a4c784f8716268bf2b652f8517'

* commit '0471ba82ca41b6a4c784f8716268bf2b652f8517':
  ndk: add tests/run-all.sh to run all automated tests.
2010-07-15 23:21:02 -07:00
Christopher Tate
9f4af1cb02 am 3589326b: am 284e3ae1: Merge "NDK access to the Asset Manager" into gingerbread
Merge commit '3589326ba70415180245e2d6845f6281458ba04a'

* commit '3589326ba70415180245e2d6845f6281458ba04a':
  NDK access to the Asset Manager
2010-07-15 23:05:07 -07:00
Dianne Hackborn
05648a1dfd am e551875b: Update NDK for pre-key-dispatching changes.
Merge commit 'e551875b2d82ed2709a28e046759523cb87ba2e2' into gingerbread-plus-aosp

* commit 'e551875b2d82ed2709a28e046759523cb87ba2e2':
  Update NDK for pre-key-dispatching changes.
2010-07-15 22:24:48 -07:00
Dianne Hackborn
e551875b2d Update NDK for pre-key-dispatching changes.
The same code now calls the appropriate function as part of
its key processing.

Change-Id: Ie6fbcd802b098b85d8113fe0a49473134721009b
2010-07-15 22:21:04 -07:00
Xavier Ducrohet
b8f2aa9ff1 Fix MonkeyRunner to use the changed ddmlib API.
Change-Id: Ia56612bf700e360f77dd9e13c0bc74eac59e30ea
2010-07-15 17:46:26 -07:00
David 'Digit' Turner
0471ba82ca am 3d81d6a2: Merge "ndk: add tests/run-all.sh to run all automated tests." into gingerbread
Merge commit '3d81d6a2eb8be4649891687cb3354a66b981dfc8' into gingerbread-plus-aosp

* commit '3d81d6a2eb8be4649891687cb3354a66b981dfc8':
  ndk: add tests/run-all.sh to run all automated tests.
2010-07-15 16:32:23 -07:00
David 'Digit' Turner
3d81d6a2eb Merge "ndk: add tests/run-all.sh to run all automated tests." into gingerbread 2010-07-15 16:30:12 -07:00
David 'Digit' Turner
d74329cef6 ndk: add tests/run-all.sh to run all automated tests.
For now, this only tries to rebuild all samples from scratch

Change-Id: I0d059b72b68d5abcfb462b897813dd60399612ef
2010-07-15 16:20:59 -07:00
Christopher Tate
3589326ba7 am 284e3ae1: Merge "NDK access to the Asset Manager" into gingerbread
Merge commit '284e3ae11c6f1fee5b2d417eea16b3a2126a04a5' into gingerbread-plus-aosp

* commit '284e3ae11c6f1fee5b2d417eea16b3a2126a04a5':
  NDK access to the Asset Manager
2010-07-15 15:03:26 -07:00
Christopher Tate
284e3ae11c Merge "NDK access to the Asset Manager" into gingerbread 2010-07-15 15:00:16 -07:00
Scott Main
38675e8073 am bcc3a3c0: am 435959e7: am f0f2aba8: Merge "update notepad tutorial to change activity title in NoteEdit class" into froyo
Merge commit 'bcc3a3c0a1d413b2e1b89ed2a54fd074dd4745ce'

* commit 'bcc3a3c0a1d413b2e1b89ed2a54fd074dd4745ce':
  update notepad tutorial to change activity  title in NoteEdit class
2010-07-15 11:54:26 -07:00
Scott Main
bcc3a3c0a1 am 435959e7: am f0f2aba8: Merge "update notepad tutorial to change activity title in NoteEdit class" into froyo
Merge commit '435959e72b623a41ff4384862b924102dd7a1bc6' into gingerbread-plus-aosp

* commit '435959e72b623a41ff4384862b924102dd7a1bc6':
  update notepad tutorial to change activity  title in NoteEdit class
2010-07-15 11:27:22 -07:00
Scott Main
435959e72b am f0f2aba8: Merge "update notepad tutorial to change activity title in NoteEdit class" into froyo
Merge commit 'f0f2aba8925b7f88af6c3af479c560e4e6b67ee4' into gingerbread

* commit 'f0f2aba8925b7f88af6c3af479c560e4e6b67ee4':
  update notepad tutorial to change activity  title in NoteEdit class
2010-07-15 11:25:07 -07:00
Scott Main
f0f2aba892 Merge "update notepad tutorial to change activity title in NoteEdit class" into froyo 2010-07-15 11:22:52 -07:00
Joe Onorato
8c490dc8d1 am 6b9784b0: am 288d90c2: Merge "The "current" SDK stubs jar should use the full apk that\'s exported, not the product-specific one." into gingerbread
Merge commit '6b9784b04249d42f1f2c68cfd30fa4d3322a3b75'

* commit '6b9784b04249d42f1f2c68cfd30fa4d3322a3b75':
  The "current" SDK stubs jar should use the full apk that's exported, not the product-specific one.
2010-07-15 11:16:38 -07:00
Joe Onorato
6b9784b042 am 288d90c2: Merge "The "current" SDK stubs jar should use the full apk that\'s exported, not the product-specific one." into gingerbread
Merge commit '288d90c212b534e85ccf12d7bc1b5bd1d0562c5b' into gingerbread-plus-aosp

* commit '288d90c212b534e85ccf12d7bc1b5bd1d0562c5b':
  The "current" SDK stubs jar should use the full apk that's exported, not the product-specific one.
2010-07-15 11:12:37 -07:00
Joe Onorato
288d90c212 Merge "The "current" SDK stubs jar should use the full apk that's exported, not the product-specific one." into gingerbread 2010-07-15 11:08:07 -07:00
Joe Onorato
6e384d9b43 The "current" SDK stubs jar should use the full apk that's exported, not the product-specific one.
The SDK is not dependent on configurations, and also this speeds up the post-installclean build.

Change-Id: I1c075ddf1dd2ca44cc0aa37f23e86ccc593cc2a8
2010-07-14 19:56:38 -07:00
Mathias Agopian
a8ccef2afb am f83e92e0: am 4619318d: Merge "Sample code to illustrate how to use the accelerometer" into gingerbread
Merge commit 'f83e92e078bbf6de6e80380901a4ea1382b57a56'

* commit 'f83e92e078bbf6de6e80380901a4ea1382b57a56':
  Sample code to illustrate how to use the accelerometer
2010-07-14 16:39:31 -07:00