OSDN Git Service

android-x86/frameworks-base.git
7 years agoBackport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54 am: f7b9f8...
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

7 years agoMerge "docs: Fixing redirect file" into nyc-dev am: 33831c02b5 am: 733e368097
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

7 years agodocs: Fixing redirect file am: 5bf2ea6670 am: 7771476630
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

7 years agoBackport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54 am: f7b9f8...
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

7 years agoMerge "docs: Fixing redirect file" into nyc-dev am: 33831c02b5
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

7 years agodocs: Fixing redirect file am: 5bf2ea6670
Andrew Solovay [Wed, 7 Sep 2016 20:37:14 +0000 (20:37 +0000)]
docs: Fixing redirect file am: 5bf2ea6670
am: 7771476630

Change-Id: I591778d29944c5c74c9953ae24d4ba31a45ae8b7

7 years agoBackport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54 am: f7b9f8...
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

7 years agoBackport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54 am: f7b9f8...
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

7 years agoMerge "docs: Fixing redirect file" into nyc-dev
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

7 years agodocs: Fixing redirect file
Andrew Solovay [Wed, 7 Sep 2016 20:25:43 +0000 (20:25 +0000)]
docs: Fixing redirect file
am: 5bf2ea6670

Change-Id: I8d1ea69862b543eb13c96398d967979e2040914a

7 years agoBackport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54 am: f7b9f8...
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

7 years agoMerge "docs: Fixing redirect file" into nyc-dev
TreeHugger Robot [Wed, 7 Sep 2016 20:19:07 +0000 (20:19 +0000)]
Merge "docs: Fixing redirect file" into nyc-dev

7 years agoBackport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54 am: f7b9f8...
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

7 years agoBackport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54 am: f7b9f8...
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

7 years agoBackport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54 am: f7b9f8...
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

7 years agoBackport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54 am: f7b9f84f87
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

7 years agoMerge "SurfaceView: Correct coordinate space in windowPositionLostRT." into nyc-mr1-dev
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

7 years agoSurfaceView: Correct coordinate space in windowPositionLostRT.
Robert Carr [Wed, 7 Sep 2016 19:25:20 +0000 (19:25 +0000)]
SurfaceView: Correct coordinate space in windowPositionLostRT.
am: 3387913237

Change-Id: I7f28aab013bd6fe213a90e293664cc59ee6d23cf

7 years agoMerge "SurfaceView: Correct coordinate space in windowPositionLostRT." into nyc-mr1-dev
TreeHugger Robot [Wed, 7 Sep 2016 19:19:55 +0000 (19:19 +0000)]
Merge "SurfaceView: Correct coordinate space in windowPositionLostRT." into nyc-mr1-dev

7 years agoMerge "docs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI" into nyc-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

7 years agodocs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI am: 7cfe9f83ac am:...
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

7 years agoMerge "docs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI" into nyc-dev...
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

7 years agodocs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI am: 7cfe9f83ac
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

7 years agoMerge "docs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI" into nyc-dev
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

7 years agodocs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI
Andrew Solovay [Wed, 7 Sep 2016 19:07:47 +0000 (19:07 +0000)]
docs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI
am: 7cfe9f83ac

Change-Id: Ia16702066a3760311eac69e4b2a8923380e77fde

7 years agoMerge "docs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI" into nyc-dev
TreeHugger Robot [Wed, 7 Sep 2016 19:02:35 +0000 (19:02 +0000)]
Merge "docs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI" into nyc-dev

7 years agoBackport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54
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

7 years agoBackport changes to whitelist sockets opened by the zygote.
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

7 years agodocs: Fixing redirect file
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

7 years agoMerge "fd_utils: Fix broken usage of iterators." into nyc-mr1-dev
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

7 years agofd_utils: Fix broken usage of iterators.
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

7 years agoSurfaceView: Correct coordinate space in windowPositionLostRT.
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

7 years agoMerge "fd_utils: Fix broken usage of iterators." into nyc-mr1-dev
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

7 years agoBackport changes to whitelist sockets opened by the zygote.
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

7 years agoMerge "fd_utils: Remove /system/etc/event-log-tags from the whitelist." into nyc...
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

7 years agofd_utils: Remove /system/etc/event-log-tags from the whitelist.
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

7 years agoMerge "fd_utils: Remove /system/etc/event-log-tags from the whitelist." into nyc...
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

7 years agofd_utils: Fix broken usage of iterators.
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

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
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

7 years agoImport translations. DO NOT MERGE
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

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
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

7 years agoImport translations. DO NOT MERGE
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

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
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

