From 066aa99d2d114d46406e00fcc23d193d117395b1 Mon Sep 17 00:00:00 2001 From: Scott Turner Date: Thu, 14 Jan 2010 21:05:17 -0500 Subject: [PATCH 1/3] long modifier was on the wrong argument. --- tools/aidl/aidl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/aidl/aidl.cpp b/tools/aidl/aidl.cpp index fc658f5b54fba..f17f66b31f8e9 100644 --- a/tools/aidl/aidl.cpp +++ b/tools/aidl/aidl.cpp @@ -55,7 +55,7 @@ test_document(document_item_type* d) printf("parcelable %s %s;\n", b->package, b->name.data); } else { - printf("UNKNOWN d=0x%08x d->item_type=%ld\n", (long)d, d->item_type); + printf("UNKNOWN d=0x%08lx d->item_type=%d\n", (long)d, d->item_type); } d = d->next; } From 06daf19f6c77a3170215ca1a969a9b8fb913ab90 Mon Sep 17 00:00:00 2001 From: Simon Schoar Date: Wed, 10 Jun 2009 02:08:57 +0200 Subject: [PATCH 2/3] Added WEB_URL_PATTERN for Montenegro ".me" Change-Id: If725c5ee08ed840ae8323fa18b1d82ef2a42db87 --- core/java/android/text/util/Regex.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java/android/text/util/Regex.java b/core/java/android/text/util/Regex.java index a6844a464ffcf..5005b42ca2036 100644 --- a/core/java/android/text/util/Regex.java +++ b/core/java/android/text/util/Regex.java @@ -43,7 +43,7 @@ public class Regex { + "|(jobs|j[emop])" + "|k[eghimnrwyz]" + "|l[abcikrstuvy]" - + "|(mil|mobi|museum|m[acdghklmnopqrstuvwxyz])" + + "|(mil|mobi|museum|m[acdeghklmnopqrstuvwxyz])" + "|(name|net|n[acefgilopruz])" + "|(org|om)" + "|(pro|p[aefghklmnrstwy])" @@ -82,7 +82,7 @@ public class Regex { + "|(?:jobs|j[emop])" + "|k[eghimnrwyz]" + "|l[abcikrstuvy]" - + "|(?:mil|mobi|museum|m[acdghklmnopqrstuvwxyz])" + + "|(?:mil|mobi|museum|m[acdeghklmnopqrstuvwxyz])" + "|(?:name|net|n[acefgilopruz])" + "|(?:org|om)" + "|(?:pro|p[aefghklmnrstwy])" From 86568d705eb72ce0226b6b95f2d073f335a2bb0d Mon Sep 17 00:00:00 2001 From: Brad Larson Date: Tue, 29 Dec 2009 11:47:55 -0600 Subject: [PATCH 3/3] Use isLocationProviderEnabled to test for enabled providers LocationManagerService was just checking if the string of (comma-separated) Location Providers contained the provider we were interested in. This works fine in normal cases, but breaks if we add a provider such as test_network. Enabling test_network causes LocationManagerService to think that the network provider is also enabled. The code in Settings.Secure.isLocationProviderEnabled() checks for the commas in the string as well, to make sure that a provider name which is a substring of another provider name won't cause problems. It also centralizes the code which reads the string. Signed-off-by: Brad Larson Change-Id: I00dfe7c2b09739ed4c8ed07c6167e409b0bf7d13 --- services/java/com/android/server/LocationManagerService.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java index 024d8da52b9d1..e39da8cc9581c 100644 --- a/services/java/com/android/server/LocationManagerService.java +++ b/services/java/com/android/server/LocationManagerService.java @@ -552,10 +552,8 @@ public class LocationManagerService extends ILocationManager.Stub implements Run } // Use system settings ContentResolver resolver = mContext.getContentResolver(); - String allowedProviders = Settings.Secure.getString(resolver, - Settings.Secure.LOCATION_PROVIDERS_ALLOWED); - return ((allowedProviders != null) && (allowedProviders.contains(provider))); + return Settings.Secure.isLocationProviderEnabled(resolver, provider); } private void checkPermissionsSafe(String provider) {