OSDN Git Service
Dianne Hackborn [Wed, 17 Jun 2015 20:01:10 +0000 (20:01 +0000)]
am
d1419ed2: Merge "Bring back screenshot API." into mnc-dev
* commit '
d1419ed29a694dffc98e9f352f952b805c6e0583':
Bring back screenshot API.
Dianne Hackborn [Wed, 17 Jun 2015 19:47:09 +0000 (19:47 +0000)]
Merge "Bring back screenshot API." into mnc-dev
Andy Hung [Wed, 17 Jun 2015 19:27:21 +0000 (19:27 +0000)]
am
90b3b93d: Merge "AudioTrack.Builder should throw exception on failure." into mnc-dev
* commit '
90b3b93de460ccd1fc1116154f5d61bd2bc93d25':
AudioTrack.Builder should throw exception on failure.
Andy Hung [Wed, 17 Jun 2015 19:27:17 +0000 (19:27 +0000)]
am
a56eadb2: Merge "AudioRecord.Builder should throw exception on failure." into mnc-dev
* commit '
a56eadb2737288091dc111a886ae83ae066317fa':
AudioRecord.Builder should throw exception on failure.
Andy Hung [Wed, 17 Jun 2015 19:21:50 +0000 (19:21 +0000)]
Merge "AudioTrack.Builder should throw exception on failure." into mnc-dev
Andy Hung [Wed, 17 Jun 2015 19:18:15 +0000 (19:18 +0000)]
Merge "AudioRecord.Builder should throw exception on failure." into mnc-dev
Alex Klyubin [Wed, 17 Jun 2015 18:44:04 +0000 (18:44 +0000)]
am
97f4d3b4: Merge "Prefer GCM to CBC or CTR in documentation." into mnc-dev
* commit '
97f4d3b40754e4496caeb29ee54c330d8bc9f2d7':
Prefer GCM to CBC or CTR in documentation.
Eino-Ville Talvala [Wed, 17 Jun 2015 18:44:00 +0000 (18:44 +0000)]
am
b7bbd629: Merge "Camera2: Do not throw unexpected runtime exception to app" into mnc-dev
* commit '
b7bbd629eb0370f36ce27cbc9ecfc7e5c9d8953f':
Camera2: Do not throw unexpected runtime exception to app
Alex Klyubin [Wed, 17 Jun 2015 18:33:41 +0000 (18:33 +0000)]
am
211cb7cb: Merge "Improve documentation for keys requiring user auth." into mnc-dev
* commit '
211cb7cb98d654def3a418e81ab0c939c7ff70ba':
Improve documentation for keys requiring user auth.
Selim Cinek [Wed, 17 Jun 2015 18:33:37 +0000 (18:33 +0000)]
am
6857ffc9: Merge "Fixed a jump with the panel scrim" into mnc-dev
* commit '
6857ffc940bc204269de4ae2a1937794f254286a':
Fixed a jump with the panel scrim
Alex Klyubin [Wed, 17 Jun 2015 18:32:22 +0000 (18:32 +0000)]
Merge "Prefer GCM to CBC or CTR in documentation." into mnc-dev
Eino-Ville Talvala [Wed, 17 Jun 2015 18:31:43 +0000 (18:31 +0000)]
Merge "Camera2: Do not throw unexpected runtime exception to app" into mnc-dev
Alex Klyubin [Wed, 17 Jun 2015 18:28:19 +0000 (18:28 +0000)]
Merge "Improve documentation for keys requiring user auth." into mnc-dev
Alex Klyubin [Wed, 17 Jun 2015 18:24:45 +0000 (11:24 -0700)]
Prefer GCM to CBC or CTR in documentation.
Bug:
21786749
Change-Id: If3824d1321ef1d8730d4384717b0c25d43518fe4
Jason Monk [Wed, 17 Jun 2015 18:24:02 +0000 (18:24 +0000)]
am
f5820276: Merge "Don\'t reinflate signal icons unless we really need to." into mnc-dev
* commit '
f5820276635a2d3d2e3c694eddba7e6a02093a20':
Don't reinflate signal icons unless we really need to.
Junda Liu [Wed, 17 Jun 2015 18:23:58 +0000 (18:23 +0000)]
am
a5aabfeb: Merge "Add carrier config variable to hide sim lock setting ui." into mnc-dev
* commit '
a5aabfebcaad34b9fdea222d858fc54d18e462c0':
Add carrier config variable to hide sim lock setting ui.
Selim Cinek [Wed, 17 Jun 2015 18:23:06 +0000 (18:23 +0000)]
Merge "Fixed a jump with the panel scrim" into mnc-dev
Eino-Ville Talvala [Wed, 17 Jun 2015 18:18:43 +0000 (11:18 -0700)]
Camera2: Do not throw unexpected runtime exception to app
Use a generic CameraAccessException DEVICE_ERROR exception instead
Bug:
21869917
Change-Id: I73581b817cbdcbb4b876c234f050f725a459a29b
Jason Monk [Wed, 17 Jun 2015 18:17:17 +0000 (18:17 +0000)]
Merge "Don't reinflate signal icons unless we really need to." into mnc-dev
Junda Liu [Wed, 17 Jun 2015 18:11:01 +0000 (18:11 +0000)]
Merge "Add carrier config variable to hide sim lock setting ui." into mnc-dev
Alex Klyubin [Tue, 16 Jun 2015 17:44:11 +0000 (10:44 -0700)]
Improve documentation for keys requiring user auth.
Bug:
18088752
Change-Id: I24eeb33790a74d8d81d10fcdb1eb058d47144c44
Chien-Yu Chen [Wed, 17 Jun 2015 18:05:22 +0000 (18:05 +0000)]
am
563d60e0: Merge "Camera2: Handle getting input surface failures" into mnc-dev
* commit '
563d60e03f8d5961e5578fca66092bd6b8d5496e':
Camera2: Handle getting input surface failures
Zhijun He [Wed, 17 Jun 2015 18:05:17 +0000 (18:05 +0000)]
am
0f70c415: Merge "Camera2: fix high speed request builder creation issue" into mnc-dev
* commit '
0f70c415519f0a89f8ba765f9046802a2223f790':
Camera2: fix high speed request builder creation issue
Alex Klyubin [Wed, 17 Jun 2015 18:05:13 +0000 (18:05 +0000)]
am
4250c8d6: Merge "Expose AES GCM backed by Android Keystore." into mnc-dev
* commit '
4250c8d6435cca2c14839f7adec0a43773d01e3b':
Expose AES GCM backed by Android Keystore.
Yigit Boyar [Wed, 17 Jun 2015 18:05:08 +0000 (18:05 +0000)]
am
5ddaa72b: Merge "Handle negative view types properly in getScrapView" into mnc-dev
* commit '
5ddaa72b9a60dda43c9e199f85990c01b0bf702c':
Handle negative view types properly in getScrapView
Alex Klyubin [Wed, 17 Jun 2015 18:05:04 +0000 (18:05 +0000)]
am
2723d49a: Merge "Drop support for P-192 EC keys." into mnc-dev
* commit '
2723d49a188c4db935b9e5eea152b567051768f8':
Drop support for P-192 EC keys.
Paul McLean [Wed, 17 Jun 2015 18:05:00 +0000 (18:05 +0000)]
am
d4bd4e7f: Merge "Map >= 24bit encodings to ENCODING_PCM_FLOAT" into mnc-dev
* commit '
d4bd4e7ffc19c14eb169a39e8cb20fc46d2551f4':
Map >= 24bit encodings to ENCODING_PCM_FLOAT
Chien-Yu Chen [Wed, 17 Jun 2015 18:02:27 +0000 (18:02 +0000)]
Merge "Camera2: Handle getting input surface failures" into mnc-dev
Zhijun He [Wed, 17 Jun 2015 18:00:05 +0000 (18:00 +0000)]
Merge "Camera2: fix high speed request builder creation issue" into mnc-dev
Alex Klyubin [Wed, 17 Jun 2015 17:58:33 +0000 (17:58 +0000)]
Merge "Expose AES GCM backed by Android Keystore." into mnc-dev
Yigit Boyar [Wed, 17 Jun 2015 17:58:24 +0000 (17:58 +0000)]
Merge "Handle negative view types properly in getScrapView" into mnc-dev
Junda Liu [Wed, 17 Jun 2015 16:55:57 +0000 (09:55 -0700)]
Add carrier config variable to hide sim lock setting ui.
Bug: b/
19623656
Change-Id: Iee9efcdefe5cdda2adae03f0852ff2b53e75698f
Alex Klyubin [Wed, 17 Jun 2015 17:54:34 +0000 (17:54 +0000)]
Merge "Drop support for P-192 EC keys." into mnc-dev
Paul McLean [Wed, 17 Jun 2015 17:53:33 +0000 (17:53 +0000)]
Merge "Map >= 24bit encodings to ENCODING_PCM_FLOAT" into mnc-dev
Alex Klyubin [Wed, 17 Jun 2015 17:51:19 +0000 (10:51 -0700)]
Drop support for P-192 EC keys.
The minimum EC keys size is now 224 bit. This is because keymaster 1.0
does not support EC keys smaller than 224 bit.
Bug:
18088752
Change-Id: I8010ff2d6ccaeea7dcf86f697aee1d9ebd683cb2
Mady Mellor [Wed, 17 Jun 2015 17:45:00 +0000 (17:45 +0000)]
am
5279d11f: Merge "Drag to select text: add some slop for moving between lines" into mnc-dev
* commit '
5279d11f258a01cfdf0a16d965b5e4cd7566b8ac':
Drag to select text: add some slop for moving between lines
Paul McLean [Wed, 17 Jun 2015 17:10:11 +0000 (10:10 -0700)]
Map >= 24bit encodings to ENCODING_PCM_FLOAT
Bug:
21851140
Change-Id: I8203281f5ca7d194e1bd2f417e75d3ef2fd561c7
Mady Mellor [Wed, 17 Jun 2015 17:36:30 +0000 (17:36 +0000)]
Merge "Drag to select text: add some slop for moving between lines" into mnc-dev
Mady Mellor [Wed, 17 Jun 2015 17:13:56 +0000 (17:13 +0000)]
am
f0522882: Merge "Insertion cursor: add some slop for moving between lines" into mnc-dev
* commit '
f05228822c5da6333f20dc3a29c8f064b7562e06':
Insertion cursor: add some slop for moving between lines
Alan Viverette [Wed, 17 Jun 2015 17:00:33 +0000 (17:00 +0000)]
am
8d537051: Merge "Split control background into 40dp and 32dp diameter versions" into mnc-dev
* commit '
8d537051c12d345974bf441bebc58afb1fd64ad7':
Split control background into 40dp and 32dp diameter versions
Mady Mellor [Wed, 17 Jun 2015 17:00:08 +0000 (17:00 +0000)]
Merge "Insertion cursor: add some slop for moving between lines" into mnc-dev
Jason Monk [Wed, 17 Jun 2015 16:52:43 +0000 (12:52 -0400)]
Don't reinflate signal icons unless we really need to.
Bug:
21791609
Change-Id: I5eb1b890f2298211b25afa0e2570f0ab49a45e0b
Alan Viverette [Wed, 17 Jun 2015 16:50:25 +0000 (16:50 +0000)]
Merge "Split control background into 40dp and 32dp diameter versions" into mnc-dev
Mady Mellor [Fri, 5 Jun 2015 18:12:01 +0000 (11:12 -0700)]
Insertion cursor: add some slop for moving between lines
Applying same method to insertion cursor as the text selection drag
handles to improve moving along lines.
Basically adds some slop above / below the current line and only
allows you to change lines if you move outside of that.
Bug:
21306433
Change-Id: I6c7f3a496fbd1ea66936832f96325736cea872aa
Mady Mellor [Wed, 17 Jun 2015 16:46:01 +0000 (09:46 -0700)]
Drag to select text: add some slop for moving between lines
It's pretty easy to accidentally move to a different line when
selecting text. This CL makes an adjustment so that if the user
is on a line, they must move above the top of it + slop to move
up a line, and they must move below the bottom of it + slop to move
down a line. This applies the changes to the drag accelerator.
This CL also makes an adjustment to not apply the finger offset
to the drag accelerator until the user has moved lines, this was
causing an issue where it would immediately include the above line
when initiating the selection.
Bug:
21306433
Bug:
21303943
Change-Id: Id240136493f62524fe6445d8bd65479084fe8126
Quddus Chong [Wed, 17 Jun 2015 16:41:36 +0000 (16:41 +0000)]
am
5c7b9495: am
93bd8134: am
eae09b4a: Merge "docs: Updated Android TV landing page and Live TV training to support channels. bug:
21786387" into mnc-preview-docs
* commit '
5c7b9495fbf95a87c6dd85bdbd170aa35483f004':
docs: Updated Android TV landing page and Live TV training to support channels. bug:
21786387
Mady Mellor [Wed, 17 Jun 2015 16:41:32 +0000 (16:41 +0000)]
am
13e54ff0: Merge "Text selection: add some slop for moving between lines" into mnc-dev
* commit '
13e54ff0ebc5fe6f425c16d9d30ea9ecd5db1348':
Text selection: add some slop for moving between lines
Quddus Chong [Wed, 17 Jun 2015 16:36:17 +0000 (16:36 +0000)]
am
93bd8134: am
eae09b4a: Merge "docs: Updated Android TV landing page and Live TV training to support channels. bug:
21786387" into mnc-preview-docs
* commit '
93bd81346de88f850f4e4002229a3119c97d8ddb':
docs: Updated Android TV landing page and Live TV training to support channels. bug:
21786387
Mady Mellor [Wed, 17 Jun 2015 16:30:16 +0000 (16:30 +0000)]
Merge "Text selection: add some slop for moving between lines" into mnc-dev
Geoff Mendal [Wed, 17 Jun 2015 16:30:00 +0000 (16:30 +0000)]
am
71e5d535: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
71e5d535a8d93621034d9d4df354a09039ac07d1':
Import translations. DO NOT MERGE
Mady Mellor [Wed, 17 Jun 2015 16:25:19 +0000 (09:25 -0700)]
Text selection: add some slop for moving between lines
It's pretty easy to accidentally move to a different line when
selecting text. This CL makes an adjustment so that if the user
is on a line, they must move above the top of it + slop to move
up a line, and they must move below the bottom of it + slop to move
down a line.
This CL also makes a small modification to check if the layout is
null and return early which simplifies some of the following code.
Bug:
21306433
Change-Id: I4a854e644faafaf1e159201ae1f2838862f16b25
Alex Klyubin [Mon, 1 Jun 2015 23:07:53 +0000 (16:07 -0700)]
Expose AES GCM backed by Android Keystore.
Bug:
18088752
Bug:
21786749
Change-Id: Ica90491037d2920f7635195894ba18882fc4406d
Quddus Chong [Wed, 17 Jun 2015 16:23:38 +0000 (16:23 +0000)]
am
eae09b4a: Merge "docs: Updated Android TV landing page and Live TV training to support channels. bug:
21786387" into mnc-preview-docs
* commit '
eae09b4a642bb30d5fd8ff90796e410197d71c95':
docs: Updated Android TV landing page and Live TV training to support channels. bug:
21786387
Zhijun He [Wed, 17 Jun 2015 16:21:10 +0000 (09:21 -0700)]
Camera2: fix high speed request builder creation issue
The metadata local copy was mutated (swapped) to an empty copy after use,
we need make a copy every time.
Bug:
21442271
Change-Id: I8a71663ba964288bdd1d7f50b42db762d28d89c0
Geoff Mendal [Wed, 17 Jun 2015 16:19:15 +0000 (16:19 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 17 Jun 2015 16:14:37 +0000 (09:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4ac364b0a987a0546be8c0c9b606ee7ad85a7320
Auto-generated-cl: translation import
Quddus Chong [Wed, 17 Jun 2015 16:13:19 +0000 (16:13 +0000)]
Merge "docs: Updated Android TV landing page and Live TV training to support channels. bug:
21786387" into mnc-preview-docs
Chris Wren [Wed, 17 Jun 2015 15:53:34 +0000 (15:53 +0000)]
am
3d2b6212: Merge "high-frequency notification stats." into mnc-dev
* commit '
3d2b621204bf74eb0adf548ae1c8850a05aea01a':
high-frequency notification stats.
Andy Hung [Sat, 13 Jun 2015 06:02:03 +0000 (23:02 -0700)]
AudioTrack.Builder should throw exception on failure.
Should throw UnsupportedOperationException instead of returning
an uninitialized track object.
Bug:
21890643
Change-Id: I34df73b316fcb490be05eb3beff06b795645fd4c
Chris Wren [Wed, 17 Jun 2015 15:43:39 +0000 (15:43 +0000)]
Merge "high-frequency notification stats." into mnc-dev
Chris Wren [Tue, 16 Jun 2015 17:56:22 +0000 (13:56 -0400)]
high-frequency notification stats.
Aggregate and then periodically report stats that are high-frequency
because they are driven by app behavior, not user behavior.
Reuse the NotificationUsageStats facility.
Remove redundant stats.
Lessen memory foot print.
Enable in-memeory aggregates with small, bounded memory footprint.
Bug:
20258744
Change-Id: I87e391419c53917fa13c68a56f8cdb40a7c8e548
Andy Hung [Sat, 13 Jun 2015 05:49:15 +0000 (22:49 -0700)]
AudioRecord.Builder should throw exception on failure.
Should throw UnsupportedOperationException instead of returning
an uninitialized record object.
Bug:
21890643
Change-Id: I9c05a4cff9f5e1d5513c76acace09699a567008f
Luan Nguyen [Wed, 17 Jun 2015 15:27:29 +0000 (15:27 +0000)]
am
e5884808: am
0752aa54: am
5cef09b0: Merge "docs: Update JavaDoc links for Watch Face class." into mnc-preview-docs
* commit '
e58848086a0e94182e1572d0bde3f0afa1cf7a4b':
docs: Update JavaDoc links for Watch Face class.
Luan Nguyen [Wed, 17 Jun 2015 15:27:24 +0000 (15:27 +0000)]
am
1824ea1b: am
ce26f291: am
5980ae8f: Merge "docs: Update JavaDoc reference links for Create Wearable Apps class" into mnc-preview-docs
* commit '
1824ea1b1c60f27cbc49ed086cd6198641f6c74f':
docs: Update JavaDoc reference links for Create Wearable Apps class
Luan Nguyen [Wed, 17 Jun 2015 15:27:19 +0000 (15:27 +0000)]
am
871c5cb5: am
474b4775: am
d548b29d: Merge "docs: Update JavaDoc ref links for UI training." into mnc-preview-docs
* commit '
871c5cb52ddefa15296e4e59c592bef0abf297f9':
docs: Update JavaDoc ref links for UI training.
Luan Nguyen [Wed, 17 Jun 2015 15:14:32 +0000 (15:14 +0000)]
am
0752aa54: am
5cef09b0: Merge "docs: Update JavaDoc links for Watch Face class." into mnc-preview-docs
* commit '
0752aa54a03b39e2a16e6f40e4d7cf912a29bd08':
docs: Update JavaDoc links for Watch Face class.
Luan Nguyen [Wed, 17 Jun 2015 15:14:27 +0000 (15:14 +0000)]
am
ce26f291: am
5980ae8f: Merge "docs: Update JavaDoc reference links for Create Wearable Apps class" into mnc-preview-docs
* commit '
ce26f2911361fe1da9d3f350e2785657d6d5e685':
docs: Update JavaDoc reference links for Create Wearable Apps class
Luan Nguyen [Wed, 17 Jun 2015 15:14:22 +0000 (15:14 +0000)]
am
474b4775: am
d548b29d: Merge "docs: Update JavaDoc ref links for UI training." into mnc-preview-docs
* commit '
474b4775edb0154ad8f5b85a53fb2c689de69b40':
docs: Update JavaDoc ref links for UI training.
Luan Nguyen [Wed, 17 Jun 2015 15:03:04 +0000 (15:03 +0000)]
am
5cef09b0: Merge "docs: Update JavaDoc links for Watch Face class." into mnc-preview-docs
* commit '
5cef09b07521cf14eb6a9c9dc59276b9b6482bef':
docs: Update JavaDoc links for Watch Face class.
Luan Nguyen [Wed, 17 Jun 2015 15:02:59 +0000 (15:02 +0000)]
am
5980ae8f: Merge "docs: Update JavaDoc reference links for Create Wearable Apps class" into mnc-preview-docs
* commit '
5980ae8f06d5a56a5bfc763729533d975079b801':
docs: Update JavaDoc reference links for Create Wearable Apps class
Luan Nguyen [Wed, 17 Jun 2015 15:02:55 +0000 (15:02 +0000)]
am
d548b29d: Merge "docs: Update JavaDoc ref links for UI training." into mnc-preview-docs
* commit '
d548b29def4006c0a19df090189198e51715bccd':
docs: Update JavaDoc ref links for UI training.
Luan Nguyen [Wed, 17 Jun 2015 14:55:43 +0000 (14:55 +0000)]
Merge "docs: Update JavaDoc links for Watch Face class." into mnc-preview-docs
Luan Nguyen [Wed, 17 Jun 2015 14:54:49 +0000 (14:54 +0000)]
Merge "docs: Update JavaDoc reference links for Create Wearable Apps class" into mnc-preview-docs
Luan Nguyen [Wed, 17 Jun 2015 14:54:27 +0000 (14:54 +0000)]
Merge "docs: Update JavaDoc ref links for UI training." into mnc-preview-docs
Geoff Mendal [Wed, 17 Jun 2015 14:10:51 +0000 (14:10 +0000)]
am
641234c1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
641234c172ad72c332bca61fe9f73f8ad1fd8227':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 17 Jun 2015 13:59:21 +0000 (13:59 +0000)]
am
63534a9d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
63534a9d1083dedeab2d20919de94df6f1cd4e21':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 17 Jun 2015 13:59:17 +0000 (13:59 +0000)]
am
e21d5648: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
e21d56482fa47de13a098badba449ef7e90e31b4':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 17 Jun 2015 13:58:39 +0000 (13:58 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 17 Jun 2015 13:58:03 +0000 (08:58 -0500)]
Import translations. DO NOT MERGE
Change-Id: If7f177f95be4ab365cf62a8dc080373a7ae0e27b
Auto-generated-cl: translation import
Geoff Mendal [Wed, 17 Jun 2015 13:50:56 +0000 (13:50 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 17 Jun 2015 13:50:03 +0000 (08:50 -0500)]
Import translations. DO NOT MERGE
Change-Id: I47235b1d4bd87bf37da15e687b3f5cbfc5f4c0b4
Auto-generated-cl: translation import
Geoff Mendal [Wed, 17 Jun 2015 13:47:01 +0000 (13:47 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 17 Jun 2015 13:45:37 +0000 (08:45 -0500)]
Import translations. DO NOT MERGE
Change-Id: Ie78d85789becd82c6fd468d50a47516711e5715a
Auto-generated-cl: translation import
Jason Monk [Wed, 17 Jun 2015 13:09:22 +0000 (13:09 +0000)]
am
f858f703: Merge "Allow QS detail items to get bigger when text is large" into mnc-dev
* commit '
f858f7034c911c1a4dc45daa6e80ee0f9925e008':
Allow QS detail items to get bigger when text is large
Jason Monk [Wed, 17 Jun 2015 13:02:20 +0000 (13:02 +0000)]
Merge "Allow QS detail items to get bigger when text is large" into mnc-dev
Narayan Kamath [Wed, 17 Jun 2015 11:53:56 +0000 (11:53 +0000)]
am
2c89e7d8: Merge "Delete android.speech.srec.*" into mnc-dev
* commit '
2c89e7d8dba1713de17157a164071c65f4b00915':
Delete android.speech.srec.*
Narayan Kamath [Wed, 17 Jun 2015 11:38:12 +0000 (11:38 +0000)]
Merge "Delete android.speech.srec.*" into mnc-dev
Narayan Kamath [Wed, 17 Jun 2015 09:51:23 +0000 (09:51 +0000)]
am
4600dd05: ZipFileRO: Use precise widths for zip file types.
* commit '
4600dd053dbdbd4b95f3b11057a1cc55b99f9c77':
ZipFileRO: Use precise widths for zip file types.
Narayan Kamath [Tue, 16 Jun 2015 11:02:57 +0000 (12:02 +0100)]
ZipFileRO: Use precise widths for zip file types.
getEntryInfo crashes on 64-bit devices because "long" types
were being passed int pointers (that pointed to a stack frame)
that were reinterpret_cast'ed to long* (sigh.). To fix this issue
once and for all, use types with explicitly defined widths.
This change also removes some dead invariant checking from
Asset.cpp instead of cleaning it up.
Note that we've introduced a wart in NativeLibraryHelper, where
we need to deal with zlib's uLong type, which is "at least 32 bits
wide".
bug:
21622286
Change-Id: Iae675a9601db7aae03a8b80b40321d2cc1d97f50
Ruben Brunk [Wed, 17 Jun 2015 06:33:01 +0000 (06:33 +0000)]
am
5e063b1d: Merge "Move distortion correction to correct opcode list." into mnc-dev
* commit '
5e063b1da52cca1b93b19bdf7be694aabf95d336':
Move distortion correction to correct opcode list.
Ruben Brunk [Wed, 17 Jun 2015 06:22:23 +0000 (06:22 +0000)]
Merge "Move distortion correction to correct opcode list." into mnc-dev
Ruben Brunk [Wed, 17 Jun 2015 06:03:09 +0000 (23:03 -0700)]
Move distortion correction to correct opcode list.
- Prior to this, the lens distortion correction was applying
resampling to the bayer mosaic, resulting in magenta
output images (oops).
Bug:
20491394
Change-Id: Ia244364954062d1c38ef3ec3b7a1d087904112f9
Yohei Yukawa [Wed, 17 Jun 2015 04:30:16 +0000 (04:30 +0000)]
am
f4d225a4: Fix debug log for SpellCheckerSessionListenerImpl#TASK_CANCEL
* commit '
f4d225a4b502ef227788447eb1a5bb2902019c01':
Fix debug log for SpellCheckerSessionListenerImpl#TASK_CANCEL
Yohei Yukawa [Wed, 17 Jun 2015 04:19:00 +0000 (21:19 -0700)]
Fix debug log for SpellCheckerSessionListenerImpl#TASK_CANCEL
This is a follow up CL for Ifd05565ac0c057c46ec88a3fb9094c04934041d.
SpellCheckerSessionListenerImpl.taskToString(TASK_CANCEL) has
somehow returned "STATE_WAIT_CONNECTION" probably because of
a copy-and-paste mistake.
With this CL, it now returns "TASK_CANCEL", which is observable
only in debug log anyway though.
Bug:
21319642
Change-Id: Ib0bf11494bd3f210e6e8192fc25a33c65f7d313d
Jeff Sharkey [Wed, 17 Jun 2015 04:08:17 +0000 (04:08 +0000)]
am
3d00f7a1: Merge "Finish when browsed root goes away." into mnc-dev
* commit '
3d00f7a1be6ff858a89e2220f33231ecb3570ef3':
Finish when browsed root goes away.
Jeff Sharkey [Wed, 17 Jun 2015 03:55:34 +0000 (03:55 +0000)]
Merge "Finish when browsed root goes away." into mnc-dev
Jeff Sharkey [Wed, 17 Jun 2015 03:54:11 +0000 (20:54 -0700)]
Finish when browsed root goes away.
If we're browsing a specific root, and that root went away, typically
due to formatting.
Bug:
21831184
Change-Id: Ie07607a81e32a7d82c88ad382658a471d47b905d
Yohei Yukawa [Wed, 17 Jun 2015 03:02:32 +0000 (03:02 +0000)]
am
e34f0984: Merge "Fix a reference leak in SpellCheckerSessionListenerImpl." into mnc-dev
* commit '
e34f0984bb879cb7c89b8ff5a78e4bc7243c6331':
Fix a reference leak in SpellCheckerSessionListenerImpl.
Yohei Yukawa [Wed, 17 Jun 2015 02:54:06 +0000 (02:54 +0000)]
Merge "Fix a reference leak in SpellCheckerSessionListenerImpl." into mnc-dev
Selim Cinek [Wed, 17 Jun 2015 02:37:37 +0000 (19:37 -0700)]
Fixed a jump with the panel scrim
Bug:
21764980
Change-Id: Ib09aa025143025178a9e21390f3a06b37a067e3e
OSDN Git Service
