Dianne Hackborn
0960eb4b1d
am e66430c1: am 2e21a7d5: am 2f388d7a: Merge "Correcting 2 FC\'s in Dev Tools"
...
# By HardCorePawn
# Via Android Git Automerger (2) and others
* commit 'e66430c1d9cc0f0cb3cd3771459b0e3b5bc9d912':
Correcting 2 FC's in Dev Tools
2013-01-25 17:11:40 -08:00
Dianne Hackborn
e66430c1d9
am 2e21a7d5: am 2f388d7a: Merge "Correcting 2 FC\'s in Dev Tools"
...
# By HardCorePawn
# Via Android Git Automerger (1) and others
* commit '2e21a7d5fcb3201c5da1e281063751810fcb01f4':
Correcting 2 FC's in Dev Tools
2013-01-24 17:09:18 -08:00
Dianne Hackborn
2e21a7d5fc
am 2f388d7a: Merge "Correcting 2 FC\'s in Dev Tools"
...
# By HardCorePawn
# Via Gerrit Code Review (1) and HardCorePawn (1)
* commit '2f388d7a399b9744e5212984a4c383d83eddfd7f':
Correcting 2 FC's in Dev Tools
2013-01-24 17:07:51 -08:00
Dianne Hackborn
2f388d7a39
Merge "Correcting 2 FC's in Dev Tools"
2013-01-25 01:03:44 +00:00
Winson Chung
ce966749a5
Merge "Updating WeatherListWidget to the new collections widget api."
2013-01-24 00:29:44 +00:00
HardCorePawn
fdc98b7091
Correcting 2 FC's in Dev Tools
...
Added in missing permission required by SyncTester
Commented non-existant Google Login Service
2013-01-24 00:49:08 +01:00
Svetoslav Ganov
00fc93c6fe
Refactoring due to removing some private APIs.
...
Change-Id: Id00d9fa974d8cb747cebb99c5a64ed5b438b56e9
2013-01-23 00:20:07 +00:00
Sergey Melnikov
e3b1ac14bd
stdint.h header is not fully compatible with C99(ISO9899:1999)
...
1. stdint.h doesn't provide macros:
* SIG_ATOMIC_MIN
* SIG_ATOMIC_MAX
* WCHAR_MIN
* WCHAR_MAX
* WINT_MIN
* WINT_MAX
2. stdint.h provides macros with incorrect type:
* UINT8_C
* UINT16_C
* UINT8_MAX
* UINT16_MAX
Change-Id: I3f4da907eaee8f46d8eb956950230ca2eb04a3ea
Signed-off-by: Sergey Melnikov <sergey.melnikov@intel.com >
2013-01-17 09:58:16 +04:00
Raphael Moll
7531ada080
am 288e1996: am b78b8ccd: am 7f340728: Merge "Fix SDK build: use repository XML schemas from new prebuilts."
...
* commit '288e1996175b76e2ffa163836bfb6f4e595fdf75':
Fix SDK build: use repository XML schemas from new prebuilts.
2013-01-16 16:41:57 -08:00
The Android Automerger
f08d11a90f
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2013-01-16 16:41:24 -08:00
Raphael Moll
288e199617
am b78b8ccd: am 7f340728: Merge "Fix SDK build: use repository XML schemas from new prebuilts."
...
* commit 'b78b8ccd2757d6456520b578e7e0d7074a9598a7':
Fix SDK build: use repository XML schemas from new prebuilts.
2013-01-16 16:39:24 -08:00
Raphael Moll
b78b8ccd27
am 7f340728: Merge "Fix SDK build: use repository XML schemas from new prebuilts."
...
* commit '7f340728d339f047c5149940f0da90eedbdfcb4e':
Fix SDK build: use repository XML schemas from new prebuilts.
2013-01-16 16:36:33 -08:00
Raphael Moll
7f340728d3
Merge "Fix SDK build: use repository XML schemas from new prebuilts."
2013-01-17 00:17:44 +00:00
Raphael Moll
e26f9f9755
Fix SDK build: use repository XML schemas from new prebuilts.
...
Change-Id: I32799751cb19db2f99b45c26b7e308b1e11af161
2013-01-16 16:03:31 -08:00
Winson Chung
b28878a5b8
Updating WeatherListWidget to the new collections widget api.
...
Change-Id: I29a56e54ebcac0b951114efdf01f98afd1adb758
2013-01-16 14:10:17 -08:00
Chet Haase
18d1a08364
am 71459f1f: am fb198383: am 8c013aee: am 690af128: Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e
...
* commit '71459f1fe0369cfc065171c50e5df03ffa99ca95':
Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e
2013-01-15 11:09:09 -08:00
Chet Haase
71459f1fe0
am fb198383: am 8c013aee: am 690af128: Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e
...
* commit 'fb198383cc3c786ed303e49e29c8d0b86f38be73':
Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e
2013-01-15 11:05:58 -08:00
Chet Haase
fb198383cc
am 8c013aee: am 690af128: Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e
...
* commit '8c013aeeecaecb2a0a1038433d0d7a603a57ac30':
Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e
2013-01-15 11:03:42 -08:00
Chet Haase
8c013aeeec
am 690af128: Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e
...
* commit '690af1285c320a1d3fc31cc57414347c74bd8e1d':
Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e
2013-01-15 11:01:26 -08:00
Chet Haase
690af1285c
Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e
...
First set of demo apps for DevBytes videos
Change-Id: I696b184aaa8058f01c0369a173aae09e38a8cb08
2013-01-15 10:36:26 -08:00
Chet Haase
5e6a1236f4
Merge "First set of demo apps for DevBytes videos"
2013-01-14 15:25:14 -08:00
Chet Haase
74497f3336
First set of demo apps for DevBytes videos
...
Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e
2013-01-14 15:21:15 -08:00
Andy Stadler
42044df65b
Merge "Update eclipse .classpath for current master config"
2013-01-14 10:52:02 -08:00
Andy Stadler
8af005c81c
Update eclipse .classpath for current master config
...
* Email (back to old-school config until Email2 returns)
* SystemUI_intermediates
* mp4parser
Change-Id: I62f0b153b24368365202400515a4612e1b5ef22c
2013-01-14 10:28:32 -08:00
Adam Koch
1724b187c7
am fe85cdde: am 79f346a7: am ec5a8473: am b8a61acb: Bitmapfun Sample: Change cache memory calculation to use maxMemory()
...
* commit 'fe85cdde2864129d69bc2c5621143620a0c34e62':
Bitmapfun Sample: Change cache memory calculation to use maxMemory()
2013-01-14 09:31:23 -08:00
Adam Koch
fe85cdde28
am 79f346a7: am ec5a8473: am b8a61acb: Bitmapfun Sample: Change cache memory calculation to use maxMemory()
...
* commit '79f346a78e35079cf390b7328cce1fbcaa0ce845':
Bitmapfun Sample: Change cache memory calculation to use maxMemory()
2013-01-14 09:28:10 -08:00
Derek Sollenberger
f7aa76bb3c
Merge "Remove unsupported BrowserPlugin."
2013-01-14 07:57:29 -08:00
Adam Koch
79f346a78e
am ec5a8473: am b8a61acb: Bitmapfun Sample: Change cache memory calculation to use maxMemory()
...
* commit 'ec5a8473253c4458b996cbfba6ed8b0bbb82ef5f':
Bitmapfun Sample: Change cache memory calculation to use maxMemory()
2013-01-14 06:18:06 -08:00
Adam Koch
ec5a847325
am b8a61acb: Bitmapfun Sample: Change cache memory calculation to use maxMemory()
...
* commit 'b8a61acb072e03665b2c53c7fd049b5bbf5ed1d4':
Bitmapfun Sample: Change cache memory calculation to use maxMemory()
2013-01-14 06:15:15 -08:00
Adam Koch
b8a61acb07
Bitmapfun Sample: Change cache memory calculation to use maxMemory()
...
When calculating memory cache size, use Runtime.maxMemory() instead
of getMemoryClass() which is a more accurate value of available VM
heap size.
Also bump target and build SDK to 17.
Bug: 7988323
Change-Id: I4b94688b3800d958ffbe03ee9a2a620982483d3d
2013-01-11 16:51:09 -05:00
Igor Murashkin
acbf9e7e14
am caf8379a: am ba48d6f0: Merge changes I36c3dcaa,I7574913a,I8db9d918,I37e2c005 into jb-mr1-aah-dev
...
* commit 'caf8379a8d64d69cc9756cee5c3ab310e1ab258d':
Camera2: Fix segfault when control fields were omitted in metadata: DO NOT MERGE
Camera2: Test: fix deadlock in isStreamInUse: DO NOT MERGE
Camera2: Return -ENODEV for camera indices out of bounds: DO NOT MERGE
Camera2: Turn off 3A when android.control.mode == OFF: DO NOT MERGE
2013-01-11 10:54:00 -08:00
Igor Murashkin
b4b8879da3
am 8b622fe3: (-s ours) am 10665f4b: Merge "Camera2: Fix a potential race condition in the readout thread: DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '8b622fe360e4c635fae9f8ecd8b2d88ef015af93':
Camera2: Fix a potential race condition in the readout thread: DO NOT MERGE
2013-01-11 10:53:59 -08:00
Igor Murashkin
8f94ee48e2
am ae6c881b: (-s ours) am 778dd967: Merge "Camera2: Fix a deadlock when closing the camera: DO NOT MERGE" into jb-mr1-aah-dev
...
* commit 'ae6c881bc5051b9422f3f8d9b80232ea56014166':
Camera2: Fix a deadlock when closing the camera: DO NOT MERGE
2013-01-11 10:53:58 -08:00
Igor Murashkin
6fc43dfabc
am 6917606e: (-s ours) am 6daf70b2: Merge "Camera2: Selectively re-define master metadata symbols: DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '6917606e04091035bc963e1b88665f6b83b9970d':
Camera2: Selectively re-define master metadata symbols: DO NOT MERGE
2013-01-11 10:53:56 -08:00
Adam Koch
48820d230d
am 15493fd9: am 784be44a: am a1d11945: am 6acfaccc: Bitmapfun Sample: Fix inSampleSize selection and update dependencies
...
* commit '15493fd9c382bad416c434fe048c87fe2a2fe589':
Bitmapfun Sample: Fix inSampleSize selection and update dependencies
2013-01-11 10:53:25 -08:00
Andrew Hsieh
a9daeb07be
am d75ec23e: am 02faddde: am 14b0ab7a: Merge "Sync stddef.h"
...
* commit 'd75ec23e4677e87e66a101e6de0bfd34cd9129bb':
Sync stddef.h
2013-01-10 15:38:32 -08:00
Andrew Hsieh
46d35992f9
am 80fc9e53: am 888c33e7: am 7d6e4794: Merge "Sync MIPS fenv.h"
...
* commit '80fc9e5325392f64bb0dab6450538437bfd94960':
Sync MIPS fenv.h
2013-01-10 15:38:20 -08:00
Andrew Hsieh
cd4f6b5f8c
am bc8fa78f: am e9fac40c: am aa7d994e: Merge "Fix san-sangeles warnings with clang 3.1"
...
* commit 'bc8fa78f0348af77c32b2cdc8dbfd84838195163':
Fix san-sangeles warnings with clang 3.1
2013-01-10 15:38:19 -08:00
Igor Murashkin
caf8379a8d
am ba48d6f0: Merge changes I36c3dcaa,I7574913a,I8db9d918,I37e2c005 into jb-mr1-aah-dev
...
* commit 'ba48d6f00c9a13ba00022949c87215ecf4b829aa':
Camera2: Fix segfault when control fields were omitted in metadata: DO NOT MERGE
Camera2: Test: fix deadlock in isStreamInUse: DO NOT MERGE
Camera2: Return -ENODEV for camera indices out of bounds: DO NOT MERGE
Camera2: Turn off 3A when android.control.mode == OFF: DO NOT MERGE
2013-01-10 13:35:36 -08:00
Igor Murashkin
8b622fe360
am 10665f4b: Merge "Camera2: Fix a potential race condition in the readout thread: DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '10665f4b0c5dc94ce7cceaa1fd60a8c29b384114':
Camera2: Fix a potential race condition in the readout thread: DO NOT MERGE
2013-01-10 13:35:35 -08:00
Igor Murashkin
ae6c881bc5
am 778dd967: Merge "Camera2: Fix a deadlock when closing the camera: DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '778dd967ade8c37b4b4fc6afdd6b5f2a2a2d6875':
Camera2: Fix a deadlock when closing the camera: DO NOT MERGE
2013-01-10 13:35:34 -08:00
Igor Murashkin
6917606e04
am 6daf70b2: Merge "Camera2: Selectively re-define master metadata symbols: DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '6daf70b26bfddf9ad079b925c0d586b789e3c207':
Camera2: Selectively re-define master metadata symbols: DO NOT MERGE
2013-01-10 13:35:32 -08:00
Igor Murashkin
ba48d6f00c
Merge changes I36c3dcaa,I7574913a,I8db9d918,I37e2c005 into jb-mr1-aah-dev
...
* changes:
Camera2: Fix segfault when control fields were omitted in metadata: DO NOT MERGE
Camera2: Test: fix deadlock in isStreamInUse: DO NOT MERGE
Camera2: Return -ENODEV for camera indices out of bounds: DO NOT MERGE
Camera2: Turn off 3A when android.control.mode == OFF: DO NOT MERGE
2013-01-10 13:34:31 -08:00
Igor Murashkin
10665f4b0c
Merge "Camera2: Fix a potential race condition in the readout thread: DO NOT MERGE" into jb-mr1-aah-dev
2013-01-10 13:34:27 -08:00
Igor Murashkin
778dd967ad
Merge "Camera2: Fix a deadlock when closing the camera: DO NOT MERGE" into jb-mr1-aah-dev
2013-01-10 13:34:20 -08:00
Igor Murashkin
6daf70b26b
Merge "Camera2: Selectively re-define master metadata symbols: DO NOT MERGE" into jb-mr1-aah-dev
2013-01-10 13:34:12 -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
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
95f1b7e72e
Camera2: Test: fix deadlock in isStreamInUse: DO NOT MERGE
...
Change-Id: I7574913a5e2b5d1bcdfede11d99a212ef01a8697
2013-01-10 11:58:14 -08:00