Commit Graph

2606 Commits

Author SHA1 Message Date
Kenny Root
7f3f83e0e3 make_key: reduce raciness of password input
Bug: 14595245
Change-Id: I8a9e4f2c46aa3c85763975c5cb7a47df197f7746
2014-07-31 13:00:12 -07:00
Ying Wang
e7db94431e Switch to SDK_HOST_ARCH
SDK_HOST_ARCH will be x86 if we are doing 32-bit host multilib build,
in which HOST_ARCH is actually x86_64.

Bug: 13751317
Change-Id: I8b7893b10cc4d0e71076b3b3625ec2f352aa8602
2014-06-09 15:03:04 -07:00
Steve Moyer
e561dd4846 DO NOT MERGE: fix package for AndroidJUnitRunner
Change-Id: I6b3fb006212f273d018121800d1d94e8a8d7404d
2014-06-04 09:59:22 -07:00
Steve Moyer
23a8adf276 DO NOT MERGE: Add SmsTest and mege emulator smoke tests
Picked Changes:
Add SMS test to verify emulator can receive sms from DDMS
Adding test tag to sms test
Add up to 6 10 second delays to wait for sms
Merging emulator smoke test projects
Combining SmsTest, GpsLocationTests, and ConnectivityTest

Conflicts:
	build/sdk.atree

Change-Id: I1343c59418a69b2f5e1eb0c6cde54f2bc09300ac
2014-06-04 09:55:31 -07:00
Ben Cheng
18e10d81e3 am 4a09318c: Merge "Temporarily disable elftree on darwin-x86"
* commit '4a09318c1e6f2ffde53ac9219bb0e392228ef925':
  Temporarily disable elftree on darwin-x86
2013-11-22 17:22:11 -08:00
Ben Cheng
4a09318c1e Merge "Temporarily disable elftree on darwin-x86" 2013-11-23 01:15:49 +00:00
Ben Cheng
4a7c39c97b Temporarily disable elftree on darwin-x86
Change-Id: Ib4a73283ad18088de33da3c00278aae67c485fac
2013-11-22 17:02:53 -08:00
The Android Open Source Project
c61dbe23a4 Merge commit '8eccbd3b5d90b9f0557c9a01f49d45e98ac85a46' into HEAD 2013-11-22 16:46:47 -08:00
Kenny Root
c9421a7ac6 Merge "make_key: add EC key generation support" 2013-11-22 18:37:38 +00:00
Ben Cheng
75c68c9c53 Switch to use elfutils 0.153
Change-Id: Ie6ee5911949f6d32f39f1f8800ddf41550dedd95
2013-11-21 16:36:27 -08:00
Kenny Root
98356f64a8 make_key: add EC key generation support
Add the ability to create EC keys for use in creating ECDSA signatures.

Change-Id: Ia1654b69056413d66275ea6c55d8273f5f09f5c6
2013-11-06 09:25:28 -08:00
Siva Velusamy
a4d9ccb36a Disable proguard for emulator tests
Change-Id: I3aeb201d2c9f5e51933d2284845ce42d3b477ee2
2013-05-23 14:24:12 -07:00
Brian Carlstrom
45db470c4d am 4889f155: am ae5b0e56: Merge "Move jdwpspy from development to dalvik (1 of 2)"
* commit '4889f1558a7cc4d8dee552aeba6873c4a48bbd09':
  Move jdwpspy from development to dalvik (1 of 2)
2013-05-22 11:45:21 -07:00
Brian Carlstrom
4889f1558a am ae5b0e56: Merge "Move jdwpspy from development to dalvik (1 of 2)"
* commit 'ae5b0e56a8e4fb8e5764ff0e389afec92c01ecfe':
  Move jdwpspy from development to dalvik (1 of 2)
2013-05-22 11:27:44 -07:00
Brian Carlstrom
8817244622 Move jdwpspy from development to dalvik (1 of 2)
(cherry picked from commit ac172802b01a010559dfb251824d5a4ab828e32a)

Change-Id: I53a1db8db511170cde8cffe3d6b9aa9ac80a65a7
2013-05-21 21:01:33 -07:00
keunyoung
8aea29c6a6 am ce0385a4: Merge "move emulator HALs to device/generic/goldfish" into jb-mr2-dev
* commit 'ce0385a450b416e2b9d9ff1432d4c0bc9690125b':
  move emulator HALs to device/generic/goldfish
