LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,215 Commits 2 Branches 0 Tags
e301b7b62b8e3d5b18e0152d99bc7b7b541b6489
Commit Graph

4215 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
e301b7b62b am 4a4484be: am 4bdec4ab: merge from open-source master 2010-06-02 07:44:11 -07:00
The Android Open Source Project
451eb3b9b2 am 5482eca1: am 032ae72e: merge from open-source master 2010-06-02 07:42:37 -07:00
The Android Open Source Project
4a4484be62 am 4bdec4ab: merge from open-source master 
Merge commit '4bdec4ab5d3deb28e29c460100a4e3c0b25d37cf' into kraken

* commit '4bdec4ab5d3deb28e29c460100a4e3c0b25d37cf':
  removed unused imports
 2010-06-02 07:41:00 -07:00
The Android Open Source Project
5482eca13a am 032ae72e: merge from open-source master 
Merge commit '032ae72e19d9a12fff483664b975392ef63f2fb7' into kraken

* commit '032ae72e19d9a12fff483664b975392ef63f2fb7':
  Removed unused import
 2010-06-02 07:37:37 -07:00
The Android Open Source Project
99dd14ff0d am 0f57228b: am 43abe820: merge from open-source master 2010-06-02 07:37:36 -07:00
The Android Open Source Project
4bdec4ab5d merge from open-source master 
Change-Id: I0d2492c58689315f4caaa9bcb908296c26f53ed6
 2010-06-02 07:35:57 -07:00
The Android Open Source Project
0f57228bd3 am 43abe820: merge from open-source master 
Merge commit '43abe820f2a46746dcd7b86db593c08b9e1f938d' into kraken

* commit '43abe820f2a46746dcd7b86db593c08b9e1f938d':
  Reduced Warnings
 2010-06-02 07:31:14 -07:00
The Android Open Source Project
48bf2d5efa am 74a0b220: am 740c3e2e: merge from open-source master 2010-06-02 07:30:55 -07:00
The Android Open Source Project
9541a5c0c2 am 85c4a21b: am 8cc5a816: merge from open-source master 2010-06-02 07:30:52 -07:00
The Android Open Source Project
032ae72e19 merge from open-source master 
Change-Id: I3225d2a7b1e4b0ea60941a452285137980c1a921
 2010-06-02 07:30:37 -07:00
The Android Open Source Project
43abe820f2 merge from open-source master 
Change-Id: I6e4280a7f664c84bdd5205db642ed0ae63bc5e3b
 2010-06-02 07:28:32 -07:00
The Android Open Source Project
74a0b22062 am 740c3e2e: merge from open-source master 
Merge commit '740c3e2e97a4cca24ecb534de72663ced238156a' into kraken

* commit '740c3e2e97a4cca24ecb534de72663ced238156a':
  Updated deprecated Contacts API to ContactsContract
 2010-06-02 07:27:39 -07:00
The Android Open Source Project
85c4a21b9e am 8cc5a816: merge from open-source master 
Merge commit '8cc5a8166dcdccfdb7f379a05190cef43f91c423' into kraken

* commit '8cc5a8166dcdccfdb7f379a05190cef43f91c423':
  Updated Sensor Samples to newest API
 2010-06-02 07:27:37 -07:00
The Android Open Source Project
740c3e2e97 merge from open-source master 
Change-Id: I02c592cc054ac16e494ca7a34673ffb562287b01
 2010-06-02 07:23:24 -07:00
The Android Open Source Project
8cc5a8166d merge from open-source master 
Change-Id: I900ca65f70c1a66781fb5f6f37c45961416d5650
 2010-06-02 07:22:11 -07:00
Dan Morrill
178085d352 Adding a page to the compatibility site referenced by the 2.1 CDD. 
This page lists the allowed version strings.

Change-Id: Iffbe0f1739a5daae8f2aa447b86af12aa7142a31
 2010-06-01 17:19:15 -07:00
