Merge branch 'gingerbread' of git://android.git.kernel.org/platform/frameworks/base into sk (d7f59d4c) · Commits · e / os / android_frameworks_base

core/jni/android_net_wifi_Wifi.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -412,7 +412,9 @@ static jint android_net_wifi_getPowerModeCommand(JNIEnv* env, jobject clazz)
		}
		// reply comes back in the form "powermode = XX" where XX is the
		// number we're interested in.
		sscanf(reply, "%*s = %u", &power);
		if (sscanf(reply, "%*s = %u", &power) != 1) {
		return (jint)-1;
		}
		return (jint)power;
		}

core/res/res/values-de/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -194,7 +194,7 @@
		<string name="permgroupdesc_messages" msgid="7045736972019211994">"Lesen und schreiben Sie Ihre SMS, E-Mails und anderen Nachrichten."</string>
		<string name="permgrouplab_personalInfo" msgid="3519163141070533474">"Ihre persönlichen Informationen"</string>
		<string name="permgroupdesc_personalInfo" msgid="5488050357388806068">"Direkter Zugriff auf die Kontakte und den Kalender Ihres Telefons"</string>
		<string name="permgrouplab_location" msgid="635149742436692049">"Ihren Standort"</string>
		<string name="permgrouplab_location" msgid="635149742436692049">"Meinen Standort"</string>
		<string name="permgroupdesc_location" msgid="2430258821648348660">"Ihren physischen Standort überwachen"</string>
		<string name="permgrouplab_network" msgid="5808983377727109831">"Netzwerkkommunikation"</string>
		<string name="permgroupdesc_network" msgid="5035763698958415998">"Ermöglicht Anwendungen den Zugriff auf verschiedene Netzwerkfunktionen"</string>

core/res/res/values-ko/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -868,7 +868,7 @@
		<string name="create_contact_using" msgid="4947405226788104538">"전화번호부에"\n"<xliff:g id="NUMBER">%s</xliff:g> 추가"</string>
		<string name="accessibility_compound_button_selected" msgid="5612776946036285686">"선택함"</string>
		<string name="accessibility_compound_button_unselected" msgid="8864512895673924091">"선택 안함"</string>
		<string name="grant_credentials_permission_message_header" msgid="6824538733852821001">"현재 이후로 하나 이상의 다음 애플리케이션이 계정에 대한 액세스 권한을 요청합니다."</string>
		<string name="grant_credentials_permission_message_header" msgid="6824538733852821001">"다음 애플리케이션에서 계정 액세스 요청이 들어왔습니다."</string>
		<string name="grant_credentials_permission_message_footer" msgid="3125211343379376561">"요청을 허용하시겠습니까?"</string>
		<string name="grant_permissions_header_text" msgid="2722567482180797717">"액세스 요청"</string>
		<string name="allow" msgid="7225948811296386551">"허용"</string>

core/res/res/values/config.xml

+40 −0

