Merge commit '719eba5bb1fbc72e3b55450f16b38a6be5640055'
* commit '719eba5bb1fbc72e3b55450f16b38a6be5640055':
Change to SPKAC certificate request format for keygen.
Merge commit '0a4730f8889bd98e272bd5e7e0fedb6a69d33f54'
* commit '0a4730f8889bd98e272bd5e7e0fedb6a69d33f54':
add some more defensiveness to SuggestionsAdapter to avoid system process crashes.
This change allows us to use drawables that match the current screen
density even when being loaded in compatibility mode. In this case,
the bitmap is loaded in the screen density, and the bitmap and
nine-patch drawables take care of accounting for the density difference.
This should be safe for existing applications, for the most part, since
they shouldn't really be pulling the bitmap out of the drawable. For
the small rare chance of them breaking, it worth getting the correct
graphics. Also this will only happen when there is actually a resource
of the matching density, and no existing apps should have resources for
anything besides the default density (though of course all of the
framework resources will be available in the native density).
As part of this, the bitmap density API has been changed to a single
integer provider the DPI unit density.
Merge commit '589cebe2d58591403de4a77077941c0454bc91bc'
* commit '589cebe2d58591403de4a77077941c0454bc91bc':
* Use the scaled size for surface view instead of native. The surface will be always scaled
Merge commit 'e0ef973b1358585d039989ee5572e16751078aaf'
* commit 'e0ef973b1358585d039989ee5572e16751078aaf':
* a best effort fix for apps that uses get/set Matrix API on canvas.
In some locales, there are no abbreviated month names; the abbreviated
date formats are essentially numeric. If the user is in such a locale,
have the DatePicker respect the date format setting so that the order
of the fields will match other numeric-only dates.
In locales that have abbreviated month names, continue to use the order
that is normal in spelled-out dates.
And update the order in updateDate() so that the new order is reflected
if you change the order setting and immediately go to change the date
without leaving and returning to the Date & Time settings in between.
At the same time, change DateFormat.getDateFormatOrder() back to working
the way it did in cupcake (prioritizing the date order preference over
the locale), even though the DatePicker no longer calls the method.
Bug 1805085
The SID and NID in CDMA_SUBSCRIPTION are in hexadecimal format. So change the parseInt() in CdmaServiceStateTracker and add comments in CommandsInterface.
modified: java/com/android/internal/telephony/CommandsInterface.java
modified: java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
modified: java/com/android/internal/telephony/RIL.java
modified: java/com/android/internal/telephony/CommandsInterface.java
modified: java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
modified: java/com/android/internal/telephony/RIL.java
Merge commit '62c6c357060dca8597986783b67ec9ae06ccef66'
* commit '62c6c357060dca8597986783b67ec9ae06ccef66':
Make the date formats as close as possible to what the translators wanted.
Merge commit '0e6386300c958c5566d09b6a18b4338a6db3e965'
* commit '0e6386300c958c5566d09b6a18b4338a6db3e965':
Add gservices flag for configuring the URL vending redirects to when TOS is inaccessible due to no/bad network.
Merge commit 'ea9f9637e459c10024d09b53a803dfc91dd3eeb5'
* commit 'ea9f9637e459c10024d09b53a803dfc91dd3eeb5':
Have the notification service only have notifications diabled until setup wizard has been run.
* changes:
Unbreak build by making the build of renderscript again conditional on BUILD_RENDERSCRIPT until we can figure out why the build servers see an error that does not reproduce locally.