7 years agoImport translations. DO NOT MERGE
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

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 7 Sep 2016 12:07:43 +0000 (12:07 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

7 years agoMerge "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

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Wed, 7 Sep 2016 12:06:14 +0000 (12:06 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoMerge "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

7 years agoMerge "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

7 years agoImport translations. DO NOT MERGE
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

7 years agoImport translations. DO NOT MERGE
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

7 years agoImport translations. DO NOT MERGE
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

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
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

7 years agoImport translations. DO NOT MERGE
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

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Wed, 7 Sep 2016 04:47:34 +0000 (04:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoImport translations. DO NOT MERGE
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

7 years agoImport translations. DO NOT MERGE
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

7 years agoMerge "Add toString method for session event codes." into nyc-mr1-dev
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

7 years agoAdd toString method for session event codes.
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

7 years agoMerge "Add toString method for session event codes." into nyc-mr1-dev
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

7 years agoMerge "Keep the PIP at the shifted position when the Settings is shown" into nyc...
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

7 years agoKeep the PIP at the shifted position when the Settings is shown
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

7 years agoMerge "Keep the PIP at the shifted position when the Settings is shown" into nyc...
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

7 years agoImport translations. DO NOT MERGE
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

7 years agoMerge "Quicker exit animation for bottom dock on Keyguard" into nyc-mr1-dev
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

7 years agoQuicker exit animation for bottom dock on Keyguard
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

7 years agoMerge "Quicker exit animation for bottom dock on Keyguard" into nyc-mr1-dev
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

7 years agoMerge "docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:30951238...
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

7 years agodocs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:30951238 am...
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

7 years agoMerge "docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:30951238...
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

7 years agodocs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:30951238 am...
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

7 years agoMerge "Fix receive timeout on LocalSocket" into nyc-mr1-dev
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

7 years agoMerge "docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:30951238...
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

7 years agodocs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:30951238
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

7 years agoFix receive timeout on LocalSocket
Neil Fuller [Tue, 6 Sep 2016 21:32:09 +0000 (21:32 +0000)]
Fix receive timeout on LocalSocket
am: 8d5ec8d7db

Change-Id: I463c1f7189b573fdbf9f0bf5001e6c626ea88197

7 years agoMerge "Avoid NPE on certificates that cannot be read" into nyc-mr1-dev
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

7 years agoAvoid NPE on certificates that cannot be read
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

7 years agoMerge "docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:30951238...
Sreevani Sreejith [Tue, 6 Sep 2016 21:24:31 +0000 (21:24 +0000)]
Merge "docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:30951238" into nyc-dev

7 years agoMerge "Fix receive timeout on LocalSocket" into nyc-mr1-dev
TreeHugger Robot [Tue, 6 Sep 2016 21:20:19 +0000 (21:20 +0000)]
Merge "Fix receive timeout on LocalSocket" into nyc-mr1-dev

7 years agoMerge "Avoid NPE on certificates that cannot be read" into nyc-mr1-dev
Chad Brubaker [Tue, 6 Sep 2016 21:16:30 +0000 (21:16 +0000)]
Merge "Avoid NPE on certificates that cannot be read" into nyc-mr1-dev

7 years agoKeep the PIP at the shifted position when the Settings is shown
Jaewan Kim [Tue, 6 Sep 2016 07:45:51 +0000 (00:45 -0700)]
Keep the PIP at the shifted position when the Settings is shown

Some top level Settings menus launch activities from other packages.
In that case, they should be considered as a part of the Settings
if they follow the Leanback's side panel style.

Add such activities to the whitelist to keep the PIP position.

Bug: 31142005
Change-Id: I12cab611b346154048cbd61f6a678f23b5a10c00

7 years agoQuicker exit animation for bottom dock on Keyguard
Jorim Jaggi [Tue, 6 Sep 2016 19:38:23 +0000 (12:38 -0700)]
Quicker exit animation for bottom dock on Keyguard

Change-Id: I9d07dc6ce7e2aec36bf797bd4041701315e71e0e
Fixes: 31274209

7 years agoUpdate #jd-content to #body-content for DevSite layout changes. am: b5887e68c3 am...
Amanda Kassay [Tue, 6 Sep 2016 19:26:00 +0000 (19:26 +0000)]
Update #jd-content to #body-content for DevSite layout changes. am: b5887e68c3 am: efae2d7dd6
am: 735b9eca0f

Change-Id: I0f599825b5070c81153594b51b1004a3e830ab52

7 years agoUpdate #jd-content to #body-content for DevSite layout changes. am: b5887e68c3
Amanda Kassay [Tue, 6 Sep 2016 19:18:26 +0000 (19:18 +0000)]
Update #jd-content to #body-content for DevSite layout changes. am: b5887e68c3
am: efae2d7dd6

Change-Id: Ida19d99d502013f91cb041ab9709234c1fdac2ed

7 years agoUpdate #jd-content to #body-content for DevSite layout changes.
Amanda Kassay [Tue, 6 Sep 2016 19:11:56 +0000 (19:11 +0000)]
Update #jd-content to #body-content for DevSite layout changes.
am: b5887e68c3

Change-Id: I105828c530bb57aa367d8ae937a194cd1181ff0e

7 years agodocs: Added functional and UI quality criteria for Wear 2.0 apps.
sreevanis [Tue, 30 Aug 2016 17:02:43 +0000 (10:02 -0700)]
docs: Added functional and UI quality criteria for Wear 2.0 apps.
Bug:30951238

Change-Id: I5cbfac60716415d87f049ae2313fed7bfa214e28

7 years agoUpdate #jd-content to #body-content for DevSite layout changes.
Amanda Kassay [Tue, 6 Sep 2016 16:57:36 +0000 (12:57 -0400)]
Update #jd-content to #body-content for DevSite layout changes.

Change-Id: I57c43a9b05a2bd072c54bf53e8428015edf0a90e

7 years agoMerge "Stop double notifying a11y about Toasts." into nyc-mr1-dev
Phil Weaver [Tue, 6 Sep 2016 16:40:18 +0000 (16:40 +0000)]
Merge "Stop double notifying a11y about Toasts." into nyc-mr1-dev
am: 85d18cce6d

Change-Id: I2c344d7c7fbaa26dae0119f1bd678ea40afa1e53

7 years agoStop double notifying a11y about Toasts.
Phil Weaver [Tue, 6 Sep 2016 16:40:15 +0000 (16:40 +0000)]
Stop double notifying a11y about Toasts.
am: 532c7999c5

Change-Id: If8d025884b8a941386cd472403c1c93fee5a70af

7 years agoMerge "Stop double notifying a11y about Toasts." into nyc-mr1-dev
Phil Weaver [Tue, 6 Sep 2016 16:33:39 +0000 (16:33 +0000)]
Merge "Stop double notifying a11y about Toasts." into nyc-mr1-dev

7 years agoDoc change: remove useUpdatedTemplates script and sections using old templates. am...
Dirk Dougherty [Tue, 6 Sep 2016 14:35:36 +0000 (14:35 +0000)]
Doc change: remove useUpdatedTemplates script and sections using old templates. am: 9ac575abc3 am: 87b4fcfd90
am: a2153e6246

Change-Id: I12b580cf5d6c8d60e49cd0862ec9996ee2bbf0d3

7 years agoDoc change: remove useUpdatedTemplates script and sections using old templates. am...
Dirk Dougherty [Tue, 6 Sep 2016 14:29:07 +0000 (14:29 +0000)]
Doc change: remove useUpdatedTemplates script and sections using old templates. am: 9ac575abc3
am: 87b4fcfd90

Change-Id: Id5e097da26d8150bc82212d8751745b4298cd118

7 years agoDoc change: remove useUpdatedTemplates script and sections using old templates.
Dirk Dougherty [Tue, 6 Sep 2016 14:22:30 +0000 (14:22 +0000)]
Doc change: remove useUpdatedTemplates script and sections using old templates.
am: 9ac575abc3

Change-Id: I7a9d976f300b516bc7f38dacb0c89be95f1b3ef4

7 years agofd_utils: Remove /system/etc/event-log-tags from the whitelist.
Narayan Kamath [Tue, 6 Sep 2016 13:46:54 +0000 (14:46 +0100)]
fd_utils: Remove /system/etc/event-log-tags from the whitelist.

We don't need this file open after change bfd8eafa1d33460.

bug: 30963384

Change-Id: Iaa6ff54cdef2b29c8d170b1fe0718cd045b44e2f

7 years agofd_utils: Remove whitelist for "/dev/pmsg0".
Narayan Kamath [Tue, 6 Sep 2016 13:40:36 +0000 (13:40 +0000)]
fd_utils: Remove whitelist for "/dev/pmsg0".
am: 8dee054190

Change-Id: I11a575a86dc7e631872e5718db6ecd5215bf5aad

7 years agofd_utils: Remove whitelist for "/dev/pmsg0".
Narayan Kamath [Mon, 5 Sep 2016 12:38:21 +0000 (13:38 +0100)]
fd_utils: Remove whitelist for "/dev/pmsg0".

We're now calling __android_log_close prior to a fork, so this file
shouldn't need to be open.

bug: 31243313
bug: 30963384
Change-Id: I8c29adf075782eed966c9197d58f0325310f6c3a

7 years agoMerge changes I955f9dfa,Ibfbb9d67 into nyc-mr1-dev
Jorim Jaggi [Sun, 4 Sep 2016 01:46:15 +0000 (01:46 +0000)]
Merge changes I955f9dfa,Ibfbb9d67 into nyc-mr1-dev
am: dc77fbca27

Change-Id: Ib63cba53ddc60a594b4ca58a3d59e2950092f101

7 years agoOnly show optimizing storage dialog if dex opt dialog was shown
Jorim Jaggi [Sun, 4 Sep 2016 01:46:13 +0000 (01:46 +0000)]
Only show optimizing storage dialog if dex opt dialog was shown
am: 2578beccbe

Change-Id: Ib30ce359a188980dcfa7ff8716ce6660a620626b

7 years agoOnly do slow unlock transition if real home is not running
Jorim Jaggi [Sun, 4 Sep 2016 01:44:28 +0000 (01:44 +0000)]
Only do slow unlock transition if real home is not running
am: 031f79560f

Change-Id: I61f8a3d7458898ac139189920ec58607a570b813

7 years agoMerge changes I955f9dfa,Ibfbb9d67 into nyc-mr1-dev
TreeHugger Robot [Sun, 4 Sep 2016 01:39:30 +0000 (01:39 +0000)]
Merge changes I955f9dfa,Ibfbb9d67 into nyc-mr1-dev

* changes:
  Only show optimizing storage dialog if dex opt dialog was shown
  Only do slow unlock transition if real home is not running