Commit Graph

4335 Commits

Author SHA1 Message Date
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
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
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
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
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
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
f83e92e078 am 4619318d: Merge "Sample code to illustrate how to use the accelerometer" into gingerbread
Merge commit '4619318dd1398bd4f87b2e74827b9fb9796a2643' into gingerbread-plus-aosp

* commit '4619318dd1398bd4f87b2e74827b9fb9796a2643':
  Sample code to illustrate how to use the accelerometer
2010-07-14 16:36:10 -07:00
Mathias Agopian
4619318dd1 Merge "Sample code to illustrate how to use the accelerometer" into gingerbread 2010-07-14 16:31:10 -07:00
David 'Digit' Turner
fb6f3fed3d am 4948c163: Remove prebuilt static library "libthreaded_app.a".
Merge commit '4948c163663ecc343c97e4c2a2139234f1d3273f' into gingerbread-plus-aosp

* commit '4948c163663ecc343c97e4c2a2139234f1d3273f':
  Remove prebuilt static library "libthreaded_app.a".
2010-07-14 15:39:04 -07:00
Nick Kralevich
2e5fe2766d documentation fix when downloading repo
Change-Id: I3ceb3abe0cc3cd19954331086ba1cb73c855fde2
2010-07-14 10:25:58 -07:00
David 'Digit' Turner
4948c16366 Remove prebuilt static library "libthreaded_app.a".
Make the "glue library" part of the NDK as an importable module,
this has several benefits:

- no need to distribute a binary here with no easy way to regenerate it

- no need to explicitely list -lthreaded_app in your LOCAL_LDLIBS
  (this is handled automatically by the module import capability)

- allows easier native debugging of what's really happening.

Note that the header is renamed <threaded_native_app.h>

+ Modify the native-activity sample to use and import the new module
+ Start documenting usage in the header file. We probably need something
  better, and will probably put it under development/ndk/docs/ at some
  point.

After this patch, we should be able to get rid of the code under
framework/base/native/{include.glue}

Change-Id: I6e81d70a225a6ca006beabf6e8b42529e8f371b9
2010-07-13 23:50:02 -07:00
Mathias Agopian
c29f1d199f Sample code to illustrate how to use the accelerometer
this is a small particle + physics system that shows how
to integrate accleration data into positions accurately.

Change-Id: I3bbdc433f52d98464269ac8cb996c4cf037ae8d6
2010-07-13 22:51:23 -07:00
Christopher Tate
956311c625 NDK access to the Asset Manager
Change-Id: Ibe380e352af98f953bfc2398b498a6ccb242bcec
2010-07-13 19:38:20 -07:00
Dianne Hackborn
349d745308 am 98b2c359: Copy over updated NDK APIs and follow other API changes.
Merge commit '98b2c359c2b3361f43e14b0c5d07a02c055dd10e' into gingerbread-plus-aosp

* commit '98b2c359c2b3361f43e14b0c5d07a02c055dd10e':
  Copy over updated NDK APIs and follow other API changes.
2010-07-13 18:55:43 -07:00
Dianne Hackborn
98b2c359c2 Copy over updated NDK APIs and follow other API changes.
Change-Id: Ifec95268c9ade21963eea13357ec2f56fd7968c2
2010-07-13 18:45:52 -07:00
Jeff Brown
72e550a10c am 52705bb0: Add initial gamepad support.
Merge commit '52705bb02c7679f68585544d39480f26adb6f1e9' into gingerbread-plus-aosp

* commit '52705bb02c7679f68585544d39480f26adb6f1e9':
  Add initial gamepad support.
2010-07-13 17:43:46 -07:00
Jeff Brown
1ccc674237 am fd606bc3: Migrate to new keycode constants in keycodes.h.
Merge commit 'fd606bc303bdf1fafefc4a6b79d050faa26d0800' into gingerbread-plus-aosp

* commit 'fd606bc303bdf1fafefc4a6b79d050faa26d0800':
  Migrate to new keycode constants in keycodes.h.
2010-07-13 17:43:39 -07:00
Jeff Brown
52705bb02c Add initial gamepad support.
Change-Id: Ide1922ea36f8b64100b4dba57e718479b8a0bec5
2010-07-13 16:47:03 -07:00
Jeff Brown
fd606bc303 Migrate to new keycode constants in keycodes.h.
Change-Id: I775efb0f73b418db5bf65c218949b164f8e65647
2010-07-13 16:47:02 -07:00
David 'Digit' Turner
0372192add am 5ef6b2f2: ndk sample hello-neon: use to access the \'cpufeatures\' library
Merge commit '5ef6b2f2568944e9dedf31c83716b8dd94dd506a' into gingerbread-plus-aosp