2013-03-11 21:52:39 +00:00
keunyoung
e39f0b3ea1 move emulator HALs to device/generic/goldfish
Change-Id: I1ff304d540c75c4d27c5fddeb7315e177d366fb3
2013-03-11 10:55:13 -07:00
Ying Wang
cbb4e77e51 am b74c3ef7: am f39c1088: am 7b9e308b: Merge ""debug" in those modules is discouraged"
* commit 'b74c3ef70bd124cabb9c0d57a95a05b4e2b30c43':
  "debug" in those modules is discouraged
2013-03-08 01:36:39 +00:00
Ying Wang
b74c3ef70b am f39c1088: am 7b9e308b: Merge ""debug" in those modules is discouraged"
* commit 'f39c1088f08e194a212f55a246bac85036f62a42':
  "debug" in those modules is discouraged
2013-03-07 17:32:46 -08:00
Chiao Cheng
6818901ea0 Add support for distribution folder.
Changed template directory to be dynamically looked up.

Change-Id: I89b96581e842574e1c7ad36e8633d3e787f488c2
2013-03-01 10:55:30 -08:00
Ying Wang
75ac6f2897 "debug" in those modules is discouraged
Because we need those modules for only emulator builds.
If you mark them as "debug", you'll get them even if you are doing a
real device userdebug/eng build.
Instead, we should add their module names to the emulator product config
in build/target/product/emulator.mk.

Bug: 8276818
Change-Id: I58988ce49804583b06e7d93380c44ba800448216
2013-03-01 09:49:44 -08:00
Chiao Cheng
d7a603c968 Allow bash scripts to work within a distributation folder.
- Fixed NullPointerException when module name not found.

Change-Id: I8f9b29f047ff90995d4cccc6b4b518bfbf026570
2013-02-28 15:25:05 -08:00
Jesse Hall
843ea83d9c Merge "Fix glShaderSource parameter constness" 2013-02-23 04:56:37 +00:00
Jesse Hall
a0579871af Fix glShaderSource parameter constness
Change-Id: I1008d779a9d333dc8968812d22e387b804e3c570
2013-02-15 14:19:35 -08:00
James Dong
b92e9cdd21 Make software vp8 video encoder available to MediaCodec on emulator
Change-Id: I7da75ea335c0b07df876de473545f170138c56b7
2013-02-13 10:13:20 -08:00
Mathias Agopian
6e263d5568 clean-up sensor emulation code.
don't blindly access the "status" field which is not used for all sensors.

Change-Id: I6ff80cf37b8feeccddfd843480db1861aabbedf1
2013-02-06 18:57:04 -08:00
Igor Murashkin
bbbc646d85 EmulatedCamera2: Fix metadata symbols: DO NOT MERGE
Change-Id: I9ccec2636d73684af9236d873a6bba0e15cd598a
2013-01-30 16:32:56 -08:00
Igor Murashkin
28ecf8da88 Revert "Camera2: Selectively re-define master metadata symbols: DO NOT MERGE": DO NOT MERGE
This reverts commit 52f92faa60.
2013-01-30 16:31:51 -08:00
Igor Murashkin
68ade37943 Camera2: Fix segfault when control fields were omitted in metadata: DO NOT MERGE
Change-Id: I36c3dcaaecd9bca495c1476841a0ae338019e7eb
2013-01-10 11:58:14 -08:00
Igor Murashkin
95f1b7e72e Camera2: Test: fix deadlock in isStreamInUse: DO NOT MERGE
Change-Id: I7574913a5e2b5d1bcdfede11d99a212ef01a8697
2013-01-10 11:58:14 -08:00
Igor Murashkin
50a86be055 Camera2: Return -ENODEV for camera indices out of bounds: DO NOT MERGE
This allows CameraModuleTest.LoadModuleBadIndices and
CameraModuleTest.GetCameraInfoBadIndices to pass.

