OSDN Git Service
Robin Lee [Wed, 7 Sep 2016 22:29:13 +0000 (22:29 +0000)]
DO NOT MERGE Stop work challenge freeform bypass am:
0737c2b4c2 am:
ec5ceae174
am:
32daa7a95c
Change-Id: I8580890ee0fcd6b1fb80352b4437d2a1379dfaee
Robin Lee [Wed, 7 Sep 2016 22:23:10 +0000 (22:23 +0000)]
DO NOT MERGE Stop work challenge freeform bypass am:
0737c2b4c2
am:
ec5ceae174
Change-Id: Ic4bbce08944881f0d20a08c1ebb4db5531208f23
Robin Lee [Wed, 7 Sep 2016 22:15:28 +0000 (22:15 +0000)]
DO NOT MERGE Stop work challenge freeform bypass
am:
0737c2b4c2
Change-Id: Ia76391f710e42e9634010bd211a0370230b318e3
TreeHugger Robot [Wed, 7 Sep 2016 22:05:04 +0000 (22:05 +0000)]
Merge "Ensure preference icon is returned when inflated from XML even if it has not been displayed yet." into cw-f-dev
Wale Ogunwale [Wed, 7 Sep 2016 22:01:15 +0000 (22:01 +0000)]
Merge "Moved activity to stopped state if relaunched while device is asleep" into nyc-mr1-dev
am:
36c4fc9779
Change-Id: I206939f60b4ff73736377b63e3f651be1bd2992a
Wale Ogunwale [Wed, 7 Sep 2016 22:01:11 +0000 (22:01 +0000)]
Moved activity to stopped state if relaunched while device is asleep
am:
3e99736b61
Change-Id: I38552093c320d5c4ff74e615ae8b9959f306cd82
TreeHugger Robot [Wed, 7 Sep 2016 21:57:05 +0000 (21:57 +0000)]
Merge "Moved activity to stopped state if relaunched while device is asleep" into nyc-mr1-dev
Makoto Onuki [Wed, 7 Sep 2016 21:40:22 +0000 (21:40 +0000)]
Merge "Allow DO/PO to be installed with certain preconfigured accounts." into nyc-mr1-dev
am:
bb69f55f17
Change-Id: I39962983e4deb149f6169f78c3db76d7d5f8f26e
Makoto Onuki [Wed, 7 Sep 2016 21:40:20 +0000 (21:40 +0000)]
Allow DO/PO to be installed with certain preconfigured accounts.
am:
5e7e0670c7
Change-Id: I9191a60bf4071b8205c04131cb2d97ef1a32fb19
Makoto Onuki [Wed, 7 Sep 2016 21:36:35 +0000 (21:36 +0000)]
Merge "Allow DO/PO to be installed with certain preconfigured accounts." into nyc-mr1-dev
Jorim Jaggi [Wed, 7 Sep 2016 21:35:29 +0000 (21:35 +0000)]
Merge "Fix slow PIN dismiss animation" into nyc-mr1-dev
am:
bcf32170b3
Change-Id: Id3f66ab179421f6ff0d85128b06c5acf82209b11
Jorim Jaggi [Wed, 7 Sep 2016 21:35:27 +0000 (21:35 +0000)]
Fix slow PIN dismiss animation
am:
6bd3890ff9
Change-Id: I57e22cb3eee40e7e06267494314f8e1369caf5e2
TreeHugger Robot [Wed, 7 Sep 2016 21:16:22 +0000 (21:16 +0000)]
Merge "Fix slow PIN dismiss animation" into nyc-mr1-dev
Alan Viverette [Wed, 7 Sep 2016 21:09:10 +0000 (21:09 +0000)]
Merge "Support library 24.2.0 API diff" into nyc-dev am:
9d25bf73a4 am:
75136ac15b
am:
f3c21a8950
Change-Id: I7e0b367a94e6bfe3cb08cf674a3d6847780be961
Alan Viverette [Wed, 7 Sep 2016 21:09:08 +0000 (21:09 +0000)]
Support library 24.2.0 API diff am:
ae3fecc1a9 am:
56477c1fcb
am:
c2ca61749d
Change-Id: Ibcab8cbff2b2a5f99bcde98ed57925fd07a75dd1
Alan Viverette [Wed, 7 Sep 2016 21:03:45 +0000 (21:03 +0000)]
Merge "Support library 24.2.0 API diff" into nyc-dev am:
9d25bf73a4
am:
75136ac15b
Change-Id: I83b88e8b9c2b5f807f06b016110a19d46dbb348c
Alan Viverette [Wed, 7 Sep 2016 21:03:43 +0000 (21:03 +0000)]
Support library 24.2.0 API diff am:
ae3fecc1a9
am:
56477c1fcb
Change-Id: I3e4f453f37fabe0e5358b32272d38d93ea97b28c
Alan Viverette [Wed, 7 Sep 2016 20:59:53 +0000 (20:59 +0000)]
Merge "Support library 24.2.0 API diff" into nyc-dev
am:
9d25bf73a4
Change-Id: I0f691281d86562c96ed0768efb69d6df77d29456
Alan Viverette [Wed, 7 Sep 2016 20:59:49 +0000 (20:59 +0000)]
Support library 24.2.0 API diff
am:
ae3fecc1a9
Change-Id: Ie9a007ad44ae0293ef4c4138888da0e78d61b322
Narayan Kamath [Wed, 7 Sep 2016 20:58:30 +0000 (20:58 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54 am:
f7b9f84f87 am:
9a409265fc -s ours am:
9802fcfa2b am:
2acf9f7e3c am:
36b90a1934 am:
5febcdd210 am:
ebcc7aeda9 am:
f52b30cf8d am:
a2112ae2a0
am:
3fcdb62da4
Change-Id: I89d826e50d731706bbe39b8da9d1bf4beab0d38a
Alan Viverette [Wed, 7 Sep 2016 20:54:04 +0000 (20:54 +0000)]
Merge "Support library 24.2.0 API diff" into nyc-dev
Andrew Solovay [Wed, 7 Sep 2016 20:48:41 +0000 (20:48 +0000)]
Merge "docs: Fixing redirect file" into nyc-dev am:
33831c02b5 am:
733e368097
am:
c5e9cb54f2
Change-Id: I42f092c1d842945ec2a7612ef629deda8c40afce
Andrew Solovay [Wed, 7 Sep 2016 20:48:35 +0000 (20:48 +0000)]
docs: Fixing redirect file am:
5bf2ea6670 am:
7771476630
am:
0a9fdbb814
Change-Id: Ie0a0fdedc4518163ffd9723a8904371e6dd40298
Narayan Kamath [Wed, 7 Sep 2016 20:43:30 +0000 (20:43 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54 am:
f7b9f84f87 am:
9a409265fc -s ours am:
9802fcfa2b am:
2acf9f7e3c am:
36b90a1934 am:
5febcdd210 am:
ebcc7aeda9 am:
f52b30cf8d
am:
a2112ae2a0
Change-Id: I0a25aa4285f9661a5bc53114c90aaca054ea6df1
Andrew Solovay [Wed, 7 Sep 2016 20:37:16 +0000 (20:37 +0000)]
Merge "docs: Fixing redirect file" into nyc-dev am:
33831c02b5
am:
733e368097
Change-Id: Ice97fbcfcd0fa8b412bfc2abe8b526bc4de86800
Andrew Solovay [Wed, 7 Sep 2016 20:37:14 +0000 (20:37 +0000)]
docs: Fixing redirect file am:
5bf2ea6670
am:
7771476630
Change-Id: I591778d29944c5c74c9953ae24d4ba31a45ae8b7
Narayan Kamath [Wed, 7 Sep 2016 20:36:47 +0000 (20:36 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54 am:
f7b9f84f87 am:
9a409265fc -s ours am:
9802fcfa2b am:
2acf9f7e3c am:
36b90a1934 am:
5febcdd210 am:
ebcc7aeda9
am:
f52b30cf8d
Change-Id: I99751b55fb10e0fcd2703d59d8925744a73bcfd0
Narayan Kamath [Wed, 7 Sep 2016 20:32:17 +0000 (20:32 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54 am:
f7b9f84f87 am:
9a409265fc -s ours am:
9802fcfa2b am:
2acf9f7e3c am:
36b90a1934 am:
5febcdd210
am:
ebcc7aeda9
Change-Id: Ie2e2292bbb8c6d274109d64f7dd3ed00fca0ba0f
Andrew Solovay [Wed, 7 Sep 2016 20:25:45 +0000 (20:25 +0000)]
Merge "docs: Fixing redirect file" into nyc-dev
am:
33831c02b5
Change-Id: I22a2c26b77c0ce27499ee1a9ba3567e6c337cf02
Andrew Solovay [Wed, 7 Sep 2016 20:25:43 +0000 (20:25 +0000)]
docs: Fixing redirect file
am:
5bf2ea6670
Change-Id: I8d1ea69862b543eb13c96398d967979e2040914a
Narayan Kamath [Wed, 7 Sep 2016 20:23:28 +0000 (20:23 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54 am:
f7b9f84f87 am:
9a409265fc -s ours am:
9802fcfa2b am:
2acf9f7e3c am:
36b90a1934
am:
5febcdd210
Change-Id: Ib7e40acc4682e4198dcaab78c57de02acfe89c94
TreeHugger Robot [Wed, 7 Sep 2016 20:19:07 +0000 (20:19 +0000)]
Merge "docs: Fixing redirect file" into nyc-dev
Narayan Kamath [Wed, 7 Sep 2016 20:17:02 +0000 (20:17 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54 am:
f7b9f84f87 am:
9a409265fc -s ours am:
9802fcfa2b am:
2acf9f7e3c
am:
36b90a1934
Change-Id: Iec55904ecb004d3bf89bf3a065e5811afae798d6
Wale Ogunwale [Tue, 6 Sep 2016 17:37:56 +0000 (10:37 -0700)]
Moved activity to stopped state if relaunched while device is asleep
- If an activity is done relaunching and the device is sleeping or
shutting down, go ahead and force the activity to sleep which will
transition it into the stopped state. We do this after the activity
is relaunched as activities can currently only relaunch into the
resumed or paused state both of which are visible state.
However, the activity should be in the stopped state while the device
is sleeping.
- Also removed previous fix for b/
28518380 that prevents activities from
relaunching due to configuration changes while the device is sleeping.
We need to allow relaunches due to configuration changes while the device
is sleeping so the things are responsive when you wake-up the device.
And, it is no longer a big deal since we are transitioning the activity
to the stop state when the relaunch is complete.
Bug:
30253333
Bug:
28518380
Change-Id: I5313c13a13c2d2f9bb43831797918d9e67a30cda
Michael Kwan [Wed, 7 Sep 2016 20:15:55 +0000 (13:15 -0700)]
Ensure preference icon is returned when inflated from XML even if it has not been displayed yet.
Bug:
31343032
Change-Id: Ifa2c84b3091c2cfc5b98da6f30bb1ba060cd26e7
Narayan Kamath [Wed, 7 Sep 2016 20:12:43 +0000 (20:12 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54 am:
f7b9f84f87 am:
9a409265fc -s ours am:
9802fcfa2b
am:
2acf9f7e3c
Change-Id: Ideae7875e299ec0292054aad85fe8aa92b6aba9b
Narayan Kamath [Wed, 7 Sep 2016 20:07:58 +0000 (20:07 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54 am:
f7b9f84f87 am:
9a409265fc -s ours
am:
9802fcfa2b
Change-Id: Iabeefa7d07d78002c124ce62dc210111b83a99b7
Narayan Kamath [Wed, 7 Sep 2016 20:01:56 +0000 (20:01 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54 am:
f7b9f84f87
am:
9a409265fc -s ours
Change-Id: Idf4dcc5ab7e8b0510848cbd2f220fe7a8e4b3e04
Robert Carr [Wed, 7 Sep 2016 19:25:36 +0000 (19:25 +0000)]
Merge "SurfaceView: Correct coordinate space in windowPositionLostRT." into nyc-mr1-dev
am:
b5820b3dc9
Change-Id: Id8eabc06c7180daa25683436af6802cf9b9cd1d4
Robert Carr [Wed, 7 Sep 2016 19:25:20 +0000 (19:25 +0000)]
SurfaceView: Correct coordinate space in windowPositionLostRT.
am:
3387913237
Change-Id: I7f28aab013bd6fe213a90e293664cc59ee6d23cf
TreeHugger Robot [Wed, 7 Sep 2016 19:19:55 +0000 (19:19 +0000)]
Merge "SurfaceView: Correct coordinate space in windowPositionLostRT." into nyc-mr1-dev
Andrew Solovay [Wed, 7 Sep 2016 19:17:18 +0000 (19:17 +0000)]
Merge "docs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI" into nyc-dev am:
4dc743ac67 am:
d4c903e233
am:
99fb620454
Change-Id: I764691aee0134528a9e3564752379c5afd0a07fa
Andrew Solovay [Wed, 7 Sep 2016 19:17:16 +0000 (19:17 +0000)]
docs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI am:
7cfe9f83ac am:
f2752e8f51
am:
9ae09a24d9
Change-Id: I74595835123e48a1a535815259dc1bf43fc4f363
Andrew Solovay [Wed, 7 Sep 2016 19:12:38 +0000 (19:12 +0000)]
Merge "docs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI" into nyc-dev am:
4dc743ac67
am:
d4c903e233
Change-Id: I89dd3b93a80e13f8b196bfc9a111d29299540759
Andrew Solovay [Wed, 7 Sep 2016 19:12:33 +0000 (19:12 +0000)]
docs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI am:
7cfe9f83ac
am:
f2752e8f51
Change-Id: I397d056fe1d73898d28d89770dbcd95095f344b4
Andrew Solovay [Wed, 7 Sep 2016 19:07:52 +0000 (19:07 +0000)]
Merge "docs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI" into nyc-dev
am:
4dc743ac67
Change-Id: Id0057e57b226cddb1411aa9c864143d704565013
Andrew Solovay [Wed, 7 Sep 2016 19:07:47 +0000 (19:07 +0000)]
docs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI
am:
7cfe9f83ac
Change-Id: Ia16702066a3760311eac69e4b2a8923380e77fde
TreeHugger Robot [Wed, 7 Sep 2016 19:02:35 +0000 (19:02 +0000)]
Merge "docs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI" into nyc-dev
Narayan Kamath [Wed, 7 Sep 2016 18:58:41 +0000 (18:58 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54
am:
f7b9f84f87
Change-Id: I317cecff389f30c5d47e4adee1afafbde8d9d23d
Narayan Kamath [Wed, 7 Sep 2016 18:53:40 +0000 (18:53 +0000)]
Backport changes to whitelist sockets opened by the zygote.
am:
7ec85f9d54
Change-Id: I6db56b5b06636201382f6d908297644183253c0b
Andrew Solovay [Fri, 26 Aug 2016 21:31:25 +0000 (14:31 -0700)]
docs: Fixing redirect file
Devsite handles "redirect this directory tree" differently than DAC
did; as a result, a bunch of redirects were broken. (On Devsite, a
redirect ending in a slash redirects *only* paths that match it;
to redirect that directory and all its contents, end with /...)
Also deleted one redirect that wouldn't work (trying to redirect
foo.html#bar , which wouldn't work--the anchors are ignored on
devsite and there was a separate redirect for just foo.html).
When a redirect pointed *to* a path ending in slash -- but was clearly
meant to point to the directory itself (i.e. the /index.html file) --
I removed the trailing slash.
Redirects staged to https://android-dot-devsite.googleplex.com , so
they should all work there.
bug:
30748799
Change-Id: I6d090de5e6efa6ddb2bbe3e99fdbfb0ae02b88d5
Narayan Kamath [Wed, 7 Sep 2016 18:17:11 +0000 (18:17 +0000)]
Merge "fd_utils: Fix broken usage of iterators." into nyc-mr1-dev
am:
fda29437bf
Change-Id: Ib6d5205864a3cc2042004370c4bffca7179f2bfe
Narayan Kamath [Wed, 7 Sep 2016 18:17:09 +0000 (18:17 +0000)]
fd_utils: Fix broken usage of iterators.
am:
0b76d6a28e
Change-Id: Ie1134023c6ad464b5a76c337057f9416f31ca089
Robert Carr [Tue, 6 Sep 2016 21:41:40 +0000 (14:41 -0700)]
SurfaceView: Correct coordinate space in windowPositionLostRT.
mWinFrame as set when returning from relayout will be in screen
space coordinates. repositionChild however expects coordinates relative to the
parent position (like relayout).
Bug:
31112993
Change-Id: Id4fcd7fcb771908e8a7db981207d19c99fb51b98
Narayan Kamath [Wed, 7 Sep 2016 17:53:31 +0000 (17:53 +0000)]
Merge "fd_utils: Fix broken usage of iterators." into nyc-mr1-dev
Narayan Kamath [Fri, 19 Aug 2016 12:45:24 +0000 (13:45 +0100)]
Backport changes to whitelist sockets opened by the zygote.
This is the backport of the following commits :
Commit
c5f27a7cb2ec816f483a65255034a1b57a8aa22:
-----------------------------------------------
Reopen whitelisted zygote file descriptors after a fork.
We don't want these descriptors to be shared post-fork, so we'll
have to close and reopen them when the zygote forks. The set of
open descriptors is checked against a whitelist and it is a fatal
error if a non whitelisted FD is opened. It is also a fatal error
if anything other than a regular file / character device or socket
is opened at the time of forking.
This work is done in two stages :
- An initial list of FDs is constructed and cached prior to the
first zygote fork.
- On each subsequent fork, we check whether the list of open FDs
has changed. We are currently tolerant of changes, but in the
longer term, it should be a fatal error if the set of open file
descriptors in the zygote changes.
- Post fork, we traverse the list of open descriptors and reopen
them if necessary.
bug:
30963384
Commit
3764a260f0c90dcb323caeda14baf903cc108759:
-----------------------------------------------
Add a whitelist of sockets on fork.
Maintain a whitelist of AF_UNIX sockets that are permitted
to exist at the time of forking. If an open socket does not belong
to the whitelist (or is not AF_UNIX), the process will abort. If an
open socket is whitelisted, it will be redirected to /dev/null after
a sucessful fork. This allows us to unify our handling of the special
zygote sockets (/dev/socket/zygote[_secondary]) with the existing
whitelist of non socket file descriptors.
This change also removes non-fatal ALOGW messages since they have the
side effect of reopening the logging socket.
bug:
30963384
Commit
0b76d6a28e6978151bf245a775329cdae5e574d5:
-----------------------------------------------
fd_utils: Fix broken usage of iterators.
There were two separate issues here :
- RestatInternal was using an iterator after a call to erase(). This
will not work because it will be invalidated.
- The "standard" for loop idiom for iterating over a map while making
structural changes to it is broken. Switch to a while loop and treat
cases where elements are erased differently from cases where they
aren't.
bug:
31092930
bug:
30963384
Plus additional changes:
-----------------------------------------------
- change std::unordered_map to std::tr1::unordered_map.
- add /dev/alarm and /dev/__properties__ to the whitelist.
- map.erase(iterator) returns void prior to C++11, so need the kludge
of calling erase(it++).
Change-Id: I694ff66d5f227239b0190ffc2287882b16e336fa
Narayan Kamath [Wed, 7 Sep 2016 17:22:06 +0000 (17:22 +0000)]
Merge "fd_utils: Remove /system/etc/event-log-tags from the whitelist." into nyc-mr1-dev
am:
bf78193a73
Change-Id: Ie69c265ef6483486117d5da30c4db8c8897e9725
Narayan Kamath [Wed, 7 Sep 2016 17:22:03 +0000 (17:22 +0000)]
fd_utils: Remove /system/etc/event-log-tags from the whitelist.
am:
cefc0374eb
Change-Id: If519c119b39e9701472d1e6c7469ca0dafa036fc
Narayan Kamath [Wed, 7 Sep 2016 17:13:37 +0000 (17:13 +0000)]
Merge "fd_utils: Remove /system/etc/event-log-tags from the whitelist." into nyc-mr1-dev
Narayan Kamath [Wed, 7 Sep 2016 12:14:40 +0000 (13:14 +0100)]
fd_utils: Fix broken usage of iterators.
There were two separate issues here :
- RestatInternal was using an iterator after a call to erase(). This
will not work because it will be invalidated.
- The "standard" for loop idiom for iterating over a map while making
structural changes to it is broken. Switch to a while loop and treat
cases where elements are erased differently from cases where they
aren't.
bug:
31092930
bug:
30963384
Change-Id: I261d59239558230dd8cdd1d1cb5b9e2448a4c23f
Bill Yi [Wed, 7 Sep 2016 12:14:28 +0000 (12:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
57e29b4b9e -s ours
Change-Id: I43d7f780c942eaca845903d578624b43fba70a44
Bill Yi [Wed, 7 Sep 2016 12:14:25 +0000 (12:14 +0000)]
Import translations. DO NOT MERGE
am:
4fd35e0578 -s ours
Change-Id: Ic02d9837575237d253b2dd9693f8b7c27f1238ac
Bill Yi [Wed, 7 Sep 2016 12:14:22 +0000 (12:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
c906d9dc72 -s ours
Change-Id: I428f022461de19aa0e3190884387deb819938e0b
Bill Yi [Wed, 7 Sep 2016 12:14:20 +0000 (12:14 +0000)]
Import translations. DO NOT MERGE
am:
ac7ee28cd0 -s ours
Change-Id: I81c59605726c68259d1a49e39a29040ce40e2f64
Bill Yi [Wed, 7 Sep 2016 12:14:15 +0000 (12:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
bdc26bab6e -s ours
Change-Id: I395316ebe79ee829b3538c7167be18a517f782c8
Bill Yi [Wed, 7 Sep 2016 12:14:13 +0000 (12:14 +0000)]
Import translations. DO NOT MERGE
am:
7c4d3912f3 -s ours
Change-Id: Iba0ae68b665da9e415db251702fd6478f5a7427a
TreeHugger Robot [Wed, 7 Sep 2016 12:07:43 +0000 (12:07 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 7 Sep 2016 12:07:05 +0000 (12:07 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 7 Sep 2016 12:06:14 +0000 (12:06 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Wed, 7 Sep 2016 12:05:51 +0000 (12:05 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Wed, 7 Sep 2016 12:00:28 +0000 (12:00 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Wed, 7 Sep 2016 09:53:53 +0000 (02:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7ee34b9c13e6c4d8919c5eae201954561a8e6cba
Auto-generated-cl: translation import
Bill Yi [Wed, 7 Sep 2016 07:01:44 +0000 (00:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2541b36722c5142046760d243c27929c46c4ec42
Auto-generated-cl: translation import
Bill Yi [Wed, 7 Sep 2016 06:53:36 +0000 (23:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I911f2d59dcaefe83da01e18160b9ab905a9a96b0
Auto-generated-cl: translation import
Bill Yi [Wed, 7 Sep 2016 04:54:59 +0000 (04:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
2c0df72ff6 -s ours
Change-Id: Id1c20a489505992dff768f5d29399262f047ca3a
Bill Yi [Wed, 7 Sep 2016 04:54:58 +0000 (04:54 +0000)]
Import translations. DO NOT MERGE
am:
dd0e168ca5 -s ours
Change-Id: I18ed5d0b8b6c1169a3c552fb817334b227c7732d
TreeHugger Robot [Wed, 7 Sep 2016 04:47:34 +0000 (04:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Wed, 7 Sep 2016 01:26:24 +0000 (18:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I14a51d12218de5eef75f5db8fd99838bb749b750
Auto-generated-cl: translation import
Bill Yi [Wed, 7 Sep 2016 01:18:50 +0000 (18:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: If9d5c40eada1c5a4a530ddd1d75e7ae6f7d7ecb8
Auto-generated-cl: translation import
Tyler Gunn [Tue, 6 Sep 2016 22:54:51 +0000 (22:54 +0000)]
Merge "Add toString method for session event codes." into nyc-mr1-dev
am:
b2e0ed8772
Change-Id: Ia2d8d81345b351f45a5d353481ccf60108b6eb50
Tyler Gunn [Tue, 6 Sep 2016 22:54:43 +0000 (22:54 +0000)]
Add toString method for session event codes.
am:
6f657ee021
Change-Id: I16263ff0b0b40c4b8bf4071fb1a6076b68c62864
Tyler Gunn [Tue, 6 Sep 2016 22:47:32 +0000 (22:47 +0000)]
Merge "Add toString method for session event codes." into nyc-mr1-dev
Jaewan Kim [Tue, 6 Sep 2016 22:35:28 +0000 (22:35 +0000)]
Merge "Keep the PIP at the shifted position when the Settings is shown" into nyc-mr1-dev
am:
e70f79b584
Change-Id: Ib0c7423c21cd50ab3074357a20d13516c9b287a4
Jaewan Kim [Tue, 6 Sep 2016 22:35:20 +0000 (22:35 +0000)]
Keep the PIP at the shifted position when the Settings is shown
am:
177801c273
Change-Id: Ic9cd9ed5213292b54594c26a0fcac93b9262806e
Jorim Jaggi [Tue, 6 Sep 2016 22:27:56 +0000 (15:27 -0700)]
Fix slow PIN dismiss animation
We need to do the slow dismissal when the user is locked, and not the
other way around.
Bug:
31203310
Change-Id: I6ad0fc831bd9dc26e7375916a0a091552f7790ae
Jaewan Kim [Tue, 6 Sep 2016 22:27:24 +0000 (22:27 +0000)]
Merge "Keep the PIP at the shifted position when the Settings is shown" into nyc-mr1-dev
Bill Yi [Tue, 6 Sep 2016 22:19:50 +0000 (15:19 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
30362824
Change-Id: I089a218f5903bb8c0e9166dd84ea082eecba9470
Jorim Jaggi [Tue, 6 Sep 2016 22:01:37 +0000 (22:01 +0000)]
Merge "Quicker exit animation for bottom dock on Keyguard" into nyc-mr1-dev
am:
1191fee634
Change-Id: I68e88e13d89e7184cbbeab9ced910a28b8deaba5
Jorim Jaggi [Tue, 6 Sep 2016 22:01:33 +0000 (22:01 +0000)]
Quicker exit animation for bottom dock on Keyguard
am:
48832811b0
Change-Id: Ifd3603c9c41fb475730521452a0326b453e2ce8d
TreeHugger Robot [Tue, 6 Sep 2016 21:52:49 +0000 (21:52 +0000)]
Merge "Quicker exit animation for bottom dock on Keyguard" into nyc-mr1-dev
Sreevani Sreejith [Tue, 6 Sep 2016 21:49:08 +0000 (21:49 +0000)]
Merge "docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:
30951238" into nyc-dev am:
d2273e433c am:
bbc189dd96
am:
b8cf0a24ad
Change-Id: I9cd59cb4002d1cf2e3c2862572e487e42d5d7df3
sreevanis [Tue, 6 Sep 2016 21:49:05 +0000 (21:49 +0000)]
docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:
30951238 am:
1e4bc15f31 am:
bc59fba7d5
am:
8281a41bab
Change-Id: I8057bb154d08886393e9ad6ba94c88636fa91dd9
Sreevani Sreejith [Tue, 6 Sep 2016 21:44:05 +0000 (21:44 +0000)]
Merge "docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:
30951238" into nyc-dev am:
d2273e433c
am:
bbc189dd96
Change-Id: I58ab0b454636e913cfa9a51fcab0a71f7ef720d1
sreevanis [Tue, 6 Sep 2016 21:43:59 +0000 (21:43 +0000)]
docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:
30951238 am:
1e4bc15f31
am:
bc59fba7d5
Change-Id: Ie0db2a46c03cad5c2b8955ed02ad454ccbb7003a
Neil Fuller [Tue, 6 Sep 2016 21:32:44 +0000 (21:32 +0000)]
Merge "Fix receive timeout on LocalSocket" into nyc-mr1-dev
am:
e3e952148c
Change-Id: I9da76c301bf8a480d48ff9c46ea9b57fb381daae
Sreevani Sreejith [Tue, 6 Sep 2016 21:32:22 +0000 (21:32 +0000)]
Merge "docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:
30951238" into nyc-dev
am:
d2273e433c
Change-Id: I76ced02277404117c008fcea76ffafbd8ec39e82
sreevanis [Tue, 6 Sep 2016 21:32:17 +0000 (21:32 +0000)]
docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:
30951238
am:
1e4bc15f31
Change-Id: I72bb425f9d40e73a9562312f990555673553bcc4
Neil Fuller [Tue, 6 Sep 2016 21:32:09 +0000 (21:32 +0000)]
Fix receive timeout on LocalSocket
am:
8d5ec8d7db
Change-Id: I463c1f7189b573fdbf9f0bf5001e6c626ea88197
Chad Brubaker [Tue, 6 Sep 2016 21:30:50 +0000 (21:30 +0000)]
Merge "Avoid NPE on certificates that cannot be read" into nyc-mr1-dev
am:
ae76b4eab1
Change-Id: Iae3c9a148df590a84c11a2d3226228cc5d538bf4
Chad Brubaker [Tue, 6 Sep 2016 21:30:43 +0000 (21:30 +0000)]
Avoid NPE on certificates that cannot be read
am:
01e9682cab
Change-Id: I5dfc19b32cef8f87c04908d1116e7528ae9be87c
OSDN Git Service
