OSDN Git Service
Dianne Hackborn [Tue, 7 Sep 2010 23:36:39 +0000 (16:36 -0700)]
am
d3d58cf7: Update to follow ALooper ident change.
Merge commit '
d3d58cf7d3a508bb855c2ad626205ddcbb3bd237' into gingerbread-plus-aosp
* commit '
d3d58cf7d3a508bb855c2ad626205ddcbb3bd237':
Update to follow ALooper ident change.
Dianne Hackborn [Tue, 7 Sep 2010 22:30:07 +0000 (15:30 -0700)]
Update to follow ALooper ident change.
Also the native-activity sample also has some very simple code showing
how to listen to the accelerometer.
Change-Id: I0629b8bc40cddd66233c1675cd5e8b42a9b722d8
Joe Onorato [Tue, 7 Sep 2010 18:39:40 +0000 (11:39 -0700)]
am
7d26cd19: Add an activity to Dev Tools that shows the Configuration and DisplayMetrics.
Merge commit '
7d26cd198266cd48cb0a912585419fbe0cc8ed89' into gingerbread-plus-aosp
* commit '
7d26cd198266cd48cb0a912585419fbe0cc8ed89':
Add an activity to Dev Tools that shows the Configuration and DisplayMetrics.
Joe Onorato [Tue, 7 Sep 2010 15:53:18 +0000 (11:53 -0400)]
Add an activity to Dev Tools that shows the Configuration and DisplayMetrics.
Change-Id: I6d3a682adccfef99eaa4d01b97091eda68f05cd8
Dianne Hackborn [Thu, 2 Sep 2010 21:49:25 +0000 (14:49 -0700)]
am
23bff5dd: Add API demo for picking a contact with a permission grant.
Merge commit '
23bff5dd80c782ac6d4f67caa57230f265fca77e' into gingerbread-plus-aosp
* commit '
23bff5dd80c782ac6d4f67caa57230f265fca77e':
Add API demo for picking a contact with a permission grant.
Dianne Hackborn [Thu, 2 Sep 2010 05:58:26 +0000 (22:58 -0700)]
Add API demo for picking a contact with a permission grant.
Change-Id: I9b0659e18afb19f8050cb77104c41ea291a9e3c7
Xavier Ducrohet [Wed, 1 Sep 2010 23:53:40 +0000 (16:53 -0700)]
am
b7d3c175: Merge "New SDK architecture. DO NOT MERGE." into gingerbread
Merge commit '
b7d3c175e25143cb75199d4e62418df5bc2e413b' into gingerbread-plus-aosp
* commit '
b7d3c175e25143cb75199d4e62418df5bc2e413b':
New SDK architecture. DO NOT MERGE.
Xavier Ducrohet [Wed, 1 Sep 2010 23:48:59 +0000 (16:48 -0700)]
Merge "New SDK architecture. DO NOT MERGE." into gingerbread
Xavier Ducrohet [Sat, 28 Aug 2010 01:47:51 +0000 (18:47 -0700)]
New SDK architecture. DO NOT MERGE.
tools normally under the platform, move to a single location
called platform-tools/
Change-Id: I70659167778303722acb107a2d04bbf01467f884
Yu Shan Emily Lau [Mon, 30 Aug 2010 22:56:38 +0000 (15:56 -0700)]
am
67aad2d8: Merge "Add the simple script log for the statbility stress test. Add the randomize script option." into gingerbread
Merge commit '
67aad2d8d51e9d48730f0c6e4848c60b1a9d0798' into gingerbread-plus-aosp
* commit '
67aad2d8d51e9d48730f0c6e4848c60b1a9d0798':
Add the simple script log for the statbility stress test.
Yu Shan Emily Lau [Mon, 30 Aug 2010 22:52:59 +0000 (15:52 -0700)]
Merge "Add the simple script log for the statbility stress test. Add the randomize script option." into gingerbread
Yu Shan Emily Lau [Fri, 27 Aug 2010 06:00:06 +0000 (23:00 -0700)]
Add the simple script log for the statbility stress test.
Add the randomize script option.
Change-Id: I7fbbd3b78a2fc5fe5300ac4811540d0cd2070688
Jean-Baptiste Queru [Mon, 30 Aug 2010 17:33:39 +0000 (10:33 -0700)]
am
d9380caf: Merge "Make runtest --path smarter when choosing path to build."
Merge commit '
d9380caf410ddf4b17a6e5035a89851bc58408f7' into gingerbread-plus-aosp
* commit '
d9380caf410ddf4b17a6e5035a89851bc58408f7':
Make runtest --path smarter when choosing path to build.
Jean-Baptiste Queru [Mon, 30 Aug 2010 17:25:04 +0000 (10:25 -0700)]
am
be97ad65: Merge "Replaced deprecated Contacts Api with ContactsContract"
Merge commit '
be97ad655dedb392caa06ccc6c528b37ba5169fb' into gingerbread-plus-aosp
* commit '
be97ad655dedb392caa06ccc6c528b37ba5169fb':
Replaced deprecated Contacts Api with ContactsContract
Jean-Baptiste Queru [Mon, 30 Aug 2010 16:10:24 +0000 (09:10 -0700)]
Merge "Make runtest --path smarter when choosing path to build."
Jean-Baptiste Queru [Mon, 30 Aug 2010 16:04:19 +0000 (09:04 -0700)]
Merge "Replaced deprecated Contacts Api with ContactsContract"
Xavier Ducrohet [Sat, 28 Aug 2010 02:41:51 +0000 (19:41 -0700)]
am
420b59fe: Fix windows SDK build.
Merge commit '
420b59fe215f8a912e66759d1c4a252bea3df39d' into gingerbread-plus-aosp
* commit '
420b59fe215f8a912e66759d1c4a252bea3df39d':
Fix windows SDK build.
Xavier Ducrohet [Sat, 28 Aug 2010 02:30:38 +0000 (19:30 -0700)]
Fix windows SDK build.
Location of hierarchyviewer is now in hierarchyviewer2/app/etc
Change-Id: I14257c96552a16d19461cdf8194045a608dd03b3
Dianne Hackborn [Sat, 28 Aug 2010 00:03:48 +0000 (17:03 -0700)]
Dianne Hackborn [Sat, 28 Aug 2010 00:00:52 +0000 (17:00 -0700)]
Fix build.
Change-Id: Ic030f82e79981792dc3116d318e217ab81ecea3b
Derek Sollenberger [Fri, 27 Aug 2010 14:45:43 +0000 (07:45 -0700)]
am
704da604: Merge "Disable Proguard for the SampleBrowerPlugin" into gingerbread
Merge commit '
704da60406d259c5a3bfe273755861f80575d7ca' into gingerbread-plus-aosp
* commit '
704da60406d259c5a3bfe273755861f80575d7ca':
Disable Proguard for the SampleBrowerPlugin
Derek Sollenberger [Fri, 27 Aug 2010 14:43:54 +0000 (07:43 -0700)]
Merge "Disable Proguard for the SampleBrowerPlugin" into gingerbread
Derek Sollenberger [Fri, 27 Aug 2010 14:34:18 +0000 (10:34 -0400)]
Disable Proguard for the SampleBrowerPlugin
The native plugin library makes calls into java files that are
not often stripped out when Proguard optimizes the package.
Change-Id: I6ce8867dc9fa23e8a6adcc8daf9c8fb75f83c16d
Yu Shan Emily Lau [Thu, 26 Aug 2010 22:27:57 +0000 (15:27 -0700)]
am
ea7d6e8e: Merge "Add the new option for the device sleep time. This is only for the scripted monkey." into gingerbread
Merge commit '
ea7d6e8e6568b777693c52183e9abf973786a6b5' into gingerbread-plus-aosp
* commit '
ea7d6e8e6568b777693c52183e9abf973786a6b5':
Add the new option for the device sleep time. This is only for the scripted monkey.
Yu Shan Emily Lau [Thu, 26 Aug 2010 22:17:36 +0000 (15:17 -0700)]
Merge "Add the new option for the device sleep time. This is only for the scripted monkey." into gingerbread
Dianne Hackborn [Thu, 26 Aug 2010 21:46:30 +0000 (14:46 -0700)]
am
4f410fb5: Update to follow API.
Merge commit '
4f410fb5bfe0bad4760610b771edb33300470041' into gingerbread-plus-aosp
* commit '
4f410fb5bfe0bad4760610b771edb33300470041':
Update to follow API.
Dianne Hackborn [Thu, 26 Aug 2010 21:38:20 +0000 (14:38 -0700)]
Update to follow API.
Change-Id: I9d6a1dc64cd4e55bf68994784c4a724aeafd7857
Yu Shan Emily Lau [Thu, 26 Aug 2010 02:37:13 +0000 (19:37 -0700)]
Add the new option for the device sleep time. This is only for the scripted monkey.
Change-Id: I4a6bd7133bbd2da9594a47e1f5529c5358cd9aed
Raphael Moll [Thu, 26 Aug 2010 16:02:13 +0000 (09:02 -0700)]
am
f08d230e: SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
Merge commit '
f08d230ed0d2612e79c121e0afa1e439b5702815' into gingerbread-plus-aosp
* commit '
f08d230ed0d2612e79c121e0afa1e439b5702815':
SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
Jean-Baptiste Queru [Wed, 25 Aug 2010 17:15:11 +0000 (10:15 -0700)]
am
33462598: am
bea98acf: reconcile open-source froyo into google variant
Merge commit '
33462598d8c20001483f3f2e1bca155fa3a83cd5' into gingerbread-plus-aosp
* commit '
33462598d8c20001483f3f2e1bca155fa3a83cd5':
Explicitly enable backup by default in SDK builds
Jean-Baptiste Queru [Wed, 25 Aug 2010 17:13:14 +0000 (10:13 -0700)]
am
bea98acf: reconcile open-source froyo into google variant
Merge commit '
bea98acfa2253796aeade605c7020a7cc942af41' into gingerbread
* commit '
bea98acfa2253796aeade605c7020a7cc942af41':
Explicitly enable backup by default in SDK builds
Brad Fitzpatrick [Wed, 25 Aug 2010 17:10:40 +0000 (10:10 -0700)]
am
06bcd705: Quiet harmless StrictMode violations caused by the Monkey.
Merge commit '
06bcd705606070aa71425fc557e72592a2405a0a' into gingerbread-plus-aosp
* commit '
06bcd705606070aa71425fc557e72592a2405a0a':
Quiet harmless StrictMode violations caused by the Monkey.
Brad Fitzpatrick [Wed, 25 Aug 2010 01:58:14 +0000 (18:58 -0700)]
Quiet harmless StrictMode violations caused by the Monkey.
The monkey writes to System.out which is effectively a file and is
caught by StrictMode.
BUG=
2947447
Change-Id: Iab38917f18baa319dad34d0c788bc9a10a041796
Jean-Baptiste Queru [Wed, 25 Aug 2010 16:37:05 +0000 (09:37 -0700)]
reconcile open-source froyo into google variant
Change-Id: I2dcb50be9b2061fb90a10d40e430294233cc5039
Christopher Tate [Tue, 24 Aug 2010 20:24:48 +0000 (13:24 -0700)]
Explicitly enable backup by default in SDK builds
This change parallels a frameworks/base change that makes the default
backup state at boot "enabled, with LocalTransport as the currently
active transport." Device vendors who wish to ship the Google backup
transport need to explicitly disable backup by default (it is enabled
when the user agrees to the opt-in disclosure).
Change-Id: I6b0c5c059ef58effd5c121107ea3a5edd9e936cc
Yu Shan Emily Lau [Wed, 25 Aug 2010 03:10:38 +0000 (20:10 -0700)]
am
27d0ec1e: Merge "Add the new option for the scripted monkey profile testing." into gingerbread
Merge commit '
27d0ec1e87dcf41960f87f203c1822e88f99ea38' into gingerbread-plus-aosp
* commit '
27d0ec1e87dcf41960f87f203c1822e88f99ea38':
Add the new option for the scripted monkey profile testing.
Yu Shan Emily Lau [Wed, 25 Aug 2010 03:08:29 +0000 (20:08 -0700)]
Merge "Add the new option for the scripted monkey profile testing." into gingerbread
Brian Carlstrom [Wed, 25 Aug 2010 03:02:24 +0000 (20:02 -0700)]
am
4a1b80c3: Merge "Added a couple of new properties." into gingerbread
Merge commit '
4a1b80c386fb2d87ae2d47f6b4c22599227d010f' into gingerbread-plus-aosp
* commit '
4a1b80c386fb2d87ae2d47f6b4c22599227d010f':
Added a couple of new properties.
Brian Carlstrom [Wed, 25 Aug 2010 02:58:19 +0000 (19:58 -0700)]
Merge "Added a couple of new properties." into gingerbread
Yu Shan Emily Lau [Wed, 25 Aug 2010 01:03:32 +0000 (18:03 -0700)]
Add the new option for the scripted monkey profile testing.
Change-Id: I1013a1a0daed948f509d9a29077f0e282baf1a10
Christopher Tate [Wed, 25 Aug 2010 01:21:53 +0000 (18:21 -0700)]
am
c37018a7: am
ddc026b1: Merge "Explicitly enable backup by default in SDK builds" into froyo
Merge commit '
c37018a7c485322b5cc1ae8060a47363ac3b3e49' into gingerbread-plus-aosp
* commit '
c37018a7c485322b5cc1ae8060a47363ac3b3e49':
Explicitly enable backup by default in SDK builds
Christopher Tate [Wed, 25 Aug 2010 01:19:19 +0000 (18:19 -0700)]
am
ddc026b1: Merge "Explicitly enable backup by default in SDK builds" into froyo
Merge commit '
ddc026b1d5633348d97d78477ff1c7c950c3f3a8' into gingerbread
* commit '
ddc026b1d5633348d97d78477ff1c7c950c3f3a8':
Explicitly enable backup by default in SDK builds
Christopher Tate [Wed, 25 Aug 2010 01:04:35 +0000 (18:04 -0700)]
Merge "Explicitly enable backup by default in SDK builds" into froyo
Brian Carlstrom [Wed, 25 Aug 2010 01:02:43 +0000 (18:02 -0700)]
Added a couple of new properties.
The Android framework crashes with an int parsing failure and then
spins wildly if it can't find an expected property.
(git cherry-pick -e
d88ee455)
Change-Id: Ie33e0261185301e6ce41b0896f9916816db9f928
Christopher Tate [Tue, 24 Aug 2010 20:24:48 +0000 (13:24 -0700)]
Explicitly enable backup by default in SDK builds
This change parallels a frameworks/base change that makes the default
backup state at boot "enabled, with LocalTransport as the currently
active transport." Device vendors who wish to ship the Google backup
transport need to explicitly disable backup by default (it is enabled
when the user agrees to the opt-in disclosure).
Change-Id: I6b0c5c059ef58effd5c121107ea3a5edd9e936cc
Raphael Moll [Sun, 22 Aug 2010 01:04:31 +0000 (18:04 -0700)]
SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
Change-Id: Id85ec31d80fc12a6907d9c3404a29d28d4923abd
Yu Shan Emily Lau [Thu, 19 Aug 2010 22:49:25 +0000 (15:49 -0700)]
am
3307fdcc: Merge "Added the new keyword tap for the scripted monkey." into gingerbread
Merge commit '
3307fdcce1f322ed72cc3d3a8d9da87aae856531' into gingerbread-plus-aosp
* commit '
3307fdcce1f322ed72cc3d3a8d9da87aae856531':
Added the new keyword tap for the scripted monkey.
Yu Shan Emily Lau [Thu, 19 Aug 2010 22:46:51 +0000 (15:46 -0700)]
Merge "Added the new keyword tap for the scripted monkey." into gingerbread
Yu Shan Emily Lau [Thu, 19 Aug 2010 21:57:42 +0000 (14:57 -0700)]
Added the new keyword tap for the scripted monkey.
Change-Id: Iabfc462f8fc853b3235aa0d742fa46c97e980b77
Yu Shan Emily Lau [Thu, 19 Aug 2010 18:14:05 +0000 (11:14 -0700)]
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.
Yu Shan Emily Lau [Thu, 19 Aug 2010 18:11:28 +0000 (11:11 -0700)]
Merge "Add the monkey event which allows the scripted monkey to execute the shell command." into gingerbread
Yu Shan Emily Lau [Wed, 18 Aug 2010 03:00:07 +0000 (20:00 -0700)]
Add the monkey event which allows the scripted monkey to execute the shell command.
Change-Id: Id5548fc42fc5c7bee6879fffc580e134a75572ab
Mathias Agopian [Wed, 18 Aug 2010 20:37:58 +0000 (13:37 -0700)]
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
Mathias Agopian [Tue, 17 Aug 2010 22:32:32 +0000 (15:32 -0700)]
don't strip resources so it work on all devices
Change-Id: Ifc6be52151fcdecd0f8f622c7312ffa0ac4705e9
Svetoslav Ganov [Tue, 17 Aug 2010 17:48:34 +0000 (10:48 -0700)]
am
4b06026c: am
9f93186b: Adding a sample accessibility service
Merge commit '
4b06026cb901d4a032ecc731a835767ff1bf27fe' into gingerbread-plus-aosp
* commit '
4b06026cb901d4a032ecc731a835767ff1bf27fe':
Adding a sample accessibility service
Svetoslav Ganov [Tue, 17 Aug 2010 17:45:23 +0000 (10:45 -0700)]
am
9f93186b: Adding a sample accessibility service
Merge commit '
9f93186beae13ea057a4b2e867928b357cd650a4' into gingerbread
* commit '
9f93186beae13ea057a4b2e867928b357cd650a4':
Adding a sample accessibility service
Mathias Agopian [Mon, 16 Aug 2010 23:54:37 +0000 (16:54 -0700)]
am
a37be42f: Reformat to Android style guidelines
Merge commit '
a37be42f9f4d0f54f8ff10524ee023177f0b7990' into gingerbread-plus-aosp
* commit '
a37be42f9f4d0f54f8ff10524ee023177f0b7990':
Reformat to Android style guidelines
Mathias Agopian [Mon, 16 Aug 2010 23:54:33 +0000 (16:54 -0700)]
am
a7c85d92: Take screen rotation into account
Merge commit '
a7c85d92351070605b93176c1f691f4f80321ad5' into gingerbread-plus-aosp
* commit '
a7c85d92351070605b93176c1f691f4f80321ad5':
Take screen rotation into account
Mathias Agopian [Mon, 16 Aug 2010 23:13:24 +0000 (16:13 -0700)]
Reformat to Android style guidelines
Change-Id: Ib9d7e39464a246dbaae38e00fbb325f153f89f65
Jean-Baptiste Queru [Mon, 16 Aug 2010 20:16:44 +0000 (13:16 -0700)]
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)
Mathias Agopian [Mon, 16 Aug 2010 19:55:18 +0000 (12:55 -0700)]
Take screen rotation into account
Change-Id: I354c58eb1d28552d46b8fa269e12c00eaf6cbb99
Jean-Baptiste Queru [Mon, 16 Aug 2010 16:19:10 +0000 (09:19 -0700)]
Merge "Monkey: Set the name of the process to distinguish from generic name (app_process)"
Jean-Baptiste Queru [Mon, 16 Aug 2010 15:24:20 +0000 (08:24 -0700)]
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.
Jean-Baptiste Queru [Mon, 16 Aug 2010 15:11:53 +0000 (08:11 -0700)]
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"
Ying Wang [Thu, 12 Aug 2010 20:14:11 +0000 (13:14 -0700)]
am
8fc77898: Fix keycode. [Cherry-pick from master]
Merge commit '
8fc778984cd0b737df102fca14be7c1815505b80' into gingerbread-plus-aosp
* commit '
8fc778984cd0b737df102fca14be7c1815505b80':
Fix keycode. [Cherry-pick from master]
Ying Wang [Thu, 12 Aug 2010 18:30:41 +0000 (11:30 -0700)]
Fix keycode. [Cherry-pick from master]
see frameworks/base/core/java/android/view/KeyEvent.java.
Change-Id: Ic9a355b36815c4ac7db9c57c14bfe933585cf963
http://b/issue?id=
2830562
Svetoslav Ganov [Wed, 11 Aug 2010 04:41:06 +0000 (21:41 -0700)]
Adding a sample accessibility service
Change-Id: I5bd42157e263aac6d7a85db090319db168dea2fd
Dianne Hackborn [Wed, 11 Aug 2010 07:47:46 +0000 (00:47 -0700)]
am
79b946e8: Some native activity sample code cleanup.
Merge commit '
79b946e8f2ccb552e1a3fe8222f660b9a76cc001' into gingerbread-plus-aosp
* commit '
79b946e8f2ccb552e1a3fe8222f660b9a76cc001':
Some native activity sample code cleanup.
Dianne Hackborn [Wed, 4 Aug 2010 18:13:03 +0000 (11:13 -0700)]
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
Raphael Moll [Tue, 10 Aug 2010 18:39:50 +0000 (11:39 -0700)]
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.
Raphael Moll [Thu, 5 Aug 2010 20:30:39 +0000 (13:30 -0700)]
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
Vairavan Srinivasan [Tue, 3 Aug 2010 17:00:55 +0000 (10:00 -0700)]
Monkey: Set the name of the process to distinguish from generic name (app_process)
Change-Id: If58ff437bfbea421dc00a2d85547267c010871e4
Xavier Ducrohet [Fri, 30 Jul 2010 18:29:30 +0000 (11:29 -0700)]
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.
David 'Digit' Turner [Fri, 30 Jul 2010 01:27:20 +0000 (18:27 -0700)]
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.
David 'Digit' Turner [Fri, 30 Jul 2010 01:07:56 +0000 (18:07 -0700)]
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
Brett Chabot [Thu, 29 Jul 2010 22:27:30 +0000 (15:27 -0700)]
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
Xavier Ducrohet [Tue, 27 Jul 2010 22:07:35 +0000 (15:07 -0700)]
Re-organize the SDK, moving the build tools out of the platforms.
Change-Id: I4526310a1c882ad33084d94e118b1c74b3181a6a
Brett Chabot [Wed, 28 Jul 2010 18:37:12 +0000 (11:37 -0700)]
am
8ddb2873: Change hosttestlib to use ddm-prebuilt.
Merge commit '
8ddb2873df96c7181c9358f5c9286e273648bf89' into gingerbread-plus-aosp
* commit '
8ddb2873df96c7181c9358f5c9286e273648bf89':
Change hosttestlib to use ddm-prebuilt.
Brett Chabot [Wed, 28 Jul 2010 00:57:38 +0000 (17:57 -0700)]
Change hosttestlib to use ddm-prebuilt.
Change-Id: Ibd1c44096893bc8804a4d7644fc83d2edd443bb2
Bill Napier [Wed, 28 Jul 2010 00:12:57 +0000 (17:12 -0700)]
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.
Eric Fischer [Tue, 27 Jul 2010 23:35:22 +0000 (16:35 -0700)]
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.
Bill Napier [Tue, 27 Jul 2010 23:08:06 +0000 (16:08 -0700)]
Remove monkeyrunner so it can move to the SDK project.
Change-Id: Ibedfae41cf8a71d66f25267cd3a360de222e2644
Eric Fischer [Mon, 26 Jul 2010 22:54:28 +0000 (15:54 -0700)]
Update time zone data to the new version 2010k.
Change-Id: Ifaadb0c75343bf271232dcd72f53fd34bb33aca1
Xavier Ducrohet [Mon, 26 Jul 2010 18:40:38 +0000 (11:40 -0700)]
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.
Xavier Ducrohet [Wed, 21 Jul 2010 23:50:22 +0000 (16:50 -0700)]
Update the monkeyrunner to use the new DDMlib API.
Change-Id: I0c1e17b450e264ca1e7d98523bde4ddfe1d97252
Jean-Baptiste Queru [Sat, 24 Jul 2010 01:45:02 +0000 (18:45 -0700)]
resolved conflicts for merge of
ecd4a4d0 to gingerbread-plus-aosp
Change-Id: I623544ad03ae1a750fac6b0f8a3427fc5590b5c9
Jean-Baptiste Queru [Sat, 24 Jul 2010 01:35:58 +0000 (18:35 -0700)]
Merge "Corrected Classpath"
Vairavan Srinivasan [Thu, 22 Jul 2010 16:30:38 +0000 (09:30 -0700)]
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
Xavier Ducrohet [Thu, 22 Jul 2010 00:01:40 +0000 (17:01 -0700)]
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.
Xavier Ducrohet [Wed, 21 Jul 2010 23:30:05 +0000 (16:30 -0700)]
Update source.properties for SDK platform component.
Change-Id: I4226a31d33fffbeb326ef2aea792a0676139fb1a
Vairavan Srinivasan [Tue, 20 Jul 2010 21:09:17 +0000 (14:09 -0700)]
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
Christian Mehlmauer [Fri, 25 Jun 2010 15:03:51 +0000 (17:03 +0200)]
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
Nick Kralevich [Tue, 20 Jul 2010 00:03:10 +0000 (17:03 -0700)]
am
ad0d46a4: Merge "documentation fix when downloading repo" into gingerbread
Merge commit '
ad0d46a4088ff24d8582a751f589d9006def9e0a' into gingerbread-plus-aosp
* commit '
ad0d46a4088ff24d8582a751f589d9006def9e0a':
documentation fix when downloading repo
Nick Kralevich [Tue, 20 Jul 2010 00:00:42 +0000 (17:00 -0700)]
Merge "documentation fix when downloading repo" into gingerbread
David 'Digit' Turner [Sat, 17 Jul 2010 16:07:42 +0000 (09:07 -0700)]
am
ad77ed7d: ndk: fix samples compilation
Merge commit '
ad77ed7d47e7e4037905ccc220bde65d24825f71' into gingerbread-plus-aosp
* commit '
ad77ed7d47e7e4037905ccc220bde65d24825f71':
ndk: fix samples compilation
David 'Digit' Turner [Fri, 16 Jul 2010 21:52:50 +0000 (14:52 -0700)]
ndk: fix samples compilation
Change-Id: I3e0f88f823c891cea5ca3f82f7c3a6284295425c
David 'Digit' Turner [Fri, 16 Jul 2010 21:42:46 +0000 (14:42 -0700)]
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
David 'Digit' Turner [Fri, 16 Jul 2010 21:31:30 +0000 (14:31 -0700)]
ndk: handle --verbose option in tests/run-all.sh script
Change-Id: Ib99020a8b5c76c34bcbf8244426221bb3b6d2663
Dianne Hackborn [Fri, 16 Jul 2010 05:24:48 +0000 (22:24 -0700)]
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.
Dianne Hackborn [Fri, 16 Jul 2010 00:48:05 +0000 (17:48 -0700)]
Update NDK for pre-key-dispatching changes.
The same code now calls the appropriate function as part of
its key processing.
Change-Id: Ie6fbcd802b098b85d8113fe0a49473134721009b