Merge "Fix issue #10034864: Define YouTube application as the preferred..." into lmp-dev
diff --git a/Android.mk b/Android.mk
index 7fa0e87..7362803 100644
--- a/Android.mk
+++ b/Android.mk
@@ -422,85 +422,160 @@
include $(CLEAR_VARS)
aidl_files := \
- frameworks/base/core/java/android/accounts/IAccountManager.aidl \
- frameworks/base/core/java/android/accounts/IAccountManagerResponse.aidl \
- frameworks/base/core/java/android/accounts/IAccountAuthenticator.aidl \
- frameworks/base/core/java/android/accounts/IAccountAuthenticatorResponse.aidl \
- frameworks/base/core/java/android/app/Notification.aidl \
- frameworks/base/core/java/android/app/PendingIntent.aidl \
- frameworks/base/core/java/android/appwidget/AppWidgetProviderInfo.aidl \
- frameworks/base/core/java/android/bluetooth/BluetoothDevice.aidl \
- frameworks/base/core/java/android/bluetooth/BluetoothHealthAppConfiguration.aidl \
- frameworks/base/core/java/android/content/ComponentName.aidl \
- frameworks/base/core/java/android/content/ContentValues.aidl \
- frameworks/base/core/java/android/content/Intent.aidl \
- frameworks/base/core/java/android/content/IntentSender.aidl \
- frameworks/base/core/java/android/content/PeriodicSync.aidl \
- frameworks/base/core/java/android/content/SyncRequest.aidl \
- frameworks/base/core/java/android/content/SyncStats.aidl \
- frameworks/base/core/java/android/content/res/Configuration.aidl \
- frameworks/base/core/java/android/database/CursorWindow.aidl \
- frameworks/base/core/java/android/hardware/location/GeofenceHardwareRequestParcelable.aidl \
- frameworks/base/core/java/android/net/Uri.aidl \
- frameworks/base/core/java/android/nfc/NdefMessage.aidl \
- frameworks/base/core/java/android/nfc/NdefRecord.aidl \
- frameworks/base/core/java/android/nfc/Tag.aidl \
- frameworks/base/core/java/android/os/Bundle.aidl \
- frameworks/base/core/java/android/os/DropBoxManager.aidl \
- frameworks/base/core/java/android/os/ParcelFileDescriptor.aidl \
- frameworks/base/core/java/android/os/ParcelUuid.aidl \
- frameworks/base/core/java/android/os/PersistableBundle.aidl \
- frameworks/base/core/java/android/print/PrinterInfo.aidl \
+ frameworks/base/telephony/java/android/telephony/ServiceState.aidl \
+ frameworks/base/telephony/java/android/telephony/CellInfo.aidl \
+ frameworks/base/telephony/java/android/telephony/SignalStrength.aidl \
+ frameworks/base/telephony/java/android/telephony/IccOpenLogicalChannelResponse.aidl \
+ frameworks/base/telephony/java/android/telephony/NeighboringCellInfo.aidl \
+ frameworks/base/location/java/android/location/Location.aidl \
+ frameworks/base/location/java/android/location/Address.aidl \
+ frameworks/base/location/java/android/location/Criteria.aidl \
+ frameworks/base/media/java/android/media/MediaMetadata.aidl \
+ frameworks/base/media/java/android/media/MediaDescription.aidl \
+ frameworks/base/media/java/android/media/Rating.aidl \
+ frameworks/base/media/java/android/media/AudioAttributes.aidl \
+ frameworks/base/media/java/android/media/session/PlaybackState.aidl \
+ frameworks/base/media/java/android/media/session/MediaSession.aidl \
+ frameworks/base/media/java/android/media/tv/TvInputInfo.aidl \
+ frameworks/base/media/java/android/media/tv/TvTrackInfo.aidl \
+ frameworks/base/media/java/android/media/browse/MediaBrowser.aidl \
+ frameworks/base/wifi/java/android/net/wifi/ScanSettings.aidl \
+ frameworks/base/wifi/java/android/net/wifi/p2p/WifiP2pInfo.aidl \
+ frameworks/base/wifi/java/android/net/wifi/p2p/WifiP2pDeviceList.aidl \
+ frameworks/base/wifi/java/android/net/wifi/p2p/WifiP2pConfig.aidl \
+ frameworks/base/wifi/java/android/net/wifi/p2p/WifiP2pDevice.aidl \
+ frameworks/base/wifi/java/android/net/wifi/p2p/WifiP2pGroup.aidl \
+ frameworks/base/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.aidl \
+ frameworks/base/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.aidl \
+ frameworks/base/wifi/java/android/net/wifi/WpsInfo.aidl \
+ frameworks/base/wifi/java/android/net/wifi/ScanResult.aidl \
+ frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.aidl \
+ frameworks/base/wifi/java/android/net/wifi/WifiConfiguration.aidl \
+ frameworks/base/wifi/java/android/net/wifi/WifiInfo.aidl \
+ frameworks/base/graphics/java/android/graphics/Region.aidl \
+ frameworks/base/graphics/java/android/graphics/Bitmap.aidl \
+ frameworks/base/graphics/java/android/graphics/Point.aidl \
+ frameworks/base/graphics/java/android/graphics/PointF.aidl \
+ frameworks/base/graphics/java/android/graphics/RectF.aidl \
+ frameworks/base/graphics/java/android/graphics/Rect.aidl \
+ frameworks/base/core/java/android/accounts/AuthenticatorDescription.aidl \
+ frameworks/base/core/java/android/accounts/Account.aidl \
+ frameworks/base/core/java/android/print/PrintDocumentInfo.aidl \
frameworks/base/core/java/android/print/PageRange.aidl \
frameworks/base/core/java/android/print/PrintAttributes.aidl \
frameworks/base/core/java/android/print/PrinterCapabilitiesInfo.aidl \
frameworks/base/core/java/android/print/PrinterId.aidl \
- frameworks/base/core/java/android/print/PrintJobId.aidl \
frameworks/base/core/java/android/print/PrintJobInfo.aidl \
- frameworks/base/core/java/android/service/notification/StatusBarNotification.aidl \
- frameworks/base/core/java/android/view/accessibility/AccessibilityEvent.aidl \
+ frameworks/base/core/java/android/print/PrinterInfo.aidl \
+ frameworks/base/core/java/android/print/PrintJobId.aidl \
+ frameworks/base/core/java/android/hardware/usb/UsbDevice.aidl \
+ frameworks/base/core/java/android/hardware/usb/UsbInterface.aidl \
+ frameworks/base/core/java/android/hardware/usb/UsbEndpoint.aidl \
+ frameworks/base/core/java/android/hardware/usb/UsbAccessory.aidl \
+ frameworks/base/core/java/android/os/Messenger.aidl \
+ frameworks/base/core/java/android/os/PatternMatcher.aidl \
+ frameworks/base/core/java/android/os/Message.aidl \
+ frameworks/base/core/java/android/os/UserHandle.aidl \
+ frameworks/base/core/java/android/os/ParcelUuid.aidl \
+ frameworks/base/core/java/android/os/ParcelFileDescriptor.aidl \
+ frameworks/base/core/java/android/os/ResultReceiver.aidl \
+ frameworks/base/core/java/android/os/PersistableBundle.aidl \
+ frameworks/base/core/java/android/os/WorkSource.aidl \
+ frameworks/base/core/java/android/os/DropBoxManager.aidl \
+ frameworks/base/core/java/android/os/Bundle.aidl \
+ frameworks/base/core/java/android/accessibilityservice/AccessibilityServiceInfo.aidl \
+ frameworks/base/core/java/android/net/Network.aidl \
+ frameworks/base/core/java/android/net/RouteInfo.aidl \
+ frameworks/base/core/java/android/net/NetworkInfo.aidl \
+ frameworks/base/core/java/android/net/IpPrefix.aidl \
+ frameworks/base/core/java/android/net/NetworkCapabilities.aidl \
+ frameworks/base/core/java/android/net/DhcpInfo.aidl \
+ frameworks/base/core/java/android/net/ProxyInfo.aidl \
+ frameworks/base/core/java/android/net/LinkProperties.aidl \
+ frameworks/base/core/java/android/net/Uri.aidl \
+ frameworks/base/core/java/android/net/NetworkRequest.aidl \
+ frameworks/base/core/java/android/net/LinkAddress.aidl \
+ frameworks/base/core/java/android/view/Surface.aidl \
+ frameworks/base/core/java/android/view/WindowContentFrameStats.aidl \
+ frameworks/base/core/java/android/view/InputDevice.aidl \
+ frameworks/base/core/java/android/view/InputEvent.aidl \
+ frameworks/base/core/java/android/view/inputmethod/InputMethodSubtype.aidl \
+ frameworks/base/core/java/android/view/inputmethod/CursorAnchorInfo.aidl \
+ frameworks/base/core/java/android/view/inputmethod/CompletionInfo.aidl \
+ frameworks/base/core/java/android/view/inputmethod/ExtractedText.aidl \
+ frameworks/base/core/java/android/view/inputmethod/EditorInfo.aidl \
+ frameworks/base/core/java/android/view/inputmethod/InputMethodInfo.aidl \
+ frameworks/base/core/java/android/view/inputmethod/CorrectionInfo.aidl \
+ frameworks/base/core/java/android/view/inputmethod/InputBinding.aidl \
+ frameworks/base/core/java/android/view/inputmethod/ExtractedTextRequest.aidl \
+ frameworks/base/core/java/android/view/DragEvent.aidl \
+ frameworks/base/core/java/android/view/KeyEvent.aidl \
+ frameworks/base/core/java/android/view/WindowAnimationFrameStats.aidl \
+ frameworks/base/core/java/android/view/MotionEvent.aidl \
frameworks/base/core/java/android/view/accessibility/AccessibilityNodeInfo.aidl \
frameworks/base/core/java/android/view/accessibility/AccessibilityRecord.aidl \
frameworks/base/core/java/android/view/accessibility/AccessibilityWindowInfo.aidl \
- frameworks/base/core/java/android/view/KeyEvent.aidl \
- frameworks/base/core/java/android/view/MotionEvent.aidl \
- frameworks/base/core/java/android/view/Surface.aidl \
- frameworks/base/core/java/android/view/WindowManager.aidl \
- frameworks/base/core/java/android/view/WindowAnimationFrameStats.aidl \
- frameworks/base/core/java/android/view/WindowContentFrameStats.aidl \
+ frameworks/base/core/java/android/view/accessibility/AccessibilityEvent.aidl \
+ frameworks/base/core/java/android/view/textservice/SpellCheckerSubtype.aidl \
+ frameworks/base/core/java/android/view/textservice/TextInfo.aidl \
+ frameworks/base/core/java/android/view/textservice/SpellCheckerInfo.aidl \
+ frameworks/base/core/java/android/view/textservice/SentenceSuggestionsInfo.aidl \
+ frameworks/base/core/java/android/view/textservice/SuggestionsInfo.aidl \
+ frameworks/base/core/java/android/service/notification/StatusBarNotification.aidl \
+ frameworks/base/core/java/android/speech/tts/Voice.aidl \
+ frameworks/base/core/java/android/app/usage/UsageEvents.aidl \
+ frameworks/base/core/java/android/app/Notification.aidl \
+ frameworks/base/core/java/android/app/WallpaperInfo.aidl \
+ frameworks/base/core/java/android/app/AppOpsManager.aidl \
+ frameworks/base/core/java/android/app/ActivityManager.aidl \
+ frameworks/base/core/java/android/app/PendingIntent.aidl \
+ frameworks/base/core/java/android/app/AlarmManager.aidl \
+ frameworks/base/core/java/android/app/SearchableInfo.aidl \
+ frameworks/base/core/java/android/app/job/JobParameters.aidl \
+ frameworks/base/core/java/android/app/job/JobInfo.aidl \
+ frameworks/base/core/java/android/appwidget/AppWidgetProviderInfo.aidl \
+ frameworks/base/core/java/android/content/ClipDescription.aidl \
+ frameworks/base/core/java/android/content/IntentFilter.aidl \
+ frameworks/base/core/java/android/content/Intent.aidl \
+ frameworks/base/core/java/android/content/res/Configuration.aidl \
+ frameworks/base/core/java/android/content/res/ObbInfo.aidl \
+ frameworks/base/core/java/android/content/RestrictionEntry.aidl \
+ frameworks/base/core/java/android/content/ClipData.aidl \
+ frameworks/base/core/java/android/content/SyncAdapterType.aidl \
+ frameworks/base/core/java/android/content/SyncRequest.aidl \
+ frameworks/base/core/java/android/content/PeriodicSync.aidl \
+ frameworks/base/core/java/android/content/SyncResult.aidl \
+ frameworks/base/core/java/android/content/pm/FeatureInfo.aidl \
+ frameworks/base/core/java/android/content/pm/InstrumentationInfo.aidl \
+ frameworks/base/core/java/android/content/pm/PackageInstaller.aidl \
+ frameworks/base/core/java/android/content/pm/ServiceInfo.aidl \
+ frameworks/base/core/java/android/content/pm/Signature.aidl \
+ frameworks/base/core/java/android/content/pm/ApplicationInfo.aidl \
+ frameworks/base/core/java/android/content/pm/PermissionInfo.aidl \
+ frameworks/base/core/java/android/content/pm/ActivityInfo.aidl \
+ frameworks/base/core/java/android/content/pm/PackageInfo.aidl \
+ frameworks/base/core/java/android/content/pm/ResolveInfo.aidl \
+ frameworks/base/core/java/android/content/pm/ProviderInfo.aidl \
+ frameworks/base/core/java/android/content/pm/PackageStats.aidl \
+ frameworks/base/core/java/android/content/pm/PermissionGroupInfo.aidl \
+ frameworks/base/core/java/android/content/ComponentName.aidl \
+ frameworks/base/core/java/android/content/SyncStats.aidl \
+ frameworks/base/core/java/android/content/ContentValues.aidl \
+ frameworks/base/core/java/android/content/SyncInfo.aidl \
+ frameworks/base/core/java/android/content/IntentSender.aidl \
frameworks/base/core/java/android/widget/RemoteViews.aidl \
- frameworks/base/core/java/com/android/internal/textservice/ISpellCheckerService.aidl \
- frameworks/base/core/java/com/android/internal/textservice/ISpellCheckerSession.aidl \
- frameworks/base/core/java/com/android/internal/textservice/ISpellCheckerSessionListener.aidl \
- frameworks/base/core/java/com/android/internal/textservice/ITextServicesManager.aidl \
- frameworks/base/core/java/com/android/internal/textservice/ITextServicesSessionListener.aidl \
- frameworks/base/core/java/com/android/internal/view/IInputContext.aidl \
- frameworks/base/core/java/com/android/internal/view/IInputMethod.aidl \
- frameworks/base/core/java/com/android/internal/view/IInputMethodClient.aidl \
- frameworks/base/core/java/com/android/internal/view/IInputMethodManager.aidl \
- frameworks/base/core/java/com/android/internal/view/IInputMethodSession.aidl \
- frameworks/base/graphics/java/android/graphics/Bitmap.aidl \
- frameworks/base/graphics/java/android/graphics/Rect.aidl \
- frameworks/base/graphics/java/android/graphics/Region.aidl \
- frameworks/base/location/java/android/location/Criteria.aidl \
- frameworks/base/location/java/android/location/Geofence.aidl \
- frameworks/base/location/java/android/location/Location.aidl \
- frameworks/base/location/java/android/location/LocationRequest.aidl \
- frameworks/base/location/java/android/location/FusedBatchOptions.aidl \
- frameworks/base/location/java/com/android/internal/location/ProviderProperties.aidl \
- frameworks/base/location/java/com/android/internal/location/ProviderRequest.aidl \
- frameworks/base/media/java/android/media/AudioAttributes.aidl \
- frameworks/base/media/java/android/media/MediaDescription.aidl \
- frameworks/base/media/java/android/media/MediaMetadata.aidl \
- frameworks/base/media/java/android/media/Rating.aidl \
- frameworks/base/media/java/android/media/browse/MediaBrowser.aidl \
- frameworks/base/media/java/android/media/session/MediaSession.aidl \
- frameworks/base/media/java/android/media/session/PlaybackState.aidl \
- frameworks/base/telephony/java/android/telephony/ServiceState.aidl \
- frameworks/base/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl \
- frameworks/base/telephony/java/com/android/internal/telephony/ITelephony.aidl \
- frameworks/base/wifi/java/android/net/wifi/BatchedScanSettings.aidl \
- frameworks/base/wifi/java/android/net/wifi/BatchedScanResult.aidl \
+ frameworks/base/core/java/android/text/style/SuggestionSpan.aidl \
+ frameworks/base/core/java/android/nfc/Tag.aidl \
+ frameworks/base/core/java/android/nfc/NdefRecord.aidl \
+ frameworks/base/core/java/android/nfc/NdefMessage.aidl \
+ frameworks/base/core/java/android/bluetooth/BluetoothHealthAppConfiguration.aidl \
+ frameworks/base/core/java/android/bluetooth/le/AdvertiseSettings.aidl \
+ frameworks/base/core/java/android/bluetooth/le/ScanSettings.aidl \
+ frameworks/base/core/java/android/bluetooth/le/AdvertiseData.aidl \
+ frameworks/base/core/java/android/bluetooth/le/ScanFilter.aidl \
+ frameworks/base/core/java/android/bluetooth/le/ScanResult.aidl \
+ frameworks/base/core/java/android/bluetooth/BluetoothDevice.aidl \
+ frameworks/base/core/java/android/database/CursorWindow.aidl
gen := $(TARGET_OUT_COMMON_INTERMEDIATES)/framework.aidl
$(gen): PRIVATE_SRC_FILES := $(aidl_files)
diff --git a/core/java/android/view/Surface.java b/core/java/android/view/Surface.java
index 78986d9..3770b8a 100644
--- a/core/java/android/view/Surface.java
+++ b/core/java/android/view/Surface.java
@@ -250,7 +250,7 @@
// double-lock, but that won't happen if mNativeObject was updated. We can't
// abandon the old mLockedObject because it might still be in use, so instead
// we just refuse to re-lock the Surface.
- throw new IllegalStateException("Surface was already locked");
+ throw new IllegalArgumentException("Surface was already locked");
}
mLockedObject = nativeLockCanvas(mNativeObject, mCanvas, inOutDirty);
return mCanvas;
@@ -279,9 +279,12 @@
if (mLockedObject == 0) {
throw new IllegalStateException("Surface was not locked");
}
- nativeUnlockCanvasAndPost(mLockedObject, canvas);
- nativeRelease(mLockedObject);
- mLockedObject = 0;
+ try {
+ nativeUnlockCanvasAndPost(mLockedObject, canvas);
+ } finally {
+ nativeRelease(mLockedObject);
+ mLockedObject = 0;
+ }
}
}
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 937f83a..0767dbb 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -405,7 +405,7 @@
<!-- @hide -->
<permission android:name="android.permission.RECEIVE_BLUETOOTH_MAP"
android:permissionGroup="android.permission-group.MESSAGES"
- android:protectionLevel="dangerous"
+ android:protectionLevel="signature|system"
android:label="@string/permlab_receiveBluetoothMap"
android:description="@string/permdesc_receiveBluetoothMap" />
@@ -1223,7 +1223,7 @@
@hide Pending API council approval -->
<permission android:name="android.permission.READ_PRECISE_PHONE_STATE"
android:permissionGroup="android.permission-group.PHONE_CALLS"
- android:protectionLevel="dangerous"
+ android:protectionLevel="signature|system"
android:label="@string/permlab_readPrecisePhoneState"
android:description="@string/permdesc_readPrecisePhoneState" />
diff --git a/core/res/res/layout/app_permission_item_money.xml b/core/res/res/layout/app_permission_item_money.xml
index 7e1aca1..2056285 100644
--- a/core/res/res/layout/app_permission_item_money.xml
+++ b/core/res/res/layout/app_permission_item_money.xml
@@ -57,6 +57,8 @@
android:layout_alignParentStart="true"
android:layout_alignBottom="@+id/perm_money_label"
android:scaleType="fitCenter"
+ android:tint="@color/perms_costs_money"
+ android:tintMode="src_in"
android:src="@android:drawable/ic_coins_s" />
<TextView
android:id="@+id/perm_money_label"
diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml
index cbaf54f..235bf84 100644
--- a/core/res/res/values/colors.xml
+++ b/core/res/res/values/colors.xml
@@ -85,7 +85,7 @@
<color name="perms_dangerous_grp_color">#33b5e5</color>
<color name="perms_dangerous_perm_color">#33b5e5</color>
<color name="shadow">#cc222222</color>
- <color name="perms_costs_money">#ffffbb33</color>
+ <color name="perms_costs_money">#fff4511e</color>
<!-- For search-related UIs -->
<color name="search_url_text_normal">#7fa87f</color>
diff --git a/docs/html/guide/topics/connectivity/nfc/nfc.jd b/docs/html/guide/topics/connectivity/nfc/nfc.jd
index 19ce4d7..520f520 100644
--- a/docs/html/guide/topics/connectivity/nfc/nfc.jd
+++ b/docs/html/guide/topics/connectivity/nfc/nfc.jd
@@ -105,8 +105,8 @@
the specification of the type of record that you want to create. Android
also supports other types of tags that do not contain NDEF data, which you can work with by using
the classes in the {@link android.nfc.tech} package. To learn more
-about these technologies, see the <a href="{@docRoot}guide/topics/connectivity/nfc/advanced-nfc.html">Advanced
-NFC</a> topic. Working with these other types of tags involves
+about these technologies, see the <a href="{@docRoot}guide/topics/connectivity/nfc/advanced-nfc.html
+">Advanced NFC</a> topic. Working with these other types of tags involves
writing your own protocol stack to communicate with the tags, so we recommend using NDEF when
possible for ease of development and maximum support for Android-powered devices.
</p>
@@ -477,8 +477,8 @@
<li>{@link android.nfc.NfcAdapter#EXTRA_TAG} (required): A {@link android.nfc.Tag} object
representing the scanned tag.</li>
<li>{@link android.nfc.NfcAdapter#EXTRA_NDEF_MESSAGES} (optional): An array of NDEF messages
-parsed from the tag. This extra is mandatory on {@link android.nfc.NfcAdapter#ACTION_NDEF_DISCOVERED}
-intents.</li>
+parsed from the tag. This extra is mandatory on
+{@link android.nfc.NfcAdapter#ACTION_NDEF_DISCOVERED} intents.</li>
<li>{@link android.nfc.NfcAdapter#EXTRA_ID} (optional): The low-level ID of the tag.</li></ul>
<p>To obtain these extras, check to see if your activity was launched with one of
@@ -513,7 +513,8 @@
<p>This section describes how to create common types of NDEF records to help you when writing to
NFC tags or sending data with Android Beam. Starting with Android 4.0 (API level 14), the
{@link android.nfc.NdefRecord#createUri createUri()} method is available to help you create
-URI records automatically. Starting in Android 4.1 (API level 16), {@link android.nfc.NdefRecord#createExternal createExternal()}
+URI records automatically. Starting in Android 4.1 (API level 16),
+{@link android.nfc.NdefRecord#createExternal createExternal()}
and {@link android.nfc.NdefRecord#createMime createMime()} are available to help you create
MIME and external type NDEF records. Use these helper methods whenever possible to avoid mistakes
when manually creating NDEF records.</p>
@@ -528,7 +529,8 @@
<a href="#well-known-uri"><code>RTD_URI</code></a> type instead
of {@link android.nfc.NdefRecord#TNF_ABSOLUTE_URI}, because it is more efficient.</p>
-<p>You can create a {@link android.nfc.NdefRecord#TNF_ABSOLUTE_URI} NDEF record in the following way:</p>
+<p>You can create a {@link android.nfc.NdefRecord#TNF_ABSOLUTE_URI} NDEF record in the following way
+:</p>
<pre>
NdefRecord uriRecord = new NdefRecord(
@@ -549,7 +551,8 @@
</pre>
<h3 id="mime">TNF_MIME_MEDIA</h3>
-<p>You can create a {@link android.nfc.NdefRecord#TNF_MIME_MEDIA} NDEF record in the following ways.</p>
+<p>You can create a {@link android.nfc.NdefRecord#TNF_MIME_MEDIA} NDEF record in the following ways:
+</p>
<p>Using the {@link android.nfc.NdefRecord#createMime createMime()} method:</p>
<pre>
@@ -576,7 +579,8 @@
<h3 id="well-known-text">TNF_WELL_KNOWN with RTD_TEXT</h3>
-<p>You can create a {@link android.nfc.NdefRecord#TNF_WELL_KNOWN} NDEF record in the following way:</p>
+<p>You can create a {@link android.nfc.NdefRecord#TNF_WELL_KNOWN} NDEF record in the following way:
+</p>
<pre>
public NdefRecord createTextRecord(String payload, Locale locale, boolean encodeInUtf8) {
byte[] langBytes = locale.getLanguage().getBytes(Charset.forName("US-ASCII"));
@@ -606,7 +610,8 @@
<h3 id="well-known-uri">TNF_WELL_KNOWN with RTD_URI</h3>
-<p>You can create a {@link android.nfc.NdefRecord#TNF_WELL_KNOWN} NDEF record in the following ways.</p>
+<p>You can create a {@link android.nfc.NdefRecord#TNF_WELL_KNOWN} NDEF record in the following ways:
+</p>
<p>Using the {@link android.nfc.NdefRecord#createUri(String)} method:</p>
<pre>
@@ -642,7 +647,8 @@
</pre>
<h3 id="ext-type">TNF_EXTERNAL_TYPE</h3>
-<p>You can create a {@link android.nfc.NdefRecord#TNF_EXTERNAL_TYPE} NDEF record in the following ways:</p>
+<p>You can create a {@link android.nfc.NdefRecord#TNF_EXTERNAL_TYPE} NDEF record in the following
+ways:</p>
<p>Using the {@link android.nfc.NdefRecord#createExternal createExternal()} method:
<pre>
@@ -681,19 +687,19 @@
declares that the <code>urn:nfc:ext:</code> portion of the URN must be ommitted from the
NDEF record. So all you need to provide is the domain (<code>example.com</code> in the example)
and type (<code>externalType</code> in the example) separated by a colon.
-When dispatching TNF_EXTERNAL_TYPE, Android converts the <code>urn:nfc:ext:example.com:externalType</code> URN to a
-<code>vnd.android.nfc://ext/example.com:externalType</code> URI, which is what the intent filter in the example
-declares.</p>
+When dispatching TNF_EXTERNAL_TYPE, Android converts the <code>urn:nfc:ext:example.com:externalType
+</code> URN to a <code>vnd.android.nfc://ext/example.com:externalType</code> URI, which is what the
+intent filter in the example declares.</p>
<h3 id="aar">Android Application Records</h3>
<p>
Introduced in Android 4.0 (API level 14), an Android Application Record (AAR) provides a stronger
certainty that your application is started when an NFC tag is scanned. An AAR has the package name
-of an application embedded inside an NDEF record. You can add an AAR to any NDEF record of your NDEF message,
-because Android searches the entire NDEF message for AARs. If it finds an AAR, it starts the application based
-on the package name inside the AAR. If the application is not present on the device,
-Google Play is launched to download the application.</p>
+of an application embedded inside an NDEF record. You can add an AAR to any NDEF record of your NDEF
+message, because Android searches the entire NDEF message for AARs. If it finds an AAR, it starts
+the application based on the package name inside the AAR. If the application is not present on the
+device, Google Play is launched to download the application.</p>
<p>AARs are useful if you want to prevent other applications from filtering for the same intent and
potentially handling specific tags that you have deployed. AARs are only supported at the
@@ -717,11 +723,11 @@
</p>
-<p class="note"><strong>Note:</strong> You can override AARs and the intent dispatch system with the <a
-href="{@docRoot}guide/topics/connectivity/nfc/advanced-nfc.html#foreground-dispatch">foreground dispatch
-system</a>, which allows a foreground activity to have priority when an NFC tag is discovered.
-With this method, the activity must be in the foreground to
-override AARs and the intent dispatch system.</p>
+<p class="note"><strong>Note:</strong> You can override AARs and the intent dispatch system with the
+ <ahref="{@docRoot}guide/topics/connectivity/nfc/advanced-nfc.html#foreground-dispatch">foreground
+ dispatch system</a>, which allows a foreground activity to have priority when an NFC tag is
+ discovered. With this method, the activity must be in the foreground to override AARs and the
+ intent dispatch system.</p>
<p>If you still want to filter for scanned tags that do not contain an AAR, you can declare
intent filters as normal. This is useful if your application is interested in other tags
@@ -799,9 +805,9 @@
<p class="note"><strong>Note:</strong> If your activity enables Android Beam and is
in the foreground, the standard intent dispatch system is disabled. However, if your activity also
-enables <a href="{@docRoot}guide/topics/connectivity/nfc/advanced-nfc.html#foreground-dispatch">foreground
-dispatching</a>, then it can still scan tags that match the intent filters set in the foreground
-dispatching.</p>
+enables <a href="{@docRoot}guide/topics/connectivity/nfc/advanced-nfc.html#foreground-dispatch">
+foreground dispatching</a>, then it can still scan tags that match the intent filters set in the
+foreground dispatching.</p>
<p>To enable Android Beam:</p>
diff --git a/docs/html/tools/sdk/tools-notes.jd b/docs/html/tools/sdk/tools-notes.jd
index b9803e4..20388be 100644
--- a/docs/html/tools/sdk/tools-notes.jd
+++ b/docs/html/tools/sdk/tools-notes.jd
@@ -29,6 +29,38 @@
<div class="toggle-content opened">
<p><a href="#" onclick="return toggleContent(this)">
<img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img"
+ alt=""/>SDK Tools, Revision 23.0.5</a> <em>(October 2014)</em>
+ </p>
+
+ <div class="toggle-content-toggleme">
+
+ <dl>
+ <dt>Dependencies:</dt>
+
+ <dd>
+ <ul>
+ <li>Android SDK Platform-tools revision 19 or later.</li>
+ <li>If you are developing in Eclipse with ADT, note that this version of SDK Tools is
+ designed for use with ADT 23.0.4 and later. If you haven't already, update your
+ <a href="{@docRoot}tools/sdk/eclipse-adt.html">ADT Plugin</a> to 23.0.4.</li>
+ <li>If you are developing outside Eclipse, you must have
+ <a href="http://ant.apache.org/">Apache Ant</a> 1.8 or later.</li>
+ </ul>
+ </dd>
+
+ <dt>General Notes:</dt>
+ <dd>
+ <ul>
+ <li>Fixed Windows 32-bit compilation issue.</li>
+ </ul>
+ </dd>
+ </div>
+</div>
+
+
+<div class="toggle-content closed">
+ <p><a href="#" onclick="return toggleContent(this)">
+ <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img"
alt=""/>SDK Tools, Revision 23.0.4</a> <em>(October 2014)</em>
</p>
diff --git a/docs/html/training/articles/perf-tips.jd b/docs/html/training/articles/perf-tips.jd
index 1660b7f..e9df51b 100644
--- a/docs/html/training/articles/perf-tips.jd
+++ b/docs/html/training/articles/perf-tips.jd
@@ -388,7 +388,7 @@
the JIT makes the two effectively indistinguishable.</p>
<p>On devices without a JIT, caching field accesses is about 20% faster than
-repeatedly accesssing the field. With a JIT, field access costs about the same
+repeatedly accessing the field. With a JIT, field access costs about the same
as local access, so this isn't a worthwhile optimization unless you feel it
makes your code easier to read. (This is true of final, static, and static
final fields too.)
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
index 0ed82d9..fef1f4a 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
@@ -421,9 +421,11 @@
if (showRootIcon) {
mToolbar.setNavigationIcon(
root != null ? root.loadToolbarIcon(mToolbar.getContext()) : null);
+ mToolbar.setNavigationContentDescription(R.string.drawer_open);
mToolbar.setNavigationOnClickListener(null);
} else {
mToolbar.setNavigationIcon(R.drawable.ic_hamburger);
+ mToolbar.setNavigationContentDescription(R.string.drawer_open);
mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
diff --git a/services/core/java/com/android/server/MountService.java b/services/core/java/com/android/server/MountService.java
index b0535b3..976e707 100644
--- a/services/core/java/com/android/server/MountService.java
+++ b/services/core/java/com/android/server/MountService.java
@@ -860,6 +860,11 @@
} catch (RemoteException e) {
Slog.e(TAG, "Error setting system locale from mount service", e);
}
+
+ // Temporary workaround for http://b/17945169.
+ Slog.d(TAG, "Setting system properties to " + systemLocale + " from mount service");
+ SystemProperties.set("persist.sys.language", locale.getLanguage());
+ SystemProperties.set("persist.sys.country", locale.getCountry());
}
/**
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 8437d52..837672a 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -7226,11 +7226,14 @@
}
public void updateShowImeWithHardKeyboard() {
- boolean showImeWithHardKeyboard = Settings.Secure.getIntForUser(
+ final boolean showImeWithHardKeyboard = Settings.Secure.getIntForUser(
mContext.getContentResolver(), Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD, 0,
mCurrentUserId) == 1;
synchronized (mWindowMap) {
- mShowImeWithHardKeyboard = showImeWithHardKeyboard;
+ if (mShowImeWithHardKeyboard != showImeWithHardKeyboard) {
+ mShowImeWithHardKeyboard = showImeWithHardKeyboard;
+ mH.sendEmptyMessage(H.SEND_NEW_CONFIGURATION);
+ }
}
}