Commit Graph

4252 Commits

Author SHA1 Message Date
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
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
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
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