Xavier Ducrohet
ebf586a17b Merge "Remove obsolete Eclipse instruction for dev on tools." 2010-06-01 16:58:34 -07:00
Guang Zhu
16b98fb001 am 68f37ab9: Merge "Add coverage_targets.xml into test image" into kraken 2010-06-01 16:11:18 -07:00
Kenny Root
895fa90b76 am 8aede04b: Add positional parameters to aid in i18n 2010-06-01 16:10:22 -07:00
Yu Shan Emily Lau
ce970403d8 am 67dfcbf1: am 59b6dce0: am 39d7a745: Merge "Added the instrumentation and power log monkey events fro the new power framework." into froyo 2010-06-01 16:08:42 -07:00
Konstantin Lopyrev
3ab6c0ca42 Merge "Fix 2673731: Adding support for password history to the Device Admin Sample App." 2010-06-01 15:59:45 -07:00
Guang Zhu
68f37ab918 Merge "Add coverage_targets.xml into test image" into kraken 2010-06-01 15:55:21 -07:00
Guang Zhu
ea7e48c8be Add coverage_targets.xml into test image 
This file is needed to get coverage targets definition when running code
coverage

Change-Id: If48ad5d9693eaa5857a308f2d304f388d5d8c4d5
 2010-06-01 14:38:23 -07:00
Xavier Ducrohet
46b910832f Remove obsolete Eclipse instruction for dev on tools. 
These (updated) will be added to a different section later.

Change-Id: Ib5bc1b768cd95c4bc8fd082a7395a3ebb2c0472e
 2010-06-01 14:25:10 -07:00
Kenny Root
8aede04bf2 Add positional parameters to aid in i18n 
Different languages might have different word orders, so add in
positional parameters for strings that have more than one substitution.

Change-Id: Ie9fc74eb0a22471b272e65c6cd521f1518b322d1
 2010-06-01 11:50:47 -07:00
Jack Palevich
a85e0b9ae0 Fix syntax errors in command lines for update-java-alternatives and curl. 
Change-Id: Ib5b2be53b5d7f99d48f0c8366174ed94d4bcfa82
 2010-05-31 15:34:32 +08:00
Dan Morrill
e72ce256b0 Merge "Fixing accidentally-stripped formatting on the code style guidelines. Also fixing a bunch of @Annotation references, to silence some droiddoc warnings." 2010-05-28 16:18:25 -07:00
Dan Morrill
1aad93f698 Fixing accidentally-stripped formatting on the code style guidelines. Also 
fixing a bunch of @Annotation references, to silence some droiddoc warnings.

Change-Id: I810faa6dc25392fc6ec9569876878fe9ac5e6603
 2010-05-28 16:16:40 -07:00
Yu Shan Emily Lau
67dfcbf17b am 59b6dce0: am 39d7a745: Merge "Added the instrumentation and power log monkey events fro the new power framework." into froyo 
Merge commit '59b6dce0d5035b44dd8d99523efc63a469246f42' into kraken

* commit '59b6dce0d5035b44dd8d99523efc63a469246f42':
  Added the instrumentation and power log monkey events fro the new power framework.
 2010-05-28 15:54:27 -07:00
Yu Shan Emily Lau
59b6dce0d5 am 39d7a745: Merge "Added the instrumentation and power log monkey events fro the new power framework." into froyo 
Merge commit '39d7a7451b7e43dc1d71ac983821e76c88775a81' into froyo-plus-aosp

* commit '39d7a7451b7e43dc1d71ac983821e76c88775a81':
  Added the instrumentation and power log monkey events fro the new power framework.
 2010-05-28 15:50:23 -07:00
Yu Shan Emily Lau
39d7a7451b Merge "Added the instrumentation and power log monkey events fro the new power framework." into froyo 2010-05-28 15:38:48 -07:00
Andrew Stadler
0ffca18ad9 Add CalendarProvider and ContactsProvider intermediates 
Required for new usage of EventLogTags.

Change-Id: Ia90af8b791270217a2d2d3cf06b3d772aaaad137
 2010-05-28 15:37:30 -07:00
Yu Shan Emily Lau
2952b49c7c Added the instrumentation and power log monkey events fro the new power framework. 
Change-Id: I3102e6caaba8763a2197ff80f13c8d127ea42316
 2010-05-28 13:48:42 -07:00
Kenny Root
4e1181adc3 am 13cf156b: am 8824549d: am 99cb1d16: Merge "Spelling fix for source download page" into froyo 2010-05-26 15:43:03 -07:00
Kenny Root
13cf156b85 am 8824549d: am 99cb1d16: Merge "Spelling fix for source download page" into froyo 
Merge commit '8824549dce27b5bb3085e6a83f06ca4d16b78ea6' into kraken

* commit '8824549dce27b5bb3085e6a83f06ca4d16b78ea6':
  Spelling fix for source download page
 2010-05-26 15:39:52 -07:00
Kenny Root
8824549dce am 99cb1d16: Merge "Spelling fix for source download page" into froyo 
Merge commit '99cb1d16cc609866bb17c729d9b41926924ab4dd' into froyo-plus-aosp

