OSDN Git Service
Roozbeh Pournader [Wed, 2 Aug 2017 21:32:44 +0000 (21:32 +0000)]
Merge "Make InputFilter.AllCaps constructor reject null locales" into oc-mr1-dev am:
6e8e322ea1
am:
6359944a19
Change-Id: Ib5064f4be5fd73c76ad99547746bb1cb6534c2bd
Roozbeh Pournader [Wed, 2 Aug 2017 21:17:06 +0000 (21:17 +0000)]
Merge "Make InputFilter.AllCaps constructor reject null locales" into oc-mr1-dev
am:
6e8e322ea1
Change-Id: I85033f9b16cf269f1c1ce6d01789d9ed40d1cb96
TreeHugger Robot [Wed, 2 Aug 2017 21:08:54 +0000 (21:08 +0000)]
Merge "Make InputFilter.AllCaps constructor reject null locales" into oc-mr1-dev
Romain Guy [Wed, 2 Aug 2017 19:54:28 +0000 (19:54 +0000)]
Merge "Use EGL_EXT_gl_colorspace_scrgb instead of *_linear" into oc-dr1-dev am:
8e8debbe21 am:
0d8c1b81b9
am:
7a3ffac099
Change-Id: I31499d6261f38a0820db5996ee595895ec168d05
Romain Guy [Wed, 2 Aug 2017 19:43:30 +0000 (19:43 +0000)]
Merge "Use EGL_EXT_gl_colorspace_scrgb instead of *_linear" into oc-dr1-dev am:
8e8debbe21
am:
0d8c1b81b9
Change-Id: I84ec688bd958ef563bbc6a48c1139e20dd0003f7
Romain Guy [Wed, 2 Aug 2017 19:43:14 +0000 (19:43 +0000)]
Merge "Use EGL_EXT_gl_colorspace_scrgb instead of *_linear" into oc-dr1-dev am:
8e8debbe21 am:
572379dde1
am:
e7bf5d8f3c
Change-Id: Ib1669e6d6b7f32d429de122ea5a9fdd00b7607c0
Android Build Merger (Role) [Wed, 2 Aug 2017 19:34:28 +0000 (19:34 +0000)]
Merge "Merge "media: Add scaled video thumbnail extractor api." into oc-mr1-dev am:
26a4940296 am:
40b96c785f"
Romain Guy [Wed, 2 Aug 2017 19:33:19 +0000 (19:33 +0000)]
Merge "Use EGL_EXT_gl_colorspace_scrgb instead of *_linear" into oc-dr1-dev
am:
8e8debbe21
Change-Id: I5e6ab8d1b1531980c9d699f4cacbafdcad56501d
Calin Juravle [Wed, 2 Aug 2017 19:33:09 +0000 (19:33 +0000)]
Merge "Save PackageDexUsage on PMS shutdown"
Hangyu Kuang [Wed, 2 Aug 2017 19:32:26 +0000 (19:32 +0000)]
Merge "media: Add scaled video thumbnail extractor api." into oc-mr1-dev am:
26a4940296
am:
40b96c785f
Change-Id: Ie5a72ad1f303e814129ed54915747c5aa925a437
Romain Guy [Wed, 2 Aug 2017 19:32:05 +0000 (19:32 +0000)]
Merge "Use EGL_EXT_gl_colorspace_scrgb instead of *_linear" into oc-dr1-dev am:
8e8debbe21
am:
572379dde1
Change-Id: Iee98007bd02510558d3283d1950fcafa47b218c6
Hangyu Kuang [Wed, 2 Aug 2017 19:22:36 +0000 (19:22 +0000)]
Merge "media: Add scaled video thumbnail extractor api." into oc-mr1-dev
am:
26a4940296
Change-Id: Ibfa5394a612dcec663b1d8b4a301f94b1f2fb49e
TreeHugger Robot [Wed, 2 Aug 2017 19:14:23 +0000 (19:14 +0000)]
Merge "media: Add scaled video thumbnail extractor api." into oc-mr1-dev
TreeHugger Robot [Wed, 2 Aug 2017 19:12:08 +0000 (19:12 +0000)]
Merge "Adds POUND and STAR keys to Generic_Iot.kl"
Beverly [Wed, 2 Aug 2017 19:04:16 +0000 (19:04 +0000)]
Merge "Merge "Added null test to avoid regression for onRemoteVolumeChanged." into oc-dr1-dev am:
6407874ae0 am:
aaa431197f" into oc-mr1-dev-plus-aosp
am:
7fc5d0028a
Change-Id: I6bb1639c6113f22f9cd211efc442cf43ca1b3339
Beverly [Wed, 2 Aug 2017 19:01:29 +0000 (19:01 +0000)]
Merge "Added null test to avoid regression for onRemoteVolumeChanged." into oc-dr1-dev am:
6407874ae0 am:
7084e59bae
am:
1fcc58f4ea
Change-Id: I2673fda0411ca93b4ef0813addf102831d3be44e
Steven Moreland [Wed, 2 Aug 2017 18:55:16 +0000 (18:55 +0000)]
Merge "Revert "services.core: remove use of -static hidl java"" into oc-dr1-dev-plus-aosp am:
7ac34b86e5
am:
e3a067850e
Change-Id: Iab06f4c9a6f29b43f129557ef4bc7f8410350fef
Android Build Merger (Role) [Wed, 2 Aug 2017 18:53:25 +0000 (18:53 +0000)]
Merge "Merge "Added null test to avoid regression for onRemoteVolumeChanged." into oc-dr1-dev am:
6407874ae0 am:
aaa431197f" into oc-mr1-dev-plus-aosp
Steven Moreland [Wed, 2 Aug 2017 18:52:33 +0000 (18:52 +0000)]
Merge "fingerprint: remove use of -static hidl java" into stage-aosp-master am:
5de8c0ee40 am:
842447df3c am:
75af963649
am:
ca08cbadf1
Change-Id: Id963a5ca140d384d68e789f26697e5496c83aa85
Beverly [Wed, 2 Aug 2017 18:51:27 +0000 (18:51 +0000)]
Merge "Added null test to avoid regression for onRemoteVolumeChanged." into oc-dr1-dev am:
6407874ae0
am:
aaa431197f
Change-Id: I5e5bf9939b7fbfdb26ad07ab4ef22ada92e23a8a
Beverly [Wed, 2 Aug 2017 18:49:46 +0000 (18:49 +0000)]
Merge "Added null test to avoid regression for onRemoteVolumeChanged." into oc-dr1-dev am:
6407874ae0
am:
7084e59bae
Change-Id: If30fd4e2ed88472b56e56dadbddb9cb46d0a7680
Junda Liu [Wed, 2 Aug 2017 18:49:39 +0000 (18:49 +0000)]
Merge "Deprecate KEY_EDITABLE_TETHER_APN_BOOL." into oc-mr1-dev am:
858a27c0b6
am:
d249a0061b
Change-Id: Ib748bb88bb894a3f25671a2f557a58af3a3db9a3
TreeHugger Robot [Wed, 2 Aug 2017 18:44:41 +0000 (18:44 +0000)]
Merge "Add metadata support to MTP docs provider."
Romain Guy [Wed, 2 Aug 2017 18:44:40 +0000 (18:44 +0000)]
Merge "Use EGL_EXT_gl_colorspace_scrgb instead of *_linear" into oc-dr1-dev
am:
8e8debbe21
Change-Id: I0f66cafd5eee8081f7af72bfb8cebdb93a619662
Beverly [Wed, 2 Aug 2017 18:39:02 +0000 (18:39 +0000)]
Merge "Added null test to avoid regression for onRemoteVolumeChanged." into oc-dr1-dev
am:
6407874ae0
Change-Id: Ib0fcc0592a57be6bce184b729f1c25ee02595062
Beverly [Wed, 2 Aug 2017 18:38:00 +0000 (18:38 +0000)]
Merge "Added null test to avoid regression for onRemoteVolumeChanged." into oc-dr1-dev
am:
6407874ae0
Change-Id: I8062e205af16792aa5ae0593795a940fc75813bc
TreeHugger Robot [Wed, 2 Aug 2017 18:35:10 +0000 (18:35 +0000)]
Merge "Use EGL_EXT_gl_colorspace_scrgb instead of *_linear" into oc-dr1-dev
Steven Moreland [Wed, 2 Aug 2017 18:32:39 +0000 (18:32 +0000)]
Merge "Revert "services.core: remove use of -static hidl java"" into oc-dr1-dev-plus-aosp
am:
7ac34b86e5
Change-Id: I104760c6893cd220b97a93b925b95e902cad4b37
Android Build Merger (Role) [Wed, 2 Aug 2017 18:31:35 +0000 (18:31 +0000)]
Merge "Merge "Merge "Fix race condition when destroying view" into oc-dr1-dev am:
b0e5b53bbf am:
e5a48c5bcb" into oc-mr1-dev-plus-aosp am:
2db8b9fa36"
TreeHugger Robot [Wed, 2 Aug 2017 18:30:57 +0000 (18:30 +0000)]
Merge "Remove PDF Thumbnail functionality"
Lucas Dupin [Wed, 2 Aug 2017 18:30:10 +0000 (18:30 +0000)]
Merge "Merge "Fix race condition when destroying view" into oc-dr1-dev am:
b0e5b53bbf am:
e5a48c5bcb" into oc-mr1-dev-plus-aosp
am:
2db8b9fa36
Change-Id: I617e9e86da7ca2d06c41e5a0a975d2fb8c097698
Android Build Merger (Role) [Wed, 2 Aug 2017 18:29:24 +0000 (18:29 +0000)]
Merge "Merge "Fix race condition when destroying view" into oc-dr1-dev am:
b0e5b53bbf am:
aa65f36ffb am:
a7d7e6fbd1"
Lucas Dupin [Wed, 2 Aug 2017 18:27:15 +0000 (18:27 +0000)]
Merge "Fix race condition when destroying view" into oc-dr1-dev am:
b0e5b53bbf am:
aa65f36ffb
am:
a7d7e6fbd1
Change-Id: Ife06974b9fa5ff54232bae8e170a2bbf36736ac3
Android Build Merger (Role) [Wed, 2 Aug 2017 18:25:28 +0000 (18:25 +0000)]
Merge "Merge "Always report a uid's initial cached state." into oc-mr1-dev am:
c134dec17f am:
fe7ff804be"
Steven Moreland [Wed, 2 Aug 2017 18:24:43 +0000 (18:24 +0000)]
Merge "Revert "services.core: remove use of -static hidl java"" into oc-dr1-dev-plus-aosp
Derek Sollenberger [Wed, 2 Aug 2017 18:23:47 +0000 (18:23 +0000)]
Merge "Use colorFilters when rendering to an sRGB bitmap."
Steven Moreland [Wed, 2 Aug 2017 18:23:01 +0000 (18:23 +0000)]
Merge "fingerprint: remove use of -static hidl java" into stage-aosp-master am:
5de8c0ee40 am:
842447df3c
am:
75af963649
Change-Id: I4a04c1e9863de214f77340e6564c05e90c1d659f
TreeHugger Robot [Wed, 2 Aug 2017 18:22:03 +0000 (18:22 +0000)]
Merge "Added null test to avoid regression for onRemoteVolumeChanged." into oc-dr1-dev
Dianne Hackborn [Wed, 2 Aug 2017 18:21:32 +0000 (18:21 +0000)]
Merge "Always report a uid's initial cached state." into oc-mr1-dev am:
c134dec17f
am:
fe7ff804be
Change-Id: I321ab463b66166bebb68389dfb0e03055667ccd2
Steven Moreland [Wed, 2 Aug 2017 18:20:13 +0000 (18:20 +0000)]
Revert "services.core: remove use of -static hidl java"
Changes this depends on are missing from intermediate branches.
This reverts commit
31eb20f06acdbf20570c841198434005e3145e8b.
Change-Id: Ie3c30cf456f922d95ecb8859f0556095a491e2d6
Junda Liu [Wed, 2 Aug 2017 18:17:54 +0000 (18:17 +0000)]
Merge "Deprecate KEY_EDITABLE_TETHER_APN_BOOL." into oc-mr1-dev
am:
858a27c0b6
Change-Id: Id080a91ff04953a6c878ed18551cf71e20742e32
Android Build Merger (Role) [Wed, 2 Aug 2017 18:14:34 +0000 (18:14 +0000)]
Merge "Merge "Fix race condition when destroying view" into oc-dr1-dev am:
b0e5b53bbf am:
e5a48c5bcb" into oc-mr1-dev-plus-aosp
Dianne Hackborn [Wed, 2 Aug 2017 18:14:26 +0000 (18:14 +0000)]
Merge "Improve docs about exceptions through Binder." into oc-mr1-dev am:
6e3af279ab
am:
5a0d703564
Change-Id: I45a971a83f6431e3d9b00c83a2abfd734d3f547f
Steven Moreland [Wed, 2 Aug 2017 18:12:18 +0000 (18:12 +0000)]
Merge "fingerprint: remove use of -static hidl java" into stage-aosp-master am:
5de8c0ee40
am:
842447df3c
Change-Id: I88abe8764bc50e1e1498cb02794c1728ad5bea69
Lucas Dupin [Wed, 2 Aug 2017 18:12:17 +0000 (18:12 +0000)]
Merge "Fix race condition when destroying view" into oc-dr1-dev am:
b0e5b53bbf
am:
e5a48c5bcb
Change-Id: I67e0ca0dd05d4989f3883ad98ed4a9cc58266ee1
Lucas Dupin [Wed, 2 Aug 2017 18:12:06 +0000 (18:12 +0000)]
Merge "Fix race condition when destroying view" into oc-dr1-dev am:
b0e5b53bbf
am:
aa65f36ffb
Change-Id: I197d45d0a274a68a17a3c8d83880d0a75a3b5456
Chad Brubaker [Wed, 2 Aug 2017 18:12:02 +0000 (18:12 +0000)]
Merge "Add owners for the network security config" am:
8773730cd9 am:
e9d50c793a am:
531f1af615 am:
5813bc2b22
am:
13c192f9a1
Change-Id: I6d27a5b1e90333e0db5e94f68f273e758031f9c6
Adrian Roos [Wed, 2 Aug 2017 18:10:21 +0000 (18:10 +0000)]
Merge "LightStatus: Fix notification icon color filter" into oc-dr1-dev am:
6134b7529b am:
f4a92fa5ce
am:
92ae73c22b
Change-Id: I21725b58ec3b986aa75965618aef0daa2ce3272b
TreeHugger Robot [Wed, 2 Aug 2017 18:09:41 +0000 (18:09 +0000)]
Merge "Deprecate KEY_EDITABLE_TETHER_APN_BOOL." into oc-mr1-dev
Steven Moreland [Wed, 2 Aug 2017 18:03:38 +0000 (18:03 +0000)]
Merge "fingerprint: remove use of -static hidl java" into stage-aosp-master
am:
5de8c0ee40
Change-Id: I48d84d0d28d476dae84201b68e943e3ad4dae500
Lucas Dupin [Wed, 2 Aug 2017 18:03:21 +0000 (18:03 +0000)]
Merge "Fix race condition when destroying view" into oc-dr1-dev
am:
b0e5b53bbf
Change-Id: I6e07dca79e8d33522d4f0e9b58dcc48bdff555d2
Lucas Dupin [Wed, 2 Aug 2017 18:03:21 +0000 (18:03 +0000)]
Merge "Fix race condition when destroying view" into oc-dr1-dev
am:
b0e5b53bbf
Change-Id: I57e3c07e9390203a6eb201a314f3887fa7a678cd
Dianne Hackborn [Wed, 2 Aug 2017 18:02:12 +0000 (18:02 +0000)]
Merge "Always report a uid's initial cached state." into oc-mr1-dev
am:
c134dec17f
Change-Id: I5a981e0483a723be7d8fdc22d9b052a97dbb422d
Dianne Hackborn [Wed, 2 Aug 2017 17:59:17 +0000 (17:59 +0000)]
Merge "Improve docs about exceptions through Binder." into oc-mr1-dev
am:
6e3af279ab
Change-Id: Ia69e8ed7db5210284fbfea95be2a2b0a7c6e3052
Selim Cinek [Wed, 2 Aug 2017 17:57:16 +0000 (17:57 +0000)]
Merge "Fixed an issue where icons were jumping" into oc-dr1-dev am:
7a719ab0ed am:
db6902f7ff
am:
19e15baedf
Change-Id: If852247cde0592bc3b4223b59b650c4dd5c9b9ba
TreeHugger Robot [Wed, 2 Aug 2017 17:55:25 +0000 (17:55 +0000)]
Merge "fingerprint: remove use of -static hidl java" into stage-aosp-master
Adrian Roos [Wed, 2 Aug 2017 17:55:21 +0000 (17:55 +0000)]
Merge "LightStatus: Fix notification icon color filter" into oc-dr1-dev am:
6134b7529b am:
c1c890d7fa
am:
29e698f274
Change-Id: Ibd6ed4a432c5a38791f72a282e307213cc5f620b
Selim Cinek [Wed, 2 Aug 2017 17:52:51 +0000 (17:52 +0000)]
Merge "Fixed an issue where icons were jumping" into oc-dr1-dev am:
7a719ab0ed am:
83aa001adf
am:
b66a076820
Change-Id: I92b801e8dc67f808e99bb1c93c5793c20f80fd2a
TreeHugger Robot [Wed, 2 Aug 2017 17:51:48 +0000 (17:51 +0000)]
Merge "Always report a uid's initial cached state." into oc-mr1-dev
Chad Brubaker [Wed, 2 Aug 2017 17:51:46 +0000 (17:51 +0000)]
Merge "Add owners for the network security config" am:
8773730cd9 am:
e9d50c793a am:
531f1af615
am:
5813bc2b22
Change-Id: I649c914986c16b5594219425a391c03e0a9b4390
Dianne Hackborn [Wed, 2 Aug 2017 17:51:01 +0000 (17:51 +0000)]
Merge "Improve docs about exceptions through Binder." into oc-mr1-dev
TreeHugger Robot [Wed, 2 Aug 2017 17:47:59 +0000 (17:47 +0000)]
Merge "Fix race condition when destroying view" into oc-dr1-dev
Adrian Roos [Wed, 2 Aug 2017 17:45:13 +0000 (17:45 +0000)]
Merge "LightStatus: Fix notification icon color filter" into oc-dr1-dev am:
6134b7529b
am:
f4a92fa5ce
Change-Id: Ide9bc1a3b8dae01db77b1faf3c2a05b7f3548aec
Sundong Ahn [Wed, 2 Aug 2017 17:43:02 +0000 (17:43 +0000)]
Merge "Merge "Merge "Add hwbinder library" am:
49e2a9a612 am:
811027ede7 am:
2785be7572" into oc-dr1-dev-plus-aosp am:
a4fb234a4c" into oc-mr1-dev-plus-aosp
am:
577653628b
Change-Id: Iea878b7dd7873e5c818afd34b0a035b38cc44db9
Selim Cinek [Wed, 2 Aug 2017 17:42:21 +0000 (17:42 +0000)]
Merge "Fixed an issue where icons were jumping" into oc-dr1-dev am:
7a719ab0ed
am:
db6902f7ff
Change-Id: Id639f01a3969851294bfcd6746b84bac579da0f7
Chad Brubaker [Wed, 2 Aug 2017 17:41:21 +0000 (17:41 +0000)]
Merge "Add owners for the network security config" am:
8773730cd9 am:
e9d50c793a
am:
531f1af615
Change-Id: I77240a60f796c63acd640b8a43cb7054ad2a8bee
Adrian Roos [Wed, 2 Aug 2017 17:38:02 +0000 (17:38 +0000)]
Merge "LightStatus: Fix notification icon color filter" into oc-dr1-dev am:
6134b7529b
am:
c1c890d7fa
Change-Id: Ib387e9a44e78c7344b6c3efca01302c4aa77483a
Roozbeh Pournader [Wed, 2 Aug 2017 02:30:28 +0000 (19:30 -0700)]
Make InputFilter.AllCaps constructor reject null locales
In I021ff2a97a60396fb1b6e4940d91d3cd6ccb6196, new API for
InputFilter.AllCaps was added. It accepted null as input. This CL
changes that so null locales would be rejected.
Test: bit CtsTextTestCases:android.text.cts.InputFilter_AllCapsTest
Fixes:
64261334
Bug:
37222101
Change-Id: Ic87942c3f341f71bc3c1c833b52ea3e751461e47
Selim Cinek [Wed, 2 Aug 2017 17:36:03 +0000 (17:36 +0000)]
Merge "Fixed an issue where icons were jumping" into oc-dr1-dev am:
7a719ab0ed
am:
83aa001adf
Change-Id: Id8399a6fed722da7057c21e23981bc6925d72e7d
Dake Gu [Wed, 2 Aug 2017 17:34:16 +0000 (17:34 +0000)]
Merge "View: fix setTransientState" into oc-mr1-dev am:
8eb3a3979f
am:
8701a3231b
Change-Id: Id7c933c23d472184ff7d8b91d1587bcb0853207e
Steven Moreland [Wed, 2 Aug 2017 17:32:43 +0000 (17:32 +0000)]
Merge "services.core: remove use of -static hidl java" into oc-dr1-dev-plus-aosp am:
3750937e70
am:
5a37624e4a
Change-Id: I9fef0f8d0f5cebb546f371ac533521d88759f352
Android Build Merger (Role) [Wed, 2 Aug 2017 17:32:08 +0000 (17:32 +0000)]
Merge "Merge "Merge "Add hwbinder library" am:
49e2a9a612 am:
811027ede7 am:
2785be7572" into oc-dr1-dev-plus-aosp am:
a4fb234a4c" into oc-mr1-dev-plus-aosp
Adrian Roos [Wed, 2 Aug 2017 17:31:17 +0000 (17:31 +0000)]
Merge "LightStatus: Fix notification icon color filter" into oc-dr1-dev
am:
6134b7529b
Change-Id: I0f6b682d53f764c93d1c1c48490cf1427857b1b4
Adrian Roos [Wed, 2 Aug 2017 17:30:33 +0000 (17:30 +0000)]
Merge "LightStatus: Fix notification icon color filter" into oc-dr1-dev
am:
6134b7529b
Change-Id: Ib68dcc833b2a25466b147e8c406fa6bbd8517e02
Dake Gu [Wed, 2 Aug 2017 17:27:53 +0000 (17:27 +0000)]
Merge "View: fix setTransientState" into oc-mr1-dev
am:
8eb3a3979f
Change-Id: I85950ec6275c2d10bd0e9b7f030fa5ce2c66130c
Chad Brubaker [Wed, 2 Aug 2017 17:27:51 +0000 (17:27 +0000)]
Merge "Add owners for the network security config" am:
8773730cd9
am:
e9d50c793a
Change-Id: Id183ac68171c94d082c992bd3e986c136d6c7764
Selim Cinek [Wed, 2 Aug 2017 17:27:48 +0000 (17:27 +0000)]
Merge "Fixed an issue where icons were jumping" into oc-dr1-dev
am:
7a719ab0ed
Change-Id: I5e983a7275e1dc117c1c70d6ae7be14b121d5c54
Selim Cinek [Wed, 2 Aug 2017 17:27:46 +0000 (17:27 +0000)]
Merge "Fixed an issue where icons were jumping" into oc-dr1-dev
am:
7a719ab0ed
Change-Id: I145e868610a92ba1af501c62b151c7f55663bec3
Sundong Ahn [Wed, 2 Aug 2017 17:27:38 +0000 (17:27 +0000)]
Merge "Merge "Add hwbinder library" am:
49e2a9a612 am:
811027ede7 am:
2785be7572" into oc-dr1-dev-plus-aosp
am:
a4fb234a4c
Change-Id: I026ca8c33ef2fce7d40e2daec8db970d6b578f25
Steven Moreland [Wed, 2 Aug 2017 17:23:53 +0000 (17:23 +0000)]
Merge "services.core: remove use of -static hidl java" into oc-dr1-dev-plus-aosp
am:
3750937e70
Change-Id: I58257cf8a3f97ffec4cfef3a58ab8b87194295ea
Adrian Roos [Wed, 2 Aug 2017 17:23:31 +0000 (17:23 +0000)]
Merge "LightStatus: Fix notification icon color filter" into oc-dr1-dev
Chad Brubaker [Wed, 2 Aug 2017 17:20:16 +0000 (17:20 +0000)]
Merge "Add owners for the network security config"
am:
8773730cd9
Change-Id: I18b8aac4c1ac85bde3e6735e1afe6375f5c0e177
Stan Iliev [Wed, 2 Aug 2017 17:19:27 +0000 (17:19 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise" am:
8c9e5c81ad am:
98eaf41eec am:
fb3f29b608 am:
ccd3121379
am:
18e6f9c8ee
Change-Id: Id564f185689b3b9cd023d9467c664796ba7522ec
Dake Gu [Wed, 2 Aug 2017 17:18:00 +0000 (17:18 +0000)]
Merge "View: fix setTransientState" into oc-mr1-dev
Android Build Merger (Role) [Wed, 2 Aug 2017 17:16:57 +0000 (17:16 +0000)]
Merge "Merge "Add hwbinder library" am:
49e2a9a612 am:
811027ede7 am:
2785be7572" into oc-dr1-dev-plus-aosp
TreeHugger Robot [Wed, 2 Aug 2017 17:16:18 +0000 (17:16 +0000)]
Merge "Fixed an issue where icons were jumping" into oc-dr1-dev
Sundong Ahn [Wed, 2 Aug 2017 17:14:55 +0000 (17:14 +0000)]
Merge "Add hwbinder library" am:
49e2a9a612 am:
811027ede7
am:
2785be7572
Change-Id: Ia545b163166465cafa3d4ecbb0a5d0d911224b22
TreeHugger Robot [Wed, 2 Aug 2017 17:14:31 +0000 (17:14 +0000)]
Merge "services.core: remove use of -static hidl java" into oc-dr1-dev-plus-aosp
Stan Iliev [Wed, 2 Aug 2017 17:10:57 +0000 (17:10 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise" am:
8c9e5c81ad am:
98eaf41eec am:
fb3f29b608
am:
ccd3121379
Change-Id: I4f96e688549840198dee57cd85c4362d23e564d8
Treehugger Robot [Wed, 2 Aug 2017 17:10:11 +0000 (17:10 +0000)]
Merge "Add owners for the network security config"
Sundong Ahn [Wed, 2 Aug 2017 17:05:56 +0000 (17:05 +0000)]
Merge "Add hwbinder library" am:
49e2a9a612
am:
811027ede7
Change-Id: Idec0d080a65d96ff866969f47e9902e40e800fdf
Stan Iliev [Wed, 2 Aug 2017 17:01:17 +0000 (17:01 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise" am:
8c9e5c81ad am:
98eaf41eec
am:
fb3f29b608
Change-Id: I29cbdb6b741f0e4d84a12269607cdd32c6a51a74
Sundong Ahn [Wed, 2 Aug 2017 16:57:50 +0000 (16:57 +0000)]
Merge "Add hwbinder library"
am:
49e2a9a612
Change-Id: I3c7528dcf98bf3b92843594172531fd30a5f29d4
Stan Iliev [Wed, 2 Aug 2017 16:52:20 +0000 (16:52 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise" am:
8c9e5c81ad
am:
98eaf41eec
Change-Id: I3760a36d915f495fe8d4e457982440ff61934a6b
Nick Felker [Fri, 28 Jul 2017 02:35:51 +0000 (19:35 -0700)]
Adds POUND and STAR keys to Generic_Iot.kl
A following change will update the InputDriver-JNI
to take advantage of the new keys.
Bug:
64083153
Test: Building source and testing with InputDriver
Change-Id: I94c9d59ecf7f7278f2ec61c68c4eb80aa65f142c
Treehugger Robot [Wed, 2 Aug 2017 16:46:42 +0000 (16:46 +0000)]
Merge "Add hwbinder library"
Steve McKay [Tue, 1 Aug 2017 22:02:50 +0000 (15:02 -0700)]
Add metadata support to MTP docs provider.
Remove convenience method from DocumentsProvider, clients to use MetadataReader directly.
Concentrate mimetype checking in MetadataReader.isSupportedType.
Update FileSystemProvider to use MetadataReader directly.
Test: Updated mtp tests. Other functioanlity manually verified.
Change-Id: Ie1e3d3092b53107f6c980c18b1451290dd2a9653
Stan Iliev [Wed, 2 Aug 2017 16:44:22 +0000 (16:44 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise"
am:
8c9e5c81ad
Change-Id: I5d696089e13dc68115451c223646ef5e0688b330
Felipe Leme [Wed, 2 Aug 2017 16:31:46 +0000 (16:31 +0000)]
Merge "Merge "Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am:
c8f0fd7076 am:
6f9f17475d" into oc-dr1-dev-plus-aosp am:
e3e338ed08" into oc-mr1-dev-plus-aosp
am:
71aebd1b25
Change-Id: I336989ba5e3cd6a3bfe7da0ba624f368352731ad
Felipe Leme [Wed, 2 Aug 2017 16:29:47 +0000 (16:29 +0000)]
Merge "Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am:
c8f0fd7076 am:
32d4e30778 am:
23123ece60" into oc-mr1-dev-plus-aosp
am:
f547615eae
Change-Id: I4b1c21c469eac345281b07601aa053f7d5665b7a
OSDN Git Service
