Commit Graph

3708 Commits

Author SHA1 Message Date
James Yum
fc75835c87 am a3c89d73: am b8168f27: Merge "Market licensing server library core." into eclair
Merge commit 'a3c89d73bda785739b3396993c2491768bee2c23'

* commit 'a3c89d73bda785739b3396993c2491768bee2c23':
  Market licensing server library core.
2010-01-28 15:31:04 -08:00
Brett Chabot
3c6ddf1a93 am d392646b: am e848f6b2: Merge "Fix cts-content testdef." into eclair
Merge commit 'd392646bfb9e52b1ec390ba1683cfdf1cc396c71'

* commit 'd392646bfb9e52b1ec390ba1683cfdf1cc396c71':
  Fix cts-content testdef.
2010-01-28 15:31:00 -08:00
Romain Guy
4e0ee8e739 am 9c5363b0: am 897af093: Add uses-feature for live wallpaper sample.
Merge commit '9c5363b081dcbe1da924a274d7a57e20f85d1b60'

* commit '9c5363b081dcbe1da924a274d7a57e20f85d1b60':
  Add uses-feature for live wallpaper sample.
2010-01-28 15:30:56 -08:00
Raphael
4ee229cd81 am cb399d52: am d51d36fa: Windows SDK: package new tools/find_java.bat
Merge commit 'cb399d52cfae83bc4bbc4672b8728144b932c14a'

* commit 'cb399d52cfae83bc4bbc4672b8728144b932c14a':
  Windows SDK: package new tools/find_java.bat
2010-01-28 15:09:59 -08:00
Dan Bornstein
859783687d We are living in the future.
Change-Id: I3f6e29063fe87407ace3fb2731521a5d290d1e75
2010-01-28 13:51:07 -08:00
Dianne Hackborn
c518e3ac44 Update to follow device policy API changes. 2010-01-28 13:16:10 -08:00
Dirk Dougherty
26d1fb0c8d am 07b5c3bd: am c220077d: Merge "SDK doc change: Misc fixes." into eclair
Merge commit '07b5c3bdb76e7f4b4ceefb48e5cf11ed789bb0c2'

* commit '07b5c3bdb76e7f4b4ceefb48e5cf11ed789bb0c2':
  SDK doc change: Misc fixes.
2010-01-28 12:37:28 -08:00
James Yum
a3c89d73bd am b8168f27: Merge "Market licensing server library core." into eclair
Merge commit 'b8168f27f6f5b6b0ced5ef3210c0e89e8d3a5ae2' into eclair-plus-aosp

* commit 'b8168f27f6f5b6b0ced5ef3210c0e89e8d3a5ae2':
  Market licensing server library core.
2010-01-28 10:51:19 -08:00
Brett Chabot
d392646bfb am e848f6b2: Merge "Fix cts-content testdef." into eclair
Merge commit 'e848f6b2c72fd07a1ff58cd090c22b3ff5b935f9' into eclair-plus-aosp

* commit 'e848f6b2c72fd07a1ff58cd090c22b3ff5b935f9':
  Fix cts-content testdef.
2010-01-28 10:51:15 -08:00
James Yum
b8168f27f6 Merge "Market licensing server library core." into eclair 2010-01-28 10:36:53 -08:00
Xavier Ducrohet
27da22eeb7 am a7945e3b: am a6181df4: Add Dell Mini5 to the USB driver.
Merge commit 'a7945e3b9c7bfceaa6c6dde1fdd1a7916df339e7'

* commit 'a7945e3b9c7bfceaa6c6dde1fdd1a7916df339e7':
  Add Dell Mini5 to the USB driver.
2010-01-28 10:09:21 -08:00
James Yum
f32f3b5e7b Market licensing server library core.
new file:   ILicenseResultListener.aidl
	new file:   ILicensingService.aidl
	new file:   LicenseChecker.java
	new file:   LicenseCheckerCallback.java
	new file:   Policy.java
	new file:   ResponseData.java
	new file:   StrictPolicy.java

	new file:   LicenseValidator.java