Original line number	Diff line number	Diff line
		@@ -530,6 +530,46 @@
		option to enable/disable read reports is removed in the Messaging app. -->
		<bool name="config_mms_read_reports_support">true</bool>

		<!-- National Language Identifier codes for the following two config items.
		(from 3GPP TS 23.038 V9.1.1 Table 6.2.1.2.4.1):
		0 - reserved
		1 - Turkish
		2 - Spanish (single shift table only)
		3 - Portuguese
		4 - Bengali
		5 - Gujarati
		6 - Hindi
		7 - Kannada
		8 - Malayalam
		9 - Oriya
		10 - Punjabi
		11 - Tamil
		12 - Telugu
		13 - Urdu
		14+ - reserved -->

		<!-- National language single shift tables to enable for SMS encoding.
		Decoding is always enabled. 3GPP TS 23.038 states that this feature
		should not be enabled until a formal request is issued by the relevant
		national regulatory body. Array elements are codes from the table above.
		Example 1: devices sold in Turkey must include table 1 to conform with
		By-Law Number 27230. (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
		Example 2: devices sold in India should include tables 4 through 13
		to enable use of the new Release 9 tables for Indic languages. -->
		<integer-array name="config_sms_enabled_single_shift_tables"></integer-array>

		<!-- National language locking shift tables to enable for SMS encoding.
		Decoding is always enabled. 3GPP TS 23.038 states that this feature
		should not be enabled until a formal request is issued by the relevant
		national regulatory body. Array elements are codes from the table above.
		Example 1: devices sold in Turkey must include table 1 after the
		Turkish Telecommunication Authority requires locking shift encoding
		to be enabled (est. July 2012). (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
		See also: http://www.mobitech.com.tr/tr/ersanozturkblog_en/index.php?entry=entry090223-160014
		Example 2: devices sold in India should include tables 4 through 13
		to enable use of the new Release 9 tables for Indic languages. -->
		<integer-array name="config_sms_enabled_locking_shift_tables"></integer-array>

		<!-- Set and Unsets WiMAX -->
		<bool name="config_wimaxEnabled">false</bool>
		<!-- Location of the wimax framwork jar location -->

nfc-extras/java/com/android/nfc_extras/NfcAdapterExtras.java

+30 −8

Original line number	Diff line number	Diff line
		@@ -56,13 +56,21 @@ public final class NfcAdapterExtras {
		public static final String ACTION_RF_FIELD_OFF_DETECTED =
		"com.android.nfc_extras.action.RF_FIELD_OFF_DETECTED";

		// protected by NfcAdapterExtras.class, and final after first construction
		// protected by NfcAdapterExtras.class, and final after first construction,
		// except for attemptDeadServiceRecovery() when NFC crashes - we accept a
		// best effort recovery
		private static NfcAdapter sAdapter;
		private static INfcAdapterExtras sService;
		private static NfcAdapterExtras sSingleton;
		private static NfcExecutionEnvironment sEmbeddedEe;
		private static CardEmulationRoute sRouteOff;
		private static CardEmulationRoute sRouteOnWhenScreenOn;

		/** get service handles */
		private static void initService() {
		sService = sAdapter.getNfcAdapterExtrasInterface();
		}

		/**
		* Get the {@link NfcAdapterExtras} for the given {@link NfcAdapter}.
		*
		@@ -76,12 +84,13 @@ public final class NfcAdapterExtras {
		synchronized(NfcAdapterExtras.class) {
		if (sSingleton == null) {
		try {
		sService = adapter.getNfcAdapterExtrasInterface();
		sEmbeddedEe = new NfcExecutionEnvironment(sService);
		sAdapter = adapter;
		sRouteOff = new CardEmulationRoute(CardEmulationRoute.ROUTE_OFF, null);
		sSingleton = new NfcAdapterExtras();
		sEmbeddedEe = new NfcExecutionEnvironment(sSingleton);
		sRouteOnWhenScreenOn = new CardEmulationRoute(
		CardEmulationRoute.ROUTE_ON_WHEN_SCREEN_ON, sEmbeddedEe);
		sSingleton = new NfcAdapterExtras();
		initService();
		} finally {
		if (sSingleton == null) {
		sService = null;
		@@ -135,6 +144,19 @@ public final class NfcAdapterExtras {
		}
		}

		/**
		* NFC service dead - attempt best effort recovery
		*/
		void attemptDeadServiceRecovery(Exception e) {
		Log.e(TAG, "NFC Adapter Extras dead - attempting to recover");
		sAdapter.attemptDeadServiceRecovery(e);
		initService();
		}

		INfcAdapterExtras getService() {
		return sService;
		}

		/**
		* Get the routing state of this NFC EE.
		*
		@@ -150,7 +172,7 @@ public final class NfcAdapterExtras {
		sRouteOff :
		sRouteOnWhenScreenOn;
		} catch (RemoteException e) {
		Log.e(TAG, "", e);
		attemptDeadServiceRecovery(e);
		return sRouteOff;
		}
		}
		@@ -169,7 +191,7 @@ public final class NfcAdapterExtras {
		try {
		sService.setCardEmulationRoute(route.route);
		} catch (RemoteException e) {
		Log.e(TAG, "", e);
		attemptDeadServiceRecovery(e);
		}
		}

		@@ -190,7 +212,7 @@ public final class NfcAdapterExtras {
		try {
		sService.registerTearDownApdus(packageName, apdus);
		} catch (RemoteException e) {
		Log.e(TAG, "", e);
		attemptDeadServiceRecovery(e);
		}
		}

		@@ -198,7 +220,7 @@ public final class NfcAdapterExtras {
		try {
		sService.unregisterTearDownApdus(packageName);
		} catch (RemoteException e) {
		Log.e(TAG, "", e);
		attemptDeadServiceRecovery(e);
		}
		}
		}