* commit '5ef6b2f2568944e9dedf31c83716b8dd94dd506a':
  ndk sample hello-neon: use $(call import-module) to access the 'cpufeatures' library
2010-07-13 16:46:11 -07:00
David 'Digit' Turner
5ef6b2f256 ndk sample hello-neon: use $(call import-module) to access the 'cpufeatures' library
Change-Id: I29397158de0ccdd89dfe4da72a544fad14a8324e
2010-07-13 15:51:46 -07:00
Dianne Hackborn
807f426acc am 29534f62: Update for improved glue.
Merge commit '29534f6275fdc4cba1c732f89f8442b6d887eb50' into gingerbread-plus-aosp

* commit '29534f6275fdc4cba1c732f89f8442b6d887eb50':
  Update for improved glue.
2010-07-09 18:27:47 -07:00
Dianne Hackborn
29534f6275 Update for improved glue.
Change-Id: I73bb23644523e8ec19c51a3e3b9c5c4f7a98c558
2010-07-09 18:21:45 -07:00
Dianne Hackborn
3a92d34829 am 1aa32188: Add new native-plasma sample code.
Merge commit '1aa3218800a9d98c7b62450a3821b99b8b9588e0' into gingerbread-plus-aosp

* commit '1aa3218800a9d98c7b62450a3821b99b8b9588e0':
  Add new native-plasma sample code.
2010-07-09 17:03:10 -07:00
Dianne Hackborn
1aa3218800 Add new native-plasma sample code.
This shows direct drawing to an ANativeWindow's bits.

Update the NDK API, and fix a bug in the native-activity app where it
would hang while exiting.

Change-Id: I4fa98d083405eb0d1b22b10a73a2ef18d45fdb59
2010-07-09 16:58:52 -07:00
Ying Wang
ab8e487188 am 5ce45c93: Fix keycode
Merge commit '5ce45c93ad1dc5f3e836be865ca25a043f7f4ced' into gingerbread-plus-aosp

* commit '5ce45c93ad1dc5f3e836be865ca25a043f7f4ced':
  Fix keycode
2010-07-09 15:15:22 -07:00
Ying Wang
5ce45c93ad Fix keycode
4 new key codes were added since gingerbread.
bug: http://b/issue?id=2830562

Change-Id: I91a55ef6ca9244bc053e25b6dd8d514cb3f106e9
2010-07-09 15:07:19 -07:00
The Android Open Source Project
c5d06301ab merge from open-source master
Change-Id: I8a67eacfb33430d61d738b588955148b2f11994c
2010-07-09 14:42:33 -07:00
David 'Digit' Turner
9aff3c7d58 am f68d6af8: ndk: Add a test to check that prebuilt libraries work as expected.
Merge commit 'f68d6af83f8f99714c139d867e8328f558480f28' into gingerbread-plus-aosp

* commit 'f68d6af83f8f99714c139d867e8328f558480f28':
  ndk: Add a test to check that prebuilt libraries work as expected.
2010-07-09 10:06:02 -07:00
David 'Digit' Turner
f68d6af83f ndk: Add a test to check that prebuilt libraries work as expected.
Change-Id: I7c0683ac1ee50bb62cc0f7ac22e839f749ec1cdf
2010-07-09 09:56:31 -07:00
Jean-Baptiste Queru
36a38df99c Merge "update 404'd source.android.com URLs" 2010-07-08 16:23:59 -07:00
Dianne Hackborn
6d45237078 am eefb5c2d: Merge "Update native_activity sample to use new glue code." into gingerbread
Merge commit 'eefb5c2dca087c2b0a0ef90e15db00fb5523d8af' into gingerbread-plus-aosp

* commit 'eefb5c2dca087c2b0a0ef90e15db00fb5523d8af':
  Update native_activity sample to use new glue code.
2010-07-08 12:28:33 -07:00
Dianne Hackborn
eefb5c2dca Merge "Update native_activity sample to use new glue code." into gingerbread 2010-07-08 12:25:41 -07:00