OSDN Git Service
Lorenzo Colitti [Fri, 23 Jan 2015 13:01:42 +0000 (13:01 +0000)]
am
50f9d93a: am
ae38596b: Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev
* commit '
50f9d93a1c6f3d9f28966dd61997b4b780f31fb2':
Support connecting to networks with misconfigured subnet masks.
Lorenzo Colitti [Fri, 23 Jan 2015 12:56:58 +0000 (12:56 +0000)]
am
ae38596b: Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev
* commit '
ae38596bcf2a077753d170c0cad68f4dfde4277b':
Support connecting to networks with misconfigured subnet masks.
Lorenzo Colitti [Fri, 23 Jan 2015 12:50:31 +0000 (12:50 +0000)]
Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev
Lorenzo Colitti [Tue, 20 Jan 2015 06:53:02 +0000 (15:53 +0900)]
Support connecting to networks with misconfigured subnet masks.
In K and earlier, we would connect to a network where the gateway
was not covered by the subnet mask of the IP address. This is an
invalid configuration, but it used to work, and other OSes appear
to accept it too, so support it.
Bug:
19067207
Change-Id: I822e1d754b336691b675438eefa959a3d75fd07b
Narayan Kamath [Fri, 23 Jan 2015 10:54:44 +0000 (10:54 +0000)]
Merge "Remove superfluous OpenSSL include paths." automerge:
fe24754
automerge:
d555cd5
* commit '
d555cd550d634192e96e3b834f91aa9559a259db':
Remove superfluous OpenSSL include paths.
Narayan Kamath [Fri, 23 Jan 2015 10:50:41 +0000 (10:50 +0000)]
Merge "Remove superfluous OpenSSL include paths."
automerge:
fe24754
* commit '
fe24754fd69e75829c748b56e5806f1603835db9':
Remove superfluous OpenSSL include paths.
Narayan Kamath [Fri, 23 Jan 2015 10:47:34 +0000 (10:47 +0000)]
Merge "Remove superfluous OpenSSL include paths."
Jinsuk Kim [Fri, 23 Jan 2015 08:23:27 +0000 (08:23 +0000)]
am
3379c1cb: Fix broken build
automerge:
2652c57
* commit '
2652c57257416f088de3e5b359f36a63e3cbe91d':
Fix broken build
Jinsuk Kim [Fri, 23 Jan 2015 08:19:56 +0000 (08:19 +0000)]
am
3379c1cb: Fix broken build
* commit '
3379c1cb62488393c2c49b5f38483656c7175fa1':
Fix broken build
Jinsuk Kim [Fri, 23 Jan 2015 08:13:28 +0000 (17:13 +0900)]
Fix broken build
Updated system-current.txt
Change-Id: I1f80d5543f0a828cf59d50d1271916a1210674d3
Jinsuk Kim [Fri, 23 Jan 2015 07:00:40 +0000 (07:00 +0000)]
am
76cf0355: Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev
automerge:
9ae7d49
* commit '
9ae7d4975ce471a7b295282ca999cb20a6cbb273':
CEC: Add logic to return to internal source
Jinsuk Kim [Fri, 23 Jan 2015 06:56:24 +0000 (06:56 +0000)]
am
76cf0355: Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev
* commit '
76cf035513d843c66d2fafe85b6a37c4c19b9223':
CEC: Add logic to return to internal source
Jinsuk Kim [Fri, 23 Jan 2015 06:51:57 +0000 (06:51 +0000)]
Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev
Lorenzo Colitti [Fri, 23 Jan 2015 06:06:57 +0000 (06:06 +0000)]
am
78d51c22: Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev
automerge:
fbaf6b3
* commit '
fbaf6b353dc9b7218b340acf629b06ae8e0101bb':
Use the proper IpPrefix and LinkAddress constructors in VPN code.
Lorenzo Colitti [Fri, 23 Jan 2015 06:03:46 +0000 (06:03 +0000)]
am
78d51c22: Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev
* commit '
78d51c2292b5a3b56be1b1e92bc67b70f4eebce4':
Use the proper IpPrefix and LinkAddress constructors in VPN code.
Lorenzo Colitti [Fri, 23 Jan 2015 05:57:37 +0000 (05:57 +0000)]
Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev
Lorenzo Colitti [Tue, 20 Jan 2015 04:40:58 +0000 (13:40 +0900)]
Use the proper IpPrefix and LinkAddress constructors in VPN code.
This simplifies the code, and also makes it possible for
users to point multicast routes at the VPN. The LinkAddress
objects we were previously using to construct the RouteInfo do
not accept these, but IpPrefix objects do.
Bug:
18485968
Change-Id: Ie914a2eb359b78161810ee473df725059f944f4e
Adam Lesinski [Fri, 23 Jan 2015 02:46:32 +0000 (02:46 +0000)]
Merge "AAPT: Use the right enum when checking for density configurations" into lmp-mr1-dev automerge:
b443610
automerge:
83f58a2
* commit '
83f58a2f7afac98199536b3090fe6f767ffb3a0d':
AAPT: Use the right enum when checking for density configurations
Adam Lesinski [Fri, 23 Jan 2015 02:36:39 +0000 (02:36 +0000)]
Merge "AAPT: Use the right enum when checking for density configurations" into lmp-mr1-dev
automerge:
b443610
* commit '
b443610bcb9a1f0d8e64b55c7d6e53bc54d7ec43':
AAPT: Use the right enum when checking for density configurations
Adam Lesinski [Fri, 23 Jan 2015 02:29:49 +0000 (02:29 +0000)]
Merge "AAPT: Use the right enum when checking for density configurations" into lmp-mr1-dev
Adam Lesinski [Fri, 23 Jan 2015 02:19:44 +0000 (18:19 -0800)]
AAPT: Use the right enum when checking for density configurations
Bug:
19116675
Change-Id: I2322d8d6bdf890005c80014273e5d07df735ed50
Adam Langley [Fri, 23 Jan 2015 01:15:13 +0000 (17:15 -0800)]
Remove superfluous OpenSSL include paths.
The libcrypto and libssl modules (and their respective static and host
versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module
is sufficient.
Change-Id: I467f1b1d038b5136fa22b1230da134c394eac54e
Eino-Ville Talvala [Fri, 23 Jan 2015 00:31:41 +0000 (00:31 +0000)]
Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lmp-mr1-dev automerge:
7fde5e5
automerge:
0ec0465
* commit '
0ec0465542ba41634ed13dd6bae2eca6afa62d4a':
Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)
Eino-Ville Talvala [Fri, 23 Jan 2015 00:08:32 +0000 (00:08 +0000)]
Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lmp-mr1-dev
automerge:
7fde5e5
* commit '
7fde5e5ba3d306bc694e2b97edf5892755fcb6d0':
Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)
Eino-Ville Talvala [Fri, 23 Jan 2015 00:05:25 +0000 (00:05 +0000)]
Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lmp-mr1-dev
Craig Mautner [Thu, 22 Jan 2015 23:37:51 +0000 (23:37 +0000)]
Merge "Even more debug for bug
17721767." into lmp-mr1-dev automerge:
dbabf37
automerge:
5cb31f2
* commit '
5cb31f2179c70152f94bcb8309449fc2e7bed63a':
Even more debug for bug
17721767.
Craig Mautner [Thu, 22 Jan 2015 23:24:11 +0000 (23:24 +0000)]
Merge "Even more debug for bug
17721767." into lmp-mr1-dev
automerge:
dbabf37
* commit '
dbabf37fd3a6b70be5cf9639f11656e12601154d':
Even more debug for bug
17721767.
Craig Mautner [Thu, 22 Jan 2015 23:17:46 +0000 (23:17 +0000)]
Merge "Even more debug for bug
17721767." into lmp-mr1-dev
Craig Mautner [Thu, 22 Jan 2015 22:28:03 +0000 (14:28 -0800)]
Even more debug for bug
17721767.
This time adding events for stack movement and focus change.
Change-Id: Icdff9763ac2daf85c615992fa2c8e418e907908c
Jason Sams [Thu, 22 Jan 2015 21:18:16 +0000 (21:18 +0000)]
am
de56e38e: Merge "Fix default compute thread priority" automerge:
231df77
* commit '
de56e38e9e8f7f4a54633b66e2952cea776d6ab5':
Fix default compute thread priority
Jason Sams [Thu, 22 Jan 2015 21:18:02 +0000 (21:18 +0000)]
am
712b05d0: Merge "Add FP16 types to the list of RenderScript types." automerge:
081cda8
* commit '
712b05d00b00a6148852e153ef76dfb5960623e9':
Add FP16 types to the list of RenderScript types.
Jason Sams [Thu, 22 Jan 2015 21:12:38 +0000 (21:12 +0000)]
Merge "Fix default compute thread priority"
automerge:
231df77
* commit '
231df77eff4e31fead0dfadee6ea6ead980b24ea':
Fix default compute thread priority
Jason Sams [Thu, 22 Jan 2015 21:11:08 +0000 (21:11 +0000)]
Merge "Add FP16 types to the list of RenderScript types."
automerge:
081cda8
* commit '
081cda87e1ed7d1c0f30408dbc6635afc48d98a0':
Add FP16 types to the list of RenderScript types.
Jason Sams [Thu, 22 Jan 2015 21:08:44 +0000 (21:08 +0000)]
Merge "Fix default compute thread priority"
Jason Sams [Thu, 22 Jan 2015 21:08:03 +0000 (21:08 +0000)]
Merge "Add FP16 types to the list of RenderScript types."
Ying Wang [Thu, 22 Jan 2015 20:47:28 +0000 (20:47 +0000)]
am
abbf8d41: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev
* commit '
abbf8d419422f8bd0a3a6c5d9a266f21663c4dc4':
Ying Wang [Thu, 22 Jan 2015 20:47:22 +0000 (20:47 +0000)]
am
301e1def: am
24328660: Merge "Check in "current" system API files." into lmp-mr1-dev
* commit '
301e1def7ab741830e1fbc02a291ff295a36c345':
Check in "current" system API files.
Ying Wang [Thu, 22 Jan 2015 20:41:46 +0000 (20:41 +0000)]
Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev
Ying Wang [Thu, 22 Jan 2015 20:41:13 +0000 (20:41 +0000)]
am
24328660: Merge "Check in "current" system API files." into lmp-mr1-dev
* commit '
24328660c8f4f52647022fd0887978b74d607e06':
Check in "current" system API files.
Ying Wang [Thu, 22 Jan 2015 20:39:52 +0000 (20:39 +0000)]
Merge "Check in "current" system API files." into lmp-mr1-dev
automerge:
2432866
* commit '
24328660c8f4f52647022fd0887978b74d607e06':
Check in "current" system API files.
Ying Wang [Thu, 22 Jan 2015 20:36:05 +0000 (20:36 +0000)]
Merge "Check in "current" system API files." into lmp-mr1-dev
Ricardo Cervera [Thu, 22 Jan 2015 18:39:26 +0000 (18:39 +0000)]
am
0f400778: am
02d093ca: am
bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs automerge:
65ab86c automerge:
4386d85
* commit '
0f400778714f0357672651868146be73431d0b98':
docs: Fixes to the watch faces design guidelines
Ricardo Cervera [Thu, 22 Jan 2015 18:34:20 +0000 (18:34 +0000)]
am
02d093ca: am
bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs automerge:
65ab86c
automerge:
4386d85
* commit '
4386d856a8ced336d08dd82395b52f30d0c122ae':
docs: Fixes to the watch faces design guidelines
Ricardo Cervera [Thu, 22 Jan 2015 18:27:57 +0000 (18:27 +0000)]
am
02d093ca: am
bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs
automerge:
65ab86c
* commit '
65ab86cf1ad414612ac57e14f581e0ffb1819e14':
docs: Fixes to the watch faces design guidelines
Jason Monk [Thu, 22 Jan 2015 18:04:57 +0000 (18:04 +0000)]
Merge "QS: Fix second line in dual tiles" into lmp-mr1-dev automerge:
959ff1d
automerge:
485ee97
* commit '
485ee978306b4df3f2982a3fc692dcb48a8adb08':
QS: Fix second line in dual tiles
Ricardo Cervera [Thu, 22 Jan 2015 18:02:30 +0000 (18:02 +0000)]
am
02d093ca: am
bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs
* commit '
02d093ca675535f1a7f702a9fffd277123cea8ca':
docs: Fixes to the watch faces design guidelines
Jason Monk [Thu, 22 Jan 2015 17:59:13 +0000 (17:59 +0000)]
Merge "QS: Fix second line in dual tiles" into lmp-mr1-dev
automerge:
959ff1d
* commit '
959ff1d3a991b20140843187b2fb08c5a96c202b':
QS: Fix second line in dual tiles
Luan Nguyen [Thu, 22 Jan 2015 17:57:01 +0000 (17:57 +0000)]
am
2700393c: am
edb9ba54: am
1dd76ea2: docs: Fix companion configuration (
18864041) Fix declaration of var and incorrect method call (
18617393) automerge:
6117147 automerge:
563e767
* commit '
2700393c029baf9443622440f5ebad5073429075':
docs: Fix companion configuration (
18864041) Fix declaration of var and incorrect method call (
18617393)
Ricardo Cervera [Thu, 22 Jan 2015 17:56:54 +0000 (17:56 +0000)]
am
bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs
* commit '
bdfcd56e7f01b7bb1f50c932792b9528c67892e5':
docs: Fixes to the watch faces design guidelines
Ricardo Cervera [Thu, 22 Jan 2015 17:50:47 +0000 (17:50 +0000)]
Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs
Luan Nguyen [Thu, 22 Jan 2015 17:49:27 +0000 (17:49 +0000)]
am
edb9ba54: am
1dd76ea2: docs: Fix companion configuration (
18864041) Fix declaration of var and incorrect method call (
18617393) automerge:
6117147
automerge:
563e767
* commit '
563e767a51357ed55c3fc53047fb9f94e4ef3c31':
docs: Fix companion configuration (
18864041) Fix declaration of var and incorrect method call (
18617393)
Jason Monk [Thu, 22 Jan 2015 17:49:04 +0000 (17:49 +0000)]
Merge "QS: Fix second line in dual tiles" into lmp-mr1-dev
Ricardo Cervera [Wed, 14 Jan 2015 16:29:38 +0000 (08:29 -0800)]
docs: Fixes to the watch faces design guidelines
Bug:
19001253
Change-Id: I356b887de71710afa27acc7544d0efdc3a857e91
Luan Nguyen [Thu, 22 Jan 2015 17:44:45 +0000 (17:44 +0000)]
am
edb9ba54: am
1dd76ea2: docs: Fix companion configuration (
18864041) Fix declaration of var and incorrect method call (
18617393)
automerge:
6117147
* commit '
61171477918ea55c70c706f062019f5cd2194043':
docs: Fix companion configuration (
18864041) Fix declaration of var and incorrect method call (
18617393)
Luan Nguyen [Thu, 22 Jan 2015 17:35:31 +0000 (17:35 +0000)]
am
edb9ba54: am
1dd76ea2: docs: Fix companion configuration (
18864041) Fix declaration of var and incorrect method call (
18617393)
* commit '
edb9ba54f7be81faacda4ee36824c6f8cd314fb3':
docs: Fix companion configuration (
18864041) Fix declaration of var and incorrect method call (
18617393)
Luan Nguyen [Thu, 22 Jan 2015 17:29:30 +0000 (17:29 +0000)]
am
1dd76ea2: docs: Fix companion configuration (
18864041) Fix declaration of var and incorrect method call (
18617393)
* commit '
1dd76ea2760f84496a5b82435fc35d7c28a6dd6d':
docs: Fix companion configuration (
18864041) Fix declaration of var and incorrect method call (
18617393)
Luan Nguyen [Wed, 21 Jan 2015 23:16:36 +0000 (15:16 -0800)]
docs: Fix companion configuration (
18864041)
Fix declaration of var and incorrect method call (
18617393)
bug:
18864041
bug:
18617393
Change-Id: Ic31e44acfe7338f56acdbbd97ba8cc1e87042b53
Jason Monk [Thu, 22 Jan 2015 15:39:37 +0000 (10:39 -0500)]
QS: Fix second line in dual tiles
QSDualTileLabel is no longer a FrameLayout (now a LinearLayout),
so it does not need the top padding based on the caret size
anymore.
Bug:
18725348
Change-Id: Ibd3aaa20e7cdb35ba585cc5c8981c64efb5c66fe
Jason Monk [Thu, 22 Jan 2015 14:22:13 +0000 (14:22 +0000)]
Merge "Show connect dialog when selecting secure QS wifi" into lmp-mr1-dev automerge:
1a5ac5b
automerge:
3c55689
* commit '
3c556895edf01af562a16970ea3aecfd7dc51da7':
Show connect dialog when selecting secure QS wifi
Jason Monk [Thu, 22 Jan 2015 14:14:41 +0000 (14:14 +0000)]
Merge "Show connect dialog when selecting secure QS wifi" into lmp-mr1-dev
automerge:
1a5ac5b
* commit '
1a5ac5b415fea8098686aa08bffc6da3ada31938':
Show connect dialog when selecting secure QS wifi
Jason Monk [Thu, 22 Jan 2015 14:11:52 +0000 (14:11 +0000)]
Merge "Show connect dialog when selecting secure QS wifi" into lmp-mr1-dev
Narayan Kamath [Thu, 22 Jan 2015 13:56:01 +0000 (13:56 +0000)]
Merge "Add support for persist.sys.locale." automerge:
dca2332
automerge:
117f161
* commit '
117f161fee52dfa200f89282c487d58c29b41d4f':
Add support for persist.sys.locale.
Narayan Kamath [Thu, 22 Jan 2015 13:52:19 +0000 (13:52 +0000)]
Merge "Add support for persist.sys.locale."
automerge:
dca2332
* commit '
dca23321c6f5f0713e7910158f4c874812975077':
Add support for persist.sys.locale.
Narayan Kamath [Thu, 22 Jan 2015 13:49:43 +0000 (13:49 +0000)]
Merge "Add support for persist.sys.locale."
Narayan Kamath [Thu, 15 Jan 2015 14:48:15 +0000 (14:48 +0000)]
Add support for persist.sys.locale.
AndroidRuntime has been changed to read "ro.product.locale" and
"persist.sys.locale" instead of "ro.product.locale.language" etc.
This is passed down as "-Duser.locale" to the runtime.
The system_server has been changed to write out persist.sys.locale
on locale changes.
bug:
17691569
Change-Id: I93360c8795c9620a133656dc491d13d7b6ed162e
Nicolas Prevot [Thu, 22 Jan 2015 10:32:30 +0000 (10:32 +0000)]
am
3677117d: Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev automerge:
ad44f74
* commit '
3677117d2bc8b703ccad4eff5914a61508922dd6':
Never set "Work" or "Personal apps" as prefered activities.
Nicolas Prevot [Thu, 22 Jan 2015 10:24:49 +0000 (10:24 +0000)]
Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev
automerge:
ad44f74
* commit '
ad44f7448f0b9aa672cad21300f436e369c8105d':
Never set "Work" or "Personal apps" as prefered activities.
Nicolas Prevot [Thu, 22 Jan 2015 10:22:05 +0000 (10:22 +0000)]
Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev
Jinsuk Kim [Mon, 19 Jan 2015 03:39:06 +0000 (12:39 +0900)]
CEC: Add logic to return to internal source
This CL introduces a logic that, upon receiving <Inactive Source>
from the active source or a corresponding MHL subcommand, lets
the service return to one of internal inputs.
Introduced to handle it is a new type for HdmiDevice (INACTIVE)
that will be passed to input change listeners. The callback
is expected to transform to other mechanism such as intent,
to let TV app to decide which input to switch to, which will
be one of non-HDMI input that was viewed previously.
Bug:
19008579
Change-Id: I1922f4cd20e9220411061bb9d9fbe5fbc5676d48
Erik Kline [Thu, 22 Jan 2015 07:18:00 +0000 (07:18 +0000)]
Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev automerge:
147cf4b
automerge:
4f36150
* commit '
4f3615036db441c4a099dc789ebcdf641ac5a987':
Log interface name and uid when filtering a blocked network.
Erik Kline [Thu, 22 Jan 2015 07:10:58 +0000 (07:10 +0000)]
Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev
automerge:
147cf4b
* commit '
147cf4b8c4345f2d086251313583888356317d2d':
Log interface name and uid when filtering a blocked network.
Erik Kline [Thu, 22 Jan 2015 07:07:35 +0000 (07:07 +0000)]
Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev
Jim Miller [Thu, 22 Jan 2015 02:45:16 +0000 (02:45 +0000)]
am
0ac8dfa3: Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev automerge:
ffd1a49
* commit '
0ac8dfa37bf089ade3760a8d703c6a79d98f5ca2':
Clarify getTrustAgentConfiguration() documentation.
Jim Miller [Thu, 22 Jan 2015 02:40:15 +0000 (02:40 +0000)]
Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev
automerge:
ffd1a49
* commit '
ffd1a49c0b8e442aea73c4f5336ea486492981f6':
Clarify getTrustAgentConfiguration() documentation.
Jim Miller [Thu, 22 Jan 2015 02:37:38 +0000 (02:37 +0000)]
Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev
Jinsuk Kim [Thu, 22 Jan 2015 02:27:26 +0000 (02:27 +0000)]
am
c988e15e: Merge "CEC: Let playback device switch TV input after bootup" into lmp-mr1-dev automerge:
7de1ed9
* commit '
c988e15e1ff8e85981e7cd3347d759b37be1cf2f':
CEC: Let playback device switch TV input after bootup
Jinsuk Kim [Thu, 22 Jan 2015 02:21:59 +0000 (02:21 +0000)]
Merge "CEC: Let playback device switch TV input after bootup" into lmp-mr1-dev
automerge:
7de1ed9
* commit '
7de1ed9d631ecabdf148e4e85bfc2f7f1698a77d':
CEC: Let playback device switch TV input after bootup
Jinsuk Kim [Thu, 22 Jan 2015 02:19:36 +0000 (02:19 +0000)]
Merge "CEC: Let playback device switch TV input after bootup" into lmp-mr1-dev
Wonsik Kim [Thu, 22 Jan 2015 02:02:39 +0000 (02:02 +0000)]
am
67add1d2: Merge "TIF: TvInputHardwareManager puts multiple sink ports into audio patch" into lmp-mr1-dev automerge:
0313a0e
* commit '
67add1d26257eb298918a6e2c75f21afd59dadba':
TIF: TvInputHardwareManager puts multiple sink ports into audio patch
Wonsik Kim [Thu, 22 Jan 2015 01:54:49 +0000 (01:54 +0000)]
Merge "TIF: TvInputHardwareManager puts multiple sink ports into audio patch" into lmp-mr1-dev
automerge:
0313a0e
* commit '
0313a0e9b786f9d5d83113d574bcc8f27f2206dc':
TIF: TvInputHardwareManager puts multiple sink ports into audio patch
Wonsik Kim [Thu, 22 Jan 2015 01:52:06 +0000 (01:52 +0000)]
Merge "TIF: TvInputHardwareManager puts multiple sink ports into audio patch" into lmp-mr1-dev
Miao Wang [Thu, 22 Jan 2015 01:26:24 +0000 (01:26 +0000)]
Merge "[Renderscript] Add check for Allocation.copyTo(Array) and Fix the input allocation type check for Histogram Intrinsic." into lmp-mr1-dev automerge:
dbfcf3f
automerge:
a710b83
* commit '
a710b839a23633bb049a6f91ccd7e17261e406a4':
[Renderscript] Add check for Allocation.copyTo(Array) and Fix the input allocation type check for Histogram Intrinsic.
Miao Wang [Thu, 22 Jan 2015 01:19:28 +0000 (01:19 +0000)]
Merge "[Renderscript] Add check for Allocation.copyTo(Array) and Fix the input allocation type check for Histogram Intrinsic." into lmp-mr1-dev
automerge:
dbfcf3f
* commit '
dbfcf3f812c78d1e76c317b8f200488dcaea4d77':
[Renderscript] Add check for Allocation.copyTo(Array) and Fix the input allocation type check for Histogram Intrinsic.
Miao Wang [Thu, 22 Jan 2015 01:16:29 +0000 (01:16 +0000)]
Merge "[Renderscript] Add check for Allocation.copyTo(Array) and Fix the input allocation type check for Histogram Intrinsic." into lmp-mr1-dev
Eino-Ville Talvala [Tue, 20 Jan 2015 20:30:59 +0000 (12:30 -0800)]
Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)
Add missing implementation.
Also improve docs for flexible Surface sources.
Bug:
19076351
Change-Id: I1f1126a291480dcb68d3dd90825b5994e54dcc99
Craig Mautner [Thu, 22 Jan 2015 00:36:10 +0000 (00:36 +0000)]
am
d56352db: am
c79a8ea0: Merge "Resume home activity can skip resume and cause ANR. DO NOT MERGE" into lmp-mr1-dev
* commit '
d56352dbcb447ed0a93f2d46183e6217800add80':
Resume home activity can skip resume and cause ANR. DO NOT MERGE
Craig Mautner [Thu, 22 Jan 2015 00:29:56 +0000 (00:29 +0000)]
am
c79a8ea0: Merge "Resume home activity can skip resume and cause ANR. DO NOT MERGE" into lmp-mr1-dev
* commit '
c79a8ea0c4e1cb30c667f84276820f7e14bfb3b1':
Resume home activity can skip resume and cause ANR. DO NOT MERGE
Craig Mautner [Thu, 22 Jan 2015 00:25:17 +0000 (00:25 +0000)]
Merge "Resume home activity can skip resume and cause ANR. DO NOT MERGE" into lmp-mr1-dev
Jason Sams [Wed, 21 Jan 2015 20:55:14 +0000 (12:55 -0800)]
Fix default compute thread priority
bug
16651474
Compute inherited graphics default thread priority of Display. This
was not intended.
Change-Id: I0dd9a230ce8ceba64e971b024cbe518927cd2550
Robert Greenwalt [Thu, 22 Jan 2015 00:00:43 +0000 (00:00 +0000)]
am
ab42bbb9: Merge "Fix legacy request removal." into lmp-mr1-dev
automerge:
9e7cb40
* commit '
9e7cb40ddf055ecf1033555bd9ed90922a3cfa9b':
Fix legacy request removal.
Robert Greenwalt [Wed, 21 Jan 2015 23:59:09 +0000 (23:59 +0000)]
am
7ca16ff8: Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev
automerge:
0343e1a
* commit '
0343e1a7042e34589a52b4bf4a0afdcb2d51fc7d':
Rerun entitlementcheck on sim change.
Robert Greenwalt [Wed, 21 Jan 2015 23:56:07 +0000 (23:56 +0000)]
am
ab42bbb9: Merge "Fix legacy request removal." into lmp-mr1-dev
* commit '
ab42bbb9024d10579a913049147f6fc25b57df83':
Fix legacy request removal.
Robert Greenwalt [Wed, 21 Jan 2015 23:56:02 +0000 (23:56 +0000)]
am
7ca16ff8: Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev
* commit '
7ca16ff8c6133b211d6163bd17847ed3eaa1948a':
Rerun entitlementcheck on sim change.
Robert Greenwalt [Wed, 21 Jan 2015 23:50:26 +0000 (23:50 +0000)]
Merge "Fix legacy request removal." into lmp-mr1-dev
Robert Greenwalt [Wed, 21 Jan 2015 23:49:11 +0000 (23:49 +0000)]
Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev
Andrew Solovay [Wed, 21 Jan 2015 23:46:27 +0000 (23:46 +0000)]
am
a1838a9d: am
78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs automerge:
e628954 automerge:
d4cf09d automerge:
63e822d
* commit '
a1838a9d78eeadc0e578e250b9ff71b1f720148e':
docs: WebView security notes for apps on pre-K devices
Luan Nguyen [Wed, 21 Jan 2015 23:46:20 +0000 (23:46 +0000)]
am
349e3b5a: am
f082f898: Merge "docs: Fix conditional in ambient mode check method (
18832168). Fix issue with non existent variable (
18832287). Fix issue with outdated instructions (
18832293). Fix issue with misleading time tick (
18832171)." into lmp-docs automerge:
* commit '
349e3b5ad1e3d2f55fadce05a3726f27c8a2b5d5':
docs: Fix conditional in ambient mode check method (
18832168). Fix issue with non existent variable (
18832287). Fix issue with outdated instructions (
18832293). Fix issue with misleading time tick (
18832171).
Andrew Solovay [Wed, 21 Jan 2015 23:40:51 +0000 (23:40 +0000)]
am
78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs automerge:
e628954 automerge:
d4cf09d
automerge:
63e822d
* commit '
63e822df58b056e35a8a405103b53a2a033c7d33':
docs: WebView security notes for apps on pre-K devices
Luan Nguyen [Wed, 21 Jan 2015 23:39:29 +0000 (23:39 +0000)]
am
f082f898: Merge "docs: Fix conditional in ambient mode check method (
18832168). Fix issue with non existent variable (
18832287). Fix issue with outdated instructions (
18832293). Fix issue with misleading time tick (
18832171)." into lmp-docs automerge:
8884eda automerge:
de9bd40
automerge:
2b01cfb
* commit '
2b01cfbefcdb07640d61f09a92a26c7d3f302773':
docs: Fix conditional in ambient mode check method (
18832168). Fix issue with non existent variable (
18832287). Fix issue with outdated instructions (
18832293). Fix issue with misleading time tick (
18832171).
Andrew Solovay [Wed, 21 Jan 2015 23:33:10 +0000 (23:33 +0000)]
am
78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs automerge:
e628954
automerge:
d4cf09d
* commit '
d4cf09d3a0f90d61386eb1713ef2ed4ade00c061':
docs: WebView security notes for apps on pre-K devices
OSDN Git Service
