commit fbaa69711788f7ef700a84b9625ade35ce4a9612
author Tom Taylor <tomtaylor@google.com> Mon Nov 04 17:50:54 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 04 17:50:54 2013 +0000
tree e9af21dd9b8eeb809fca3b1587880bf80253aca7
parent d58c0295e61312bc8f00f385b82a5cdc19bb7b74
parent 2bcdee9b8ffbc82633381fd41c29b445f5e84ac4

Merge "Add a CTS test to make sure a SecurityException isn't thrown when accessing the APN table in Telephony provider" into klp-dev

apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
index 13bf13f..6b87261 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
@@ -182,6 +182,10 @@
 
     public static final Feature[] ALL_KITKAT_FEATURES = {
             new Feature(PackageManager.FEATURE_NFC_HOST_CARD_EMULATION, false),
+            new Feature(PackageManager.FEATURE_CONSUMER_IR, false),
+            new Feature(PackageManager.FEATURE_DEVICE_ADMIN, false),
+            new Feature(PackageManager.FEATURE_SENSOR_STEP_COUNTER, false),
+            new Feature(PackageManager.FEATURE_SENSOR_STEP_DETECTOR, false),
     };
 
     @Override

tests/tests/text/src/android/text/cts/HtmlTest.java

diff --git a/tests/tests/text/src/android/text/cts/HtmlTest.java b/tests/tests/text/src/android/text/cts/HtmlTest.java
index 74008f7..cf47ab9 100644
--- a/tests/tests/text/src/android/text/cts/HtmlTest.java
+++ b/tests/tests/text/src/android/text/cts/HtmlTest.java
@@ -208,4 +208,14 @@
         Spanned s = Html.fromHtml("<p>\u0124\u00eb\u0142\u0142o, world!</p>");
         assertEquals("<p dir=\"ltr\">&#292;&#235;&#322;&#322;o, world!</p>\n", Html.toHtml(s));
     }
+
+    public void testSurrogates() throws Exception {
+        Spanned s = Html.fromHtml("\ud83d\udc31");
+        assertEquals("<p dir=\"ltr\">&#128049;</p>\n", Html.toHtml(s));
+    }
+
+    public void testBadSurrogates() throws Exception {
+        Spanned s = Html.fromHtml("\udc31\ud83d");
+        assertEquals("<p dir=\"ltr\"></p>\n", Html.toHtml(s));
+    }
 }