2010-01-27 18:51:48 -08:00
Brett Chabot
e848f6b2c7 Merge "Fix cts-content testdef." into eclair 2010-01-27 17:54:29 -08:00
Dan Egnor
450a135ee3 Merge "Add a native crash facility to Bad Behavior." 2010-01-27 17:53:45 -08:00
Brett Chabot
4d1a3b839c Fix cts-content testdef.
Change-Id: I02c98f57c0fbf7cd7fbcdf3e7ba642e0d66acf93
2010-01-27 17:17:16 -08:00
Romain Guy
9c5363b081 am 897af093: Add uses-feature for live wallpaper sample.
Merge commit '897af09372ca7c95db6c12554d9ff6fcec81ad58' into eclair-plus-aosp

* commit '897af09372ca7c95db6c12554d9ff6fcec81ad58':
  Add uses-feature for live wallpaper sample.
2010-01-27 17:04:23 -08:00
Romain Guy
897af09372 Add uses-feature for live wallpaper sample.
Change-Id: I766d72ea79e8ef9530b2c485376a3429b530a00f
2010-01-27 16:55:38 -08:00
Dan Egnor
4903dae035 Add a native crash facility to Bad Behavior. 2010-01-27 15:10:58 -08:00
Neal Nguyen
af94291727 Modifications to test_defs.xml for FrameworksTests files move. 2010-01-27 14:15:08 -08:00
Neal Nguyen
f935944a18 Merge "Modifications to test_defs.xml for CoreTests files move." 2010-01-27 14:03:28 -08:00
Neal Nguyen
adce566254 Modifications to test_defs.xml for CoreTests files move. 2010-01-27 13:00:02 -08:00
Dianne Hackborn
d51a50c766 More device admin work:
- Example warning message when disabling.
- UI to set maximum failed password attempts.
2010-01-26 18:04:54 -08:00
Raphael
cb399d52cf am d51d36fa: Windows SDK: package new tools/find_java.bat
Merge commit 'd51d36fa5444ef5f28dbbe5903949e1a75bb2510' into eclair-plus-aosp

* commit 'd51d36fa5444ef5f28dbbe5903949e1a75bb2510':
  Windows SDK: package new tools/find_java.bat
2010-01-26 16:28:13 -08:00
Raphael
d51d36fa54 Windows SDK: package new tools/find_java.bat
SDK Bug: 2315813

Change-Id: Ice0eb6327b153fcaab42477cd4d3aa8ee12e0063
2010-01-26 16:14:55 -08:00
Dianne Hackborn
2086587ba4 Update sample admin with a description to uses-policies info. 2010-01-26 12:28:25 -08:00
Daniel Sandler
8a5619a48e Merge "Widget to show build version at a glance." 2010-01-26 12:08:19 -08:00
Daniel Sandler
8b1f07b2f9 Widget to show build version at a glance.
Extremely useful when working with different builds on
several otherwise-identical devices.
2010-01-26 09:56:13 -05:00
Brett Chabot
28d560e217 Merge "Update test and code coverage definitions for obsolete/changed packages." 2010-01-25 13:24:43 -08:00
Brett Chabot
1ca9316bef Update test and code coverage definitions for obsolete/changed packages. 2010-01-25 12:02:10 -08:00
Brett Chabot
7a6bbae17b Merge "Make runtest more fault tolerant on test run failures." 2010-01-25 11:59:52 -08:00
Brett Chabot
32f9cad0b8 Merge "Add support for generating coverage per test suite size to runtest." 2010-01-25 11:59:37 -08:00
Dirk Dougherty
07b5c3bdb7 am c220077d: Merge "SDK doc change: Misc fixes." into eclair
Merge commit 'c220077d52972356ff30d46d47def7669731f0d7' into eclair-plus-aosp

* commit 'c220077d52972356ff30d46d47def7669731f0d7':
  SDK doc change: Misc fixes.
