Merge "Add new system service CountryDetector" (ff0aff19) · Commits · e / os / android_frameworks_base

Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -163,6 +163,8 @@ LOCAL_SRC_FILES += \
		core/java/com/android/internal/view/IInputMethodManager.aidl \
		core/java/com/android/internal/view/IInputMethodSession.aidl \
		core/java/com/android/internal/widget/IRemoteViewsFactory.aidl \
		location/java/android/location/ICountryDetector.aidl \
		location/java/android/location/ICountryListener.aidl \
		location/java/android/location/IGeocodeProvider.aidl \
		location/java/android/location/IGpsStatusListener.aidl \
		location/java/android/location/IGpsStatusProvider.aidl \

core/java/android/app/ContextImpl.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,8 @@ import android.database.sqlite.SQLiteDatabase.CursorFactory;
		import android.graphics.Bitmap;
		import android.graphics.drawable.Drawable;
		import android.hardware.SensorManager;
		import android.location.CountryDetector;
		import android.location.ICountryDetector;
		import android.location.ILocationManager;
		import android.location.LocationManager;
		import android.media.AudioManager;
		@@ -168,6 +170,7 @@ class ContextImpl extends Context {
		private static ThrottleManager sThrottleManager;
		private static WifiManager sWifiManager;
		private static LocationManager sLocationManager;
		private static CountryDetector sCountryDetector;
		private static final HashMap<File, SharedPreferencesImpl> sSharedPrefs =
		new HashMap<File, SharedPreferencesImpl>();

		@@ -954,6 +957,8 @@ class ContextImpl extends Context {
		return AccessibilityManager.getInstance(this);
		} else if (LOCATION_SERVICE.equals(name)) {
		return getLocationManager();
		} else if (COUNTRY_DETECTOR.equals(name)) {
		return getCountryDetector();
		} else if (SEARCH_SERVICE.equals(name)) {
		return getSearchManager();
		} else if (SENSOR_SERVICE.equals(name)) {
		@@ -1120,6 +1125,17 @@ class ContextImpl extends Context {
		return sLocationManager;
		}

		private CountryDetector getCountryDetector() {
		synchronized (sSync) {
		if (sCountryDetector == null) {
		IBinder b = ServiceManager.getService(COUNTRY_DETECTOR);
		ICountryDetector service = ICountryDetector.Stub.asInterface(b);
		sCountryDetector = new CountryDetector(service);
		}
		}
		return sCountryDetector;
		}

		private SearchManager getSearchManager() {
		synchronized (mSync) {
		if (mSearchManager == null) {

core/java/android/content/Context.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -1381,6 +1381,15 @@ public abstract class Context {
		*/
		public static final String LOCATION_SERVICE = "location";

		/**
		* Use with {@link #getSystemService} to retrieve a
		* {@link android.location.CountryDetector} for detecting the country that
		* the user is in.
		*
		* @hide
		*/
		public static final String COUNTRY_DETECTOR = "country_detector";

		/**
		* Use with {@link #getSystemService} to retrieve a {@link
		* android.app.SearchManager} for handling searches.

location/java/android/location/Country.aidl

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010, The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.location;

		parcelable Country;
		No newline at end of file

location/java/android/location/Country.java

0 → 100755

+161 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License
		*/

		package android.location;

		import android.os.Parcel;
		import android.os.Parcelable;

		/**
		* This class wraps the country information.
		*
		* @hide
		*/
		public class Country implements Parcelable {
		/**
		* The country code came from the mobile network
		*/
		public static final int COUNTRY_SOURCE_NETWORK = 0;

		/**
		* The country code came from the location service
		*/
		public static final int COUNTRY_SOURCE_LOCATION = 1;

		/**
		* The country code was read from the SIM card
		*/
		public static final int COUNTRY_SOURCE_SIM = 2;

		/**
		* The country code came from the system locale setting
		*/
		public static final int COUNTRY_SOURCE_LOCALE = 3;

		/**
		* The ISO 3166-1 two letters country code.
		*/
		private final String mCountryIso;

		/**
		* Where the country code came from.
		*/
		private final int mSource;

		private int mHashCode;
		/**
		*
		* @param countryIso the ISO 3166-1 two letters country code.
		* @param source where the countryIso came from, could be one of below
		* values
		* <p>
		* <ul>
		* <li>{@link #COUNTRY_SOURCE_NETWORK}</li>
		* <li>{@link #COUNTRY_SOURCE_LOCATION}</li>
		* <li>{@link #COUNTRY_SOURCE_SIM}</li>
		* <li>{@link #COUNTRY_SOURCE_LOCALE}</li>
		* </ul>
		*/
		public Country(final String countryIso, final int source) {
		if (countryIso == null \|\| source < COUNTRY_SOURCE_NETWORK
		\|\| source > COUNTRY_SOURCE_LOCALE) {
		throw new IllegalArgumentException();
		}
		mCountryIso = countryIso.toLowerCase();
		mSource = source;
		}

		public Country(Country country) {
		mCountryIso = country.mCountryIso;
		mSource = country.mSource;
		}

		/**
		* @return the ISO 3166-1 two letters country code
		*/
		public final String getCountryIso() {
		return mCountryIso;
		}

		/**
		* @return where the country code came from, could be one of below values
		* <p>
		* <ul>
		* <li>{@link #COUNTRY_SOURCE_NETWORK}</li>
		* <li>{@link #COUNTRY_SOURCE_LOCATION}</li>
		* <li>{@link #COUNTRY_SOURCE_SIM}</li>
		* <li>{@link #COUNTRY_SOURCE_LOCALE}</li>
		* </ul>
		*/
		public final int getSource() {
		return mSource;
		}

		public static final Parcelable.Creator<Country> CREATOR = new Parcelable.Creator<Country>() {
		public Country createFromParcel(Parcel in) {
		return new Country(in.readString(), in.readInt());
		}

		public Country[] newArray(int size) {
		return new Country[size];
		}
		};

		public int describeContents() {
		return 0;
		}

		public void writeToParcel(Parcel parcel, int flags) {
		parcel.writeString(mCountryIso);
		parcel.writeInt(mSource);
		}

		@Override
		public boolean equals(Object object) {
		if (object == this) {
		return true;
		}
		if (object instanceof Country) {
		Country c = (Country) object;
		return mCountryIso.equals(c.getCountryIso()) && mSource == c.getSource();
		}
		return false;
		}

		@Override
		public int hashCode() {
		int hash = mHashCode;
		if (hash == 0) {
		hash = 17;
		hash = hash * 13 + mCountryIso.hashCode();
		hash = hash * 13 + mSource;
		mHashCode = hash;
		}
		return mHashCode;
		}

		/**
		* Compare the specified country to this country object ignoring the mSource
		* field, return true if the countryIso fields are equal
		*
		* @param country the country to compare
		* @return true if the specified country's countryIso field is equal to this
		* country's, false otherwise.
		*/
		public boolean equalsIgnoreSource(Country country) {
		return country != null && mCountryIso.equals(country.getCountryIso());
		}
		}