OSDN Git Service
Andrew Solovay [Thu, 30 Apr 2015 02:58:08 +0000 (02:58 +0000)]
am
c2e2c7d5: Merge "docs: Minor formatting cleanup." into lmp-mr1-ub-docs
* commit '
c2e2c7d5f5b8bf699d7177a4dc7694719323fd87':
docs: Minor formatting cleanup.
Andrew Solovay [Thu, 30 Apr 2015 02:27:00 +0000 (02:27 +0000)]
Merge "docs: Minor formatting cleanup." into lmp-mr1-ub-docs
Andrew Solovay [Wed, 29 Apr 2015 21:37:22 +0000 (14:37 -0700)]
docs: Minor formatting cleanup.
Code sample had an overlong line, which caused a horizontal scroll-
bar in the generated doc.
Change-Id: I55b0318049be9e4ff473bdc739bb8265ca2da248
David Friedman [Wed, 29 Apr 2015 03:48:52 +0000 (03:48 +0000)]
am
77ad81b5: am
ff1bfac6: am
c637af9e: am
75f071df: Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
* commit '
77ad81b5301bfbf1691bdad203dd70ce68ce40b3':
David Friedman [Wed, 29 Apr 2015 03:25:38 +0000 (03:25 +0000)]
am
ff1bfac6: am
c637af9e: am
75f071df: Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
* commit '
ff1bfac68b977f577d537172d87daa5c816be3b7':
Localized Android landing pages Bug:
19124242
David Friedman [Wed, 29 Apr 2015 03:25:15 +0000 (03:25 +0000)]
am
21a9fa47: am
75f071df: Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
* commit '
21a9fa471bcc57196a19e40ca29dbaa97233244c':
Localized Android landing pages Bug:
19124242
David Friedman [Wed, 29 Apr 2015 03:13:59 +0000 (03:13 +0000)]
am
c637af9e: am
75f071df: Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
* commit '
c637af9eee48334e6d8d65428734c8928e9bac55':
Localized Android landing pages Bug:
19124242
David Friedman [Wed, 29 Apr 2015 03:01:57 +0000 (03:01 +0000)]
am
75f071df: Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
* commit '
75f071df44d3231f2f9d2616277b9065e1dedc12':
Localized Android landing pages Bug:
19124242
David Friedman [Wed, 29 Apr 2015 03:01:10 +0000 (03:01 +0000)]
am
75f071df: Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
* commit '
75f071df44d3231f2f9d2616277b9065e1dedc12':
Localized Android landing pages Bug:
19124242
David Friedman [Wed, 29 Apr 2015 02:49:23 +0000 (02:49 +0000)]
Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
Luan Nguyen [Tue, 28 Apr 2015 20:39:14 +0000 (20:39 +0000)]
am
c1609dc0: docs: Update information on delivering message to clarify that MessageAPI is not reliable.
* commit '
c1609dc0b25c3143ae8d74bc44fb36873b7d289c':
docs: Update information on delivering message to clarify that MessageAPI is not reliable.
Luan Nguyen [Tue, 28 Apr 2015 18:36:42 +0000 (11:36 -0700)]
docs: Update information on delivering message to clarify that
MessageAPI is not reliable.
bug:
20088602
Change-Id: I2244598e5a155bc6e477d367287b8683ebdf019f
Joshua Schwarz [Tue, 28 Apr 2015 18:28:18 +0000 (18:28 +0000)]
am
4547dac0: Fix one-off error in reporting.
* commit '
4547dac01f3136393cc708bb49ff546413a45d6c':
Fix one-off error in reporting.
Joe Fernandez [Tue, 28 Apr 2015 16:46:36 +0000 (16:46 +0000)]
am
0312f377: Merge "docs: Modify Branding guidelines for Android form factors" into lmp-mr1-ub-docs
* commit '
0312f37785768d7931e81afe92dbeda11f132d50':
docs: Modify Branding guidelines for Android form factors
Joe Fernandez [Tue, 28 Apr 2015 16:21:55 +0000 (16:21 +0000)]
Merge "docs: Modify Branding guidelines for Android form factors" into lmp-mr1-ub-docs
Joshua Schwarz [Tue, 28 Apr 2015 01:35:50 +0000 (18:35 -0700)]
Fix one-off error in reporting.
Change-Id: I5315e3d13b42285169e6c92cfcf9cf2ae9667018
Joe Fernandez [Tue, 28 Apr 2015 00:24:26 +0000 (00:24 +0000)]
am
68ef9287: Merge "docs: Add note about overriding onConnectedNodes() when listening for capability node changes." into lmp-mr1-ub-docs
* commit '
68ef92871f52bad28d5aea168c0d3a4b863d282d':
docs: Add note about overriding onConnectedNodes() when listening for capability node changes.
Joe Fernandez [Tue, 28 Apr 2015 00:24:19 +0000 (00:24 +0000)]
am
185002bc: Merge "docs: Update Wearable API setup to mention addApiIfAvailable()." into lmp-mr1-ub-docs
* commit '
185002bcc9b551828557ab6946fef7fef1c17d74':
docs: Update Wearable API setup to mention addApiIfAvailable().
Joe Fernandez [Tue, 28 Apr 2015 00:03:49 +0000 (00:03 +0000)]
Merge "docs: Add note about overriding onConnectedNodes() when listening for capability node changes." into lmp-mr1-ub-docs
Joe Fernandez [Tue, 28 Apr 2015 00:00:08 +0000 (00:00 +0000)]
Merge "docs: Update Wearable API setup to mention addApiIfAvailable()." into lmp-mr1-ub-docs
Joe Fernandez [Mon, 27 Apr 2015 22:16:41 +0000 (15:16 -0700)]
docs: Modify Branding guidelines for Android form factors
b/
19835619
Change-Id: Ic942aa3c262de5922e084b1e007652b151ca2a76
Luan Nguyen [Wed, 22 Apr 2015 21:48:46 +0000 (14:48 -0700)]
docs: Update Wearable API setup to mention addApiIfAvailable().
bug:
20486912
Change-Id: Ie5fe89b5bd0bbed5c95cead301c6eb6278bfdaee
Luan Nguyen [Thu, 23 Apr 2015 17:32:31 +0000 (10:32 -0700)]
docs: Add note about overriding onConnectedNodes() when listening
for capability node changes.
bug:
20523695
Change-Id: I7a1b057625f6f39d9ee3a03948f0b187484b1842
Cedric Ho [Mon, 27 Apr 2015 16:41:33 +0000 (16:41 +0000)]
am
991c8c53: Merge "Enable VoiceInteractionService on watch." into lmp-mr1-modular-dev
* commit '
991c8c53aff32f3d605f6715b3fa78a86990f7ff':
Enable VoiceInteractionService on watch.
Scott Rowe [Mon, 27 Apr 2015 16:33:01 +0000 (16:33 +0000)]
am
63604283: am
02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '
6360428359bd1a4db1c9a569d8f9e1af8baf29fb':
Andrew Solovay [Mon, 27 Apr 2015 16:32:56 +0000 (16:32 +0000)]
am
44199d26: am
5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs
* commit '
44199d26d2305b45086695acb1c851aae7328706':
Andrew Solovay [Mon, 27 Apr 2015 16:32:50 +0000 (16:32 +0000)]
am
19bc81db: am
09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs
* commit '
19bc81dbbaeef90f1417d78a18a96120b8d81762':
Quddus Chong [Mon, 27 Apr 2015 16:32:44 +0000 (16:32 +0000)]
am
a76a3dd3: (-s ours) am
f0936e2f: (-s ours) Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
* commit '
a76a3dd3a90451e78672ccd52b004e6948bf21b7':
Cedric Ho [Mon, 27 Apr 2015 15:47:26 +0000 (15:47 +0000)]
Merge "Enable VoiceInteractionService on watch." into lmp-mr1-modular-dev
Quddus Chong [Mon, 27 Apr 2015 07:49:29 +0000 (07:49 +0000)]
am
ab52769b: am
789c5971: (-s ours) Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs
* commit '
ab52769be2d2dc33a520459194f1e007f03970e4':
Luan Nguyen [Mon, 27 Apr 2015 07:49:23 +0000 (07:49 +0000)]
am
4f50a2b1: am
33ac358a: docs: Add Wear Capability training
* commit '
4f50a2b173e31accd8f1fbdde7e9b038914746e7':
Luan Nguyen [Mon, 27 Apr 2015 07:49:16 +0000 (07:49 +0000)]
am
bed3f49b: am
4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
* commit '
bed3f49b5547642c76901d848c08163463ab4fbe':
Quddus Chong [Mon, 27 Apr 2015 07:49:10 +0000 (07:49 +0000)]
am
9c8f8117: am
900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
* commit '
9c8f8117c1ed2fbf2181011116287b5f6c6dbe9d':
Ryosuke Matsuuchi [Mon, 27 Apr 2015 07:49:03 +0000 (07:49 +0000)]
am
3cd98ab6: am
0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
* commit '
3cd98ab63cf4bee489de9077e62c93a13f9e66b2':
Dirk Dougherty [Mon, 27 Apr 2015 07:48:52 +0000 (07:48 +0000)]
am
d668578f: am
ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
* commit '
d668578f6f7a5623bc88afa1e39bb19ede91879e':
Rich Slogar [Mon, 27 Apr 2015 07:48:44 +0000 (07:48 +0000)]
am
03389e7e: am
1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
* commit '
03389e7e4a74a92b6bcae5474e9b2c887ac2d335':
Rich Slogar [Mon, 27 Apr 2015 07:48:37 +0000 (07:48 +0000)]
am
5fb293b2: am
efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
* commit '
5fb293b27d71cc1b8949179c30d43fc057ae05fb':
Scott Rowe [Sun, 26 Apr 2015 22:08:07 +0000 (22:08 +0000)]
am
02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '
02e4f2fbe6e0511789d42d5942548158d2dd154f':
docs: Supported media protocols, codecs, formats for Android TV
Andrew Solovay [Sun, 26 Apr 2015 22:07:52 +0000 (22:07 +0000)]
am
5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs
* commit '
5b3152cffcd90441ca4cacdf5596e9bb3428af08':
Docs: Correcting section on how to escape quotes in strings.
Andrew Solovay [Sun, 26 Apr 2015 22:07:44 +0000 (22:07 +0000)]
am
09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs
* commit '
09cf4d500dd27342c913d2333f4f0fd2fa9dbfd0':
docs: Update to doc on listening for restrictions-changed intent
Quddus Chong [Sun, 26 Apr 2015 22:07:38 +0000 (22:07 +0000)]
am
f0936e2f: (-s ours) Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
* commit '
f0936e2fb0e9f013f6079e7a733a41d42d49c3f3':
docs: Added 3rd-party Javadocs for GMS Parmesan release.
Quddus Chong [Sun, 26 Apr 2015 22:00:29 +0000 (22:00 +0000)]
am
789c5971: (-s ours) Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs
* commit '
789c59711e55be981ed2093228ded0c588e74ba0':
docs: Added What's New section for GMS v7.3 (Parmesan).
Luan Nguyen [Sun, 26 Apr 2015 19:15:52 +0000 (19:15 +0000)]
am
33ac358a: docs: Add Wear Capability training
* commit '
33ac358a5a4199549d11ba1931243e7dc8a7ab85':
docs: Add Wear Capability training
Luan Nguyen [Sun, 26 Apr 2015 19:15:46 +0000 (19:15 +0000)]
am
4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
* commit '
4aebbfbb9ba54d77ac99508fb66db6c9fd24343a':
docs: Add Channel API summary for Wear.
Quddus Chong [Sun, 26 Apr 2015 19:15:39 +0000 (19:15 +0000)]
am
900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
* commit '
900831f303beb4a67a871d969ac822d8b6d36460':
docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
Ryosuke Matsuuchi [Sun, 26 Apr 2015 19:15:26 +0000 (19:15 +0000)]
am
0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
* commit '
0d2f280310458d23618edf6550818f8f9cfa6b47':
doc: Add Korean version of DAC/distribute/ page.
Dirk Dougherty [Sun, 26 Apr 2015 19:15:20 +0000 (19:15 +0000)]
am
ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
* commit '
ff233af75f2201c2724f8b388c39d3abeb8c6a2e':
Doc change: distribute landing page.
Rich Slogar [Sun, 26 Apr 2015 19:15:12 +0000 (19:15 +0000)]
am
1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
* commit '
1fcc6bd854f6e152cf8796a4a70965e350c3bdcf':
docs: studio remove gradle tasks dialog
Rich Slogar [Sun, 26 Apr 2015 19:15:04 +0000 (19:15 +0000)]
am
efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
* commit '
efe861a4a7081da795fe6a0843308ca7cef26277':
docs: hierarchyviewer updates
Dirk Dougherty [Sat, 25 Apr 2015 21:59:35 +0000 (21:59 +0000)]
am
495227aa: Doc change: update dff image.
* commit '
495227aab706fa6daf7f7b0b4ca741fef82c9d1d':
Doc change: update dff image.
Nick Kralevich [Sat, 25 Apr 2015 21:56:56 +0000 (21:56 +0000)]
am
00e165ae: am
e8101c04: Merge "fix compiler error under FORTIFY_SOURCE=2"
* commit '
00e165aed3d53b147b153003b3b9fd3c129ff3c4':
fix compiler error under FORTIFY_SOURCE=2
Dirk Dougherty [Sat, 25 Apr 2015 21:49:40 +0000 (14:49 -0700)]
Doc change: update dff image.
Bug-id:
20251587
Change-Id: I25d59c8a66c548a13e699c25e79cd4a23d2cd330
Nick Kralevich [Sat, 25 Apr 2015 21:41:52 +0000 (21:41 +0000)]
am
e8101c04: Merge "fix compiler error under FORTIFY_SOURCE=2"
* commit '
e8101c047cffc69245493d96f2f2ec36728682f1':
fix compiler error under FORTIFY_SOURCE=2
Nick Kralevich [Sat, 25 Apr 2015 21:22:31 +0000 (21:22 +0000)]
Merge "fix compiler error under FORTIFY_SOURCE=2"
Nick Kralevich [Sat, 25 Apr 2015 03:25:50 +0000 (20:25 -0700)]
fix compiler error under FORTIFY_SOURCE=2
frameworks/base/libs/androidfw/ObbFile.cpp:340:5: error: ignoring return value of function declared with warn_unused_result attribute [-Werror,-Wunused-result]
ftruncate(fd, mFooterStart);
^~~~~~~~~ ~~~~~~~~~~~~~~~~
1 error generated.
amake: *** [out/host/linux-x86/obj/STATIC_LIBRARIES/libandroidfw_intermediates/ObbFile.o] Error 1
Change-Id: I7080d64e7a830a10b41c1ebf33c60d32b7c8356e
Quddus Chong [Fri, 24 Apr 2015 23:43:49 +0000 (23:43 +0000)]
am
bbe5effb: docs: Fixed typo in \'Authorizing with Google for REST APIs\' doc. bug:
18025533
* commit '
bbe5effb6682b4ba5e6accd9a226ec7611fe83dc':
docs: Fixed typo in 'Authorizing with Google for REST APIs' doc. bug:
18025533
Quddus Chong [Fri, 24 Apr 2015 23:28:40 +0000 (16:28 -0700)]
docs: Fixed typo in 'Authorizing with Google for REST APIs' doc.
bug:
18025533
Change-Id: I6379b2a7be495a506e0e428fe9c68fdbe197704b
Wale Ogunwale [Fri, 24 Apr 2015 22:26:08 +0000 (22:26 +0000)]
am
d639a453: am
e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the same provider""
* commit '
d639a4532417bf605f03b3b5efdb3a9e1cbe6661':
Revert "[ActivityManager] Improve multi-thread access the same provider"
Wale Ogunwale [Fri, 24 Apr 2015 22:26:04 +0000 (22:26 +0000)]
am
e2047da6: am
d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider""
* commit '
e2047da6f3f21fc702d35b7d1c4e9bb62c963dac':
Revert "Clean-up state if we have an exception when acquiring provider"
Wale Ogunwale [Fri, 24 Apr 2015 22:15:02 +0000 (22:15 +0000)]
am
e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the same provider""
* commit '
e60077e62a441dbcc132b2abb35d998ab48d261c':
Revert "[ActivityManager] Improve multi-thread access the same provider"
Wale Ogunwale [Fri, 24 Apr 2015 22:14:56 +0000 (22:14 +0000)]
am
d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider""
* commit '
d9bf26522b930a8d5d25f6e28c390e39fee6d0b2':
Revert "Clean-up state if we have an exception when acquiring provider"
Kenny Root [Fri, 24 Apr 2015 22:00:56 +0000 (22:00 +0000)]
am
8652bce1: am
c71f2648: Merge "frameworks/base: switch to using NativeConstants."
* commit '
8652bce13765fb29329df2a4ccca4591bae28de5':
frameworks/base: switch to using NativeConstants.
Wale Ogunwale [Fri, 24 Apr 2015 21:49:45 +0000 (21:49 +0000)]
Merge "Revert "[ActivityManager] Improve multi-thread access the same provider""
Kenny Root [Fri, 24 Apr 2015 21:49:47 +0000 (21:49 +0000)]
am
c71f2648: Merge "frameworks/base: switch to using NativeConstants."
* commit '
c71f264847eb75d53c0f99e6e1c42a8a1527d3b4':
frameworks/base: switch to using NativeConstants.
Wale Ogunwale [Fri, 24 Apr 2015 21:49:41 +0000 (21:49 +0000)]
Merge "Revert "Clean-up state if we have an exception when acquiring provider""
Wale Ogunwale [Fri, 24 Apr 2015 21:45:14 +0000 (14:45 -0700)]
Revert "[ActivityManager] Improve multi-thread access the same provider"
This reverts commit
57307b21cbdb261eeca081051ed61540dcf905f8.
Bug:
20091132
Wale Ogunwale [Fri, 24 Apr 2015 21:44:54 +0000 (14:44 -0700)]
Revert "Clean-up state if we have an exception when acquiring provider"
This reverts commit
73e239bdc9493d81215d5afe739b3ed095686ba2.
Bug:
20091132
Cedric Ho [Thu, 23 Apr 2015 22:16:47 +0000 (15:16 -0700)]
Enable VoiceInteractionService on watch.
Change-Id: I1d23ba55a98f6d68942cc344b4a564ab62285656
Kenny Root [Fri, 24 Apr 2015 21:26:06 +0000 (21:26 +0000)]
Merge "frameworks/base: switch to using NativeConstants."
Alex Klyubin [Fri, 24 Apr 2015 20:35:26 +0000 (20:35 +0000)]
am
b068ae14: am
e2b9bb45: Merge "No runtime exceptions during normal use of AndroidKeyStore crypto."
* commit '
b068ae143df2c2f3030da23d7fc130f735975867':
No runtime exceptions during normal use of AndroidKeyStore crypto.
Alex Klyubin [Fri, 24 Apr 2015 20:22:58 +0000 (20:22 +0000)]
am
e2b9bb45: Merge "No runtime exceptions during normal use of AndroidKeyStore crypto."
* commit '
e2b9bb45d20102f121660ed361bd4225852a55e0':
No runtime exceptions during normal use of AndroidKeyStore crypto.
Alex Klyubin [Fri, 24 Apr 2015 20:00:57 +0000 (20:00 +0000)]
Merge "No runtime exceptions during normal use of AndroidKeyStore crypto."
Quddus Chong [Fri, 24 Apr 2015 19:56:39 +0000 (19:56 +0000)]
am
9774e8ab: Merge "docs: Updated What\'s New for GMS v7.3 to remove Maps support for Wear." into lmp-mr1-ub-docs
* commit '
9774e8ab0890d694840c883f309916a444b3ee54':
docs: Updated What's New for GMS v7.3 to remove Maps support for Wear.
Quddus Chong [Fri, 24 Apr 2015 19:48:03 +0000 (19:48 +0000)]
Merge "docs: Updated What's New for GMS v7.3 to remove Maps support for Wear." into lmp-mr1-ub-docs
Scott Rowe [Fri, 24 Apr 2015 18:52:35 +0000 (18:52 +0000)]
am
5e95a917: am
17c0b254: am
ccfedfcc: am
5827af11: am
02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '
5e95a91707ecd53c1ab0eb688513a2328271f9a2':
docs: Supported media protocols, codecs, formats for Android TV
Scott Rowe [Fri, 24 Apr 2015 18:43:03 +0000 (18:43 +0000)]
am
17c0b254: am
ccfedfcc: am
5827af11: am
02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '
17c0b25441a264efe87ab2db82c04c0e018c178c':
docs: Supported media protocols, codecs, formats for Android TV
Scott Rowe [Fri, 24 Apr 2015 18:30:07 +0000 (18:30 +0000)]
am
ccfedfcc: am
5827af11: am
02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '
ccfedfccbe63af223027471ea80869d0fb011098':
docs: Supported media protocols, codecs, formats for Android TV
Alex Klyubin [Fri, 24 Apr 2015 18:21:22 +0000 (18:21 +0000)]
am
3167fb4b: am
71223ebe: Merge "Reset AndroidKeyStore Mac and Cipher state when init fails."
* commit '
3167fb4b6e190705d21a76b34cc376a89675a6a0':
Reset AndroidKeyStore Mac and Cipher state when init fails.
Olawale Ogunwale [Fri, 24 Apr 2015 18:21:19 +0000 (18:21 +0000)]
am
6d856bfb: am
cf7d2d95: Merge "[ActivityManager] Avoid orphan ContentProviderRecord."
* commit '
6d856bfba5b6ae488d49c4909510cd87000cd922':
[ActivityManager] Avoid orphan ContentProviderRecord.
Leon Scroggins III [Fri, 24 Apr 2015 18:16:34 +0000 (18:16 +0000)]
am
8be18bbf: am
4c1f70db: am
b3523d7f: am
41c458c8: am
67326bcb: am
ea2dcda7: am
ee35410f: (-s ours) am
a7501119: am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
8be18bbfc23b768ae3022f988e586871754958ac':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Fri, 24 Apr 2015 18:16:29 +0000 (18:16 +0000)]
am
60d7c9fc: am
6db29a92: am
f828f43f: am
38cf068c: am
16ac8ad7: am
4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
60d7c9fcbcb80c556689f03c7b00984f94f9912b':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Scott Rowe [Fri, 24 Apr 2015 18:16:26 +0000 (18:16 +0000)]
am
5827af11: am
02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '
5827af11bdcd9973afe04cb035e83c6428d1e562':
docs: Supported media protocols, codecs, formats for Android TV
Alex Klyubin [Fri, 24 Apr 2015 18:11:50 +0000 (18:11 +0000)]
am
71223ebe: Merge "Reset AndroidKeyStore Mac and Cipher state when init fails."
* commit '
71223ebe1b2264b7463a02c8dafd779eb3b8c210':
Reset AndroidKeyStore Mac and Cipher state when init fails.
Olawale Ogunwale [Fri, 24 Apr 2015 18:11:29 +0000 (18:11 +0000)]
am
cf7d2d95: Merge "[ActivityManager] Avoid orphan ContentProviderRecord."
* commit '
cf7d2d95adb358a628c2622b43a999d3ab784406':
[ActivityManager] Avoid orphan ContentProviderRecord.
Scott Rowe [Fri, 24 Apr 2015 18:10:25 +0000 (18:10 +0000)]
am
6e5063fe: docs: Supported media protocols, codecs, formats for Android TV
* commit '
6e5063fe88b265c89b39401545925b9e0cbd8390':
docs: Supported media protocols, codecs, formats for Android TV
Scott Rowe [Fri, 24 Apr 2015 18:01:15 +0000 (18:01 +0000)]
am
02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '
02e4f2fbe6e0511789d42d5942548158d2dd154f':
docs: Supported media protocols, codecs, formats for Android TV
Scott Rowe [Fri, 20 Mar 2015 17:44:52 +0000 (10:44 -0700)]
docs: Supported media protocols, codecs, formats for Android TV
Change-Id: I8202ba148d35d73ee0940070090e0a29553f9202
(cherry picked from commit
f769caa8c15f9983188597e2436b011d23ff2561)
Leon Scroggins III [Fri, 24 Apr 2015 17:54:57 +0000 (17:54 +0000)]
am
4c1f70db: am
b3523d7f: am
41c458c8: am
67326bcb: am
ea2dcda7: am
ee35410f: (-s ours) am
a7501119: am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
4c1f70db3dc37f818bdff09ec3e289b797acc397':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Fri, 24 Apr 2015 17:54:50 +0000 (17:54 +0000)]
am
6db29a92: am
f828f43f: am
38cf068c: am
16ac8ad7: am
4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
6db29a92452c2a837528d20d024dcacefd450c17':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Alex Klyubin [Tue, 21 Apr 2015 22:17:24 +0000 (15:17 -0700)]
No runtime exceptions during normal use of AndroidKeyStore crypto.
This changes the implementation of AndroidKeyStore-backed Cipher and
Mac to avoid throwing runtime exceptions during normal use. Runtime
exceptions will now be thrown only due to truly exceptional and
unrecoverable errors (e.g., keystore unreachable, or crypto primitive
not initialized).
This also changes the implementation of Cipher to cache any errors
encountered in Cipher.update until Cipher.doFinal which then throws
them as checked exceptions.
Bug:
20525947
Change-Id: I3c4ad57fe70abfbb817a79402f722a0208660727
Alex Klyubin [Fri, 24 Apr 2015 17:52:35 +0000 (17:52 +0000)]
Merge "Reset AndroidKeyStore Mac and Cipher state when init fails."
Scott Rowe [Fri, 24 Apr 2015 17:49:13 +0000 (17:49 +0000)]
Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
Alex Klyubin [Fri, 24 Apr 2015 17:47:17 +0000 (10:47 -0700)]
Reset AndroidKeyStore Mac and Cipher state when init fails.
For consistency, this also switches AndroidKeyStore's Mac init/reset
implementation to the same approach as used in Cipher.
Bug:
18088752
Change-Id: Id34caf7cfe04f2058e22d8632890f762927bb31c
Leon Scroggins III [Fri, 24 Apr 2015 17:43:38 +0000 (17:43 +0000)]
am
b3523d7f: am
41c458c8: am
67326bcb: am
ea2dcda7: am
ee35410f: (-s ours) am
a7501119: am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
b3523d7f8f8274a04145ca34eab9821aafb52d7a':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Fri, 24 Apr 2015 17:43:23 +0000 (17:43 +0000)]
am
f828f43f: am
38cf068c: am
16ac8ad7: am
4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
f828f43f97f4a018e2224e926b900713081a8c5b':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Olawale Ogunwale [Fri, 24 Apr 2015 17:42:58 +0000 (17:42 +0000)]
Merge "[ActivityManager] Avoid orphan ContentProviderRecord."
Mark Renouf [Fri, 24 Apr 2015 17:42:01 +0000 (17:42 +0000)]
am
99d49300: am
55555a3d: Fixes rejected dismiss gestures (framework version of ag/677161)
* commit '
99d4930064e7d155ce92746028cbafd46b14c6f4':
Fixes rejected dismiss gestures (framework version of ag/677161)
Leon Scroggins III [Fri, 24 Apr 2015 17:33:04 +0000 (17:33 +0000)]
am
41c458c8: am
67326bcb: am
ea2dcda7: am
ee35410f: (-s ours) am
a7501119: am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
41c458c81125fb6e3fc9eb5304f0d3216a0a2d74':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Fri, 24 Apr 2015 17:32:59 +0000 (17:32 +0000)]
am
38cf068c: am
16ac8ad7: am
4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
38cf068c04e1ce244529b95f6cc6d7d6a88fab24':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Mark Renouf [Fri, 24 Apr 2015 17:31:31 +0000 (17:31 +0000)]
am
55555a3d: Fixes rejected dismiss gestures (framework version of ag/677161)
* commit '
55555a3dab1f3b99a3299b90851624e9dc10f3cc':
Fixes rejected dismiss gestures (framework version of ag/677161)