Change-Id: I8db9d918e7773ccb1eece860b461aa0192782a3b
2013-01-10 11:58:14 -08:00
Igor Murashkin
0bddddb04d Camera2: Turn off 3A when android.control.mode == OFF: DO NOT MERGE
Change-Id: I37e2c005607548c47e34e7e09994894a69f9e955
2013-01-10 11:58:14 -08:00
Igor Murashkin
74d45ce6f3 Camera2: Fix a potential race condition in the readout thread: DO NOT MERGE
Change-Id: I12d960debb499795487582655243e951b15947d5
2013-01-10 11:58:14 -08:00
Igor Murashkin
04ff9ec118 Camera2: Fix a deadlock when closing the camera: DO NOT MERGE
Change-Id: I15dcf719aae4ed0dd3a46150ecba54ed6a7f31f5
2013-01-10 11:58:14 -08:00
Igor Murashkin
52f92faa60 Camera2: Selectively re-define master metadata symbols: DO NOT MERGE
Change-Id: I0d8637362f407dc2e2809d5800c9667f3c15260b
2013-01-10 11:58:06 -08:00
Igor Murashkin
2c0ee4a222 Camera2: Fix segfault when control fields were omitted in metadata
Change-Id: Ia13e7985211e44b5489624ac186e519925a40f26
2012-12-20 16:56:59 -08:00
Igor Murashkin
572a086038 Camera2: Test: fix deadlock in isStreamInUse
Change-Id: I2ac46303e96c3ccaaa0f76555b89bbeed45a3919
2012-12-20 16:56:34 -08:00
Igor Murashkin
09167dc112 Camera2: Return -ENODEV for camera indices out of bounds
This allows CameraModuleTest.LoadModuleBadIndices and
CameraModuleTest.GetCameraInfoBadIndices to pass.

Change-Id: Iffc658b256642ea0684fd8ad864fd273829bb35d
2012-12-20 16:56:20 -08:00
Igor Murashkin
871e2f54ab Merge "Camera2: Turn off 3A when android.control.mode == OFF" 2012-12-18 14:25:50 -08:00
Igor Murashkin
37f8f607c1 Merge "Revert "Camera2: Fix a potential race condition in the readout thread"" 2012-12-18 14:22:25 -08:00
Igor Murashkin
6d305d0183 Camera2: Turn off 3A when android.control.mode == OFF
Change-Id: Ie6a8726e14529a8605b9ecae6adfa705e79df00a
2012-12-14 14:17:36 -08:00
Igor Murashkin
c4464b7fee Revert "Camera2: Fix a potential race condition in the readout thread"
The last fix incorrectly added a mutex lock which did not guard the appropriate
variables.

In fact it actually *introduced* a new race condition in a HAL test.

This reverts commit 6edd7ab4a4.
2012-12-14 14:17:36 -08:00
Igor Murashkin
f1b72a3757 Merge "Camera2: Fix a potential race condition in the readout thread" 2012-12-12 12:47:58 -08:00
Igor Murashkin
52f7c8d4c6 Merge "Camera2: Fix a deadlock when closing the camera" 2012-12-12 12:47:47 -08:00
Igor Murashkin
6edd7ab4a4 Camera2: Fix a potential race condition in the readout thread
Change-Id: Ie4475c8433eaad7545430f7e01e222d074180e0e
2012-12-07 12:34:20 -08:00
Igor Murashkin
0825f8b65b Camera2: Fix a deadlock when closing the camera
Change-Id: I8b6be364ca90b0eed62ae03c1548680c0b2f0e64
2012-12-07 12:32:00 -08:00
Igor Murashkin
53db6a1a21 Merge "EmulatedCamera2: Fix metadata symbols" 2012-12-04 17:26:39 -08:00
Igor Murashkin
328bdf979a EmulatedCamera2: Fix metadata symbols
Change-Id: I9ccec2636d73684af9236d873a6bba0e15cd598a
2012-11-30 14:13:09 -08:00
Marco Nelissen
6cebef011f Add gsm decoder to media codec list
b/6620569

Change-Id: I9c41bd34e931bb59405146931dfc12a00a423ef5
2012-11-16 07:42:30 -08:00
Laurent Tu
71bf084189 am f7e5b78d: am 72452858: am 91d9d51f: Return accuracy in GPS emulation
* commit 'f7e5b78d88577fb7a0e6189a2190eb24dc69b8ea':
  Return accuracy in GPS emulation
2012-10-12 11:14:16 -07:00