* commit '99cb1d16cc609866bb17c729d9b41926924ab4dd':
  Spelling fix for source download page
 2010-05-26 15:38:05 -07:00
Kenny Root
99cb1d16cc Merge "Spelling fix for source download page" into froyo 2010-05-26 15:36:27 -07:00
Konstantin Lopyrev
b00082c73a Fix 2673731: Adding support for password history to the Device Admin Sample App. 
Change-Id: I1380ff9475c201d3c2ec2ec449b1103c3d55a3a7
 2010-05-26 14:58:15 -07:00
Xavier Ducrohet
97c743606d am d9c6e694: (-s ours) am 6e6c1ebd: (-s ours) am 02ad7fc2: Move the rev of the froyo sdk component to 2. Do not merge 2010-05-26 13:55:37 -07:00
Xavier Ducrohet
d9c6e6948a am 6e6c1ebd: (-s ours) am 02ad7fc2: Move the rev of the froyo sdk component to 2. Do not merge 
Merge commit '6e6c1ebd77a6a353bf2af77035c73c606311d8c3' into kraken

* commit '6e6c1ebd77a6a353bf2af77035c73c606311d8c3':
  Move the rev of the froyo sdk component to 2. Do not merge
 2010-05-26 13:52:59 -07:00
Xavier Ducrohet
6e6c1ebd77 am 02ad7fc2: Move the rev of the froyo sdk component to 2. Do not merge 
Merge commit '02ad7fc23a8f6a6eddf8ac25138c78f2fd5e8ed7' into froyo-plus-aosp

* commit '02ad7fc23a8f6a6eddf8ac25138c78f2fd5e8ed7':
  Move the rev of the froyo sdk component to 2. Do not merge
 2010-05-26 13:51:54 -07:00
Xavier Ducrohet
02ad7fc23a Move the rev of the froyo sdk component to 2. Do not merge 
Change-Id: I44b05cd40dad2df760d3d259246a714b82ddf9a2
 2010-05-26 13:48:10 -07:00
Bill Napier
d42aa3310e - Improve ScriptRunner command line parsing to actually pass more of the arguments. (And a unit test to go with it). 
- Set __name__ inside the scriptfile runner so python scripts expecting it get it.
- Propagate sys.exit error codes so monkeyrunner will actually return those error codes.
- Better handle PyExceptions thrown by the script to actually terminate monkeyrunner.
- Bubble up installPackage and removePackage error codes so callers can tell if they worked or not.

Change-Id: Ia4717b1ad2c9b4cccd607aba00211f2f85dfb412
 2010-05-25 14:42:32 -07:00
Bill Napier
d5b401d376 Merge "Add in python unit tests and fix up java unit tests." 2010-05-25 09:52:14 -07:00
Bill Napier
66cfd4bfe8 Add in python unit tests and fix up java unit tests. 
Change-Id: I3930946364d5ca8a5d18e4a2b36a7afa298ef2de
 2010-05-25 09:49:42 -07:00
Marco Nelissen
51d41d52a5 Add missing properties to make the simulator work again. 
Change-Id: I9c650360705960630198cb8006a3f83188ddd345
 2010-05-24 15:23:22 -07:00
Bill Napier
e5fe8b6833 Merge "Add in "plugin" support to allow users to add their own plugin's via JAR files and the -plugin command line argument. Also make sure that the arguments passed on the command line correctly get set in sys.argv." 2010-05-24 12:14:40 -07:00
Bill Napier
06a839ddbe Add in "plugin" support to allow users to add their own plugin's via JAR files and the -plugin command line argument. 
Also make sure that the arguments passed on the command line correctly get set in sys.argv.

Change-Id: I35014adc95ac9e5e5c777dc17749ee2b9b155c57
 2010-05-24 12:12:17 -07:00
Dirk Dougherty
fcb192adf3 am b2d652d1: am d43be56d: am 3c19d0e0: Doc change: increment androidappdocs version. 2010-05-24 10:28:24 -07:00
Dirk Dougherty
b2d652d1c0 am d43be56d: am 3c19d0e0: Doc change: increment androidappdocs version. 
Merge commit 'd43be56d40a813bedf96203c4b58056c6139eec0' into kraken

* commit 'd43be56d40a813bedf96203c4b58056c6139eec0':
  Doc change: increment androidappdocs version.
 2010-05-24 10:25:09 -07:00