diff options
| -rw-r--r-- | core/tests/coretests/src/android/text/TextUtilsTest.java | 34 | ||||
| -rw-r--r-- | native/include/android/configuration.h | 4 |
2 files changed, 2 insertions, 36 deletions
diff --git a/core/tests/coretests/src/android/text/TextUtilsTest.java b/core/tests/coretests/src/android/text/TextUtilsTest.java index 1beba53..e111662 100644 --- a/core/tests/coretests/src/android/text/TextUtilsTest.java +++ b/core/tests/coretests/src/android/text/TextUtilsTest.java @@ -30,7 +30,6 @@ import android.text.util.Rfc822Token; import android.text.util.Rfc822Tokenizer; import android.test.MoreAsserts; -import com.android.common.Rfc822Validator; import com.google.android.collect.Lists; import com.google.android.collect.Maps; @@ -238,39 +237,6 @@ public class TextUtilsTest extends TestCase { } } - //============================================================================================== - // Email validator - //============================================================================================== - - @SmallTest - public void testEmailValidator() { - Rfc822Validator validator = new Rfc822Validator("gmail.com"); - String[] validEmails = new String[] { - "a@b.com", "a@b.fr", "a+b@c.com", "a@b.info", - }; - - for (String email : validEmails) { - assertTrue(email + " should be a valid email address", validator.isValid(email)); - } - - String[] invalidEmails = new String[] { - "a", "a@b", "a b", "a@b.12" - }; - - for (String email : invalidEmails) { - assertFalse(email + " should not be a valid email address", validator.isValid(email)); - } - - Map<String, String> fixes = Maps.newHashMap(); - fixes.put("a", "<a@gmail.com>"); - fixes.put("a b", "<ab@gmail.com>"); - fixes.put("a@b", "<a@b>"); - - for (Map.Entry<String, String> e : fixes.entrySet()) { - assertEquals(e.getValue(), validator.fixText(e.getKey()).toString()); - } - } - @SmallTest public void testRfc822TokenizerFullAddress() { Rfc822Token[] tokens = Rfc822Tokenizer.tokenize("Foo Bar (something) <foo@google.com>"); diff --git a/native/include/android/configuration.h b/native/include/android/configuration.h index 79b9b1e..99e8f97 100644 --- a/native/include/android/configuration.h +++ b/native/include/android/configuration.h @@ -79,8 +79,8 @@ enum { ACONFIGURATION_UI_MODE_TYPE_CAR = 0x03, ACONFIGURATION_UI_MODE_NIGHT_ANY = 0x00, - ACONFIGURATION_UI_MODE_NIGHT_NO = 0x10, - ACONFIGURATION_UI_MODE_NIGHT_YES = 0x20, + ACONFIGURATION_UI_MODE_NIGHT_NO = 0x1, + ACONFIGURATION_UI_MODE_NIGHT_YES = 0x2, ACONFIGURATION_MCC = 0x0001, ACONFIGURATION_MNC = 0x0002, |