Merge "Improved/clarified license guidance for GPL code." into mnc-dev
diff --git a/target/board/generic/sepolicy/file_contexts b/target/board/generic/sepolicy/file_contexts
index cd46260..d057dc3 100644
--- a/target/board/generic/sepolicy/file_contexts
+++ b/target/board/generic/sepolicy/file_contexts
@@ -4,6 +4,7 @@
/dev/goldfish_pipe u:object_r:qemu_device:s0
/dev/qemu_.* u:object_r:qemu_device:s0
/dev/socket/qemud u:object_r:qemud_socket:s0
+/dev/ttyGF[0-9]* u:object_r:serial_device:s0
/system/bin/qemud u:object_r:qemud_exec:s0
/sys/qemu_trace(/.*)? -- u:object_r:sysfs_writable:s0
/system/etc/init.goldfish.sh u:object_r:goldfish_setup_exec:s0
diff --git a/target/board/generic/sepolicy/goldfish_logcat.te b/target/board/generic/sepolicy/goldfish_logcat.te
index a785355..f820c2a 100644
--- a/target/board/generic/sepolicy/goldfish_logcat.te
+++ b/target/board/generic/sepolicy/goldfish_logcat.te
@@ -6,5 +6,5 @@
# Read from logd.
read_logd(goldfish_logcat)
-# Write to /dev/ttyS2
+# Write to /dev/ttyS2 and /dev/ttyGF2.
allow goldfish_logcat serial_device:chr_file { write open };
diff --git a/target/board/generic/sepolicy/qemud.te b/target/board/generic/sepolicy/qemud.te
index 41f2065..eee21c4 100644
--- a/target/board/generic/sepolicy/qemud.te
+++ b/target/board/generic/sepolicy/qemud.te
@@ -4,5 +4,5 @@
init_daemon_domain(qemud)
-# Access /dev/ttyS1.
+# Access /dev/ttyS1 and /dev/ttyGF1.
allow qemud serial_device:chr_file rw_file_perms;
diff --git a/tools/droiddoc/templates-sdk/assets/js/docs.js b/tools/droiddoc/templates-sdk/assets/js/docs.js
index 60bbaf9..2efe3dc 100644
--- a/tools/droiddoc/templates-sdk/assets/js/docs.js
+++ b/tools/droiddoc/templates-sdk/assets/js/docs.js
@@ -186,6 +186,8 @@
subNavEl.find("li.google > a").addClass("selected");
} else if ($("body").hasClass("samples")) {
subNavEl.find("li.samples > a").addClass("selected");
+ } else if ($("body").hasClass("preview")) {
+ subNavEl.find("li.preview > a").addClass("selected");
} else {
parentNavEl.removeClass('has-subnav').addClass("selected");
}
diff --git a/tools/droiddoc/templates-sdk/components/masthead.cs b/tools/droiddoc/templates-sdk/components/masthead.cs
index 9e6a645..000d95f 100644
--- a/tools/droiddoc/templates-sdk/components/masthead.cs
+++ b/tools/droiddoc/templates-sdk/components/masthead.cs
@@ -103,7 +103,7 @@
<a class="dac-nav-link dac-visible-mobile-block" href="<?cs var:toroot ?>index.html">Home</a>
<ul class="dac-nav-secondary about">
<li class="dac-nav-item about">
- <a class="dac-nav-link" href="<?cs var:toroot ?>about/index.html">About</a>
+ <a class="dac-nav-link" href="<?cs var:toroot ?>about/index.html">Android</a>
</li>
<li class="dac-nav-item wear">
<a class="dac-nav-link" href="<?cs var:toroot ?>wear/index.html">Wear</a>
@@ -178,7 +178,7 @@
</li>
<?cs /if ?>
<li class="dac-nav-item preview">
- <a class="dac-nav-link" href="<?cs var:toroot ?>preview/index.html">M Preview</a>
+ <a class="dac-nav-link" href="<?cs var:toroot ?>preview/index.html">Preview</a>
</li>
</ul>
</li>
@@ -200,14 +200,11 @@
<li class="dac-nav-item engage">
<a class="dac-nav-link" href="<?cs var:toroot ?>distribute/engage/index.html">Engage & Retain</a></li>
<li class="dac-nav-item monetize">
- <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/monetize/index.html">Monetize</a>
+ <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/monetize/index.html">Earn</a>
</li>
<li class="dac-nav-item analyze">
<a class="dac-nav-link" href="<?cs var:toroot ?>distribute/analyze/index.html">Analyze</a>
</li>
- <li class="dac-nav-item disttools">
- <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/tools/index.html">Tools</a>
- </li>
<li class="dac-nav-item stories">
<a class="dac-nav-link" href="<?cs var:toroot ?>distribute/stories/index.html">Stories</a>
</li>