2010-01-22 16:49:51 -08:00
Dirk Dougherty
c220077d52 Merge "SDK doc change: Misc fixes." into eclair 2010-01-22 16:45:03 -08:00
Dirk Dougherty
e096b94573 SDK doc change: Misc fixes.
Bug: 2160782
Change-Id: I44d1d9687df45dae40a6922a37e6b410cc2de835
2010-01-22 15:18:15 -08:00
Dan Egnor
2b90588301 Merge "Fix a bug where tapping on a bugreport mailed the wrong one, and don't crash if /sdcard/bugreports doesn't exist." 2010-01-22 14:50:31 -08:00
Xavier Ducrohet
29b6f9a077 Merge "Move SDK files to froyo." 2010-01-22 14:50:19 -08:00
Xavier Ducrohet
5f063195d6 Move SDK files to froyo.
Change-Id: I55a5cb149982f1f30dc513ff018d8630d6513592
2010-01-22 14:46:05 -08:00
Dan Egnor
5e0a92809b Fix a bug where tapping on a bugreport mailed the wrong one,
and don't crash if /sdcard/bugreports doesn't exist.
2010-01-22 14:40:03 -08:00
Brett Chabot
8424ffc02c Add support for generating coverage per test suite size to runtest. 2010-01-22 11:58:58 -08:00
Xavier Ducrohet
a7945e3b9c am a6181df4: Add Dell Mini5 to the USB driver.
Merge commit 'a6181df43110ce1bea8a856295ce372ab06a7873' into eclair-plus-aosp

* commit 'a6181df43110ce1bea8a856295ce372ab06a7873':
  Add Dell Mini5 to the USB driver.
2010-01-22 10:52:03 -08:00
Dan Egnor
dbe3611ddf Merge "Bug report uploader utility." 2010-01-21 17:57:25 -08:00
Xavier Ducrohet
a6181df431 Add Dell Mini5 to the USB driver.
Change-Id: If0758e6dc43541fd2877e7d00ff3abf9d354a299
2010-01-21 17:36:19 -08:00
Brett Chabot
920e9fefab Make runtest more fault tolerant on test run failures.
Adjust so when running multiple suites, the whole run is not aborted on a
single suite failure.
2010-01-21 17:33:05 -08:00
Dan Egnor
7b37864ce4 Bug report uploader utility.
This version is very bare-bones -- it just makes a list of filenames,
you tap on one and it makes a gmail (or whatever) message with the
file attached to it (and a default subject/body).  But it's a start,
and I think much better than nothing.
2010-01-21 17:20:31 -08:00
Doug Zongker
f29d67780a Merge "relocate GoogleLoginService" 2010-01-21 16:10:55 -08:00
Eric Rowe
ad5028e538 am 14dbea61: (-s ours) am d98ba32e: DO NOT MERGE Fix bug where monkey always tries to run multiple scripts.
Merge commit '14dbea614b9728b4dbdcf5fad2831b79fc65233e'

* commit '14dbea614b9728b4dbdcf5fad2831b79fc65233e':
  DO NOT MERGE Fix bug where monkey always tries to run multiple scripts.
2010-01-21 14:54:52 -08:00
Eric Rowe
98c1ed48a4 am 329f4007: (-s ours) am 7d961f86: DO NOT MERGE Create way to run monkey with multiple scripts.
Merge commit '329f40076426033ca998a7ef7b98bfd6dc51ed2e'

* commit '329f40076426033ca998a7ef7b98bfd6dc51ed2e':
  DO NOT MERGE Create way to run monkey with multiple scripts.
2010-01-21 14:54:48 -08:00
Doug Zongker
2fe229a6d9 relocate GoogleLoginService
Change-Id: Ic634e64593c850efe0b81811a60cee4b34257bc8
2010-01-21 14:36:08 -08:00
Dianne Hackborn
cc4ee91892 Start implementing UI for changing requested policies. 2010-01-21 14:30:29 -08:00
Derek Sollenberger
4fe6d38a68 Removing unused parameter from NP_Initialize. 2010-01-21 15:04:58 -05:00