Merge commit '524a6d8e9bb4df9cec0520ac1d9733642b13e76f' into gingerbread-plus-aosp
* commit '524a6d8e9bb4df9cec0520ac1d9733642b13e76f':
better fix for [3028370] GL get error should return a valid error if no context is bound.
Merge commit 'a7bfe6ad763208942d74a15933e2de1a3e06eba0' into gingerbread-plus-aosp
* commit 'a7bfe6ad763208942d74a15933e2de1a3e06eba0':
Support "seascape" rotation for "landscape-only" apps
Merge commit 'cbb7b05e35368b104c27089f5f16640680f567c2' into gingerbread-plus-aosp
* commit 'cbb7b05e35368b104c27089f5f16640680f567c2':
Crash apps when they provide bad notifications instead of crashing the system process.
it turns out that we cannot return INVALID_OPERATION from glGetError() because the
GL spec says that it must be called in a loop until it returns GL_NO_ERROR.
now, we always return 0 from GL functions called from a thread with no
context bound. This means that glGetError() will return NO_ERROR in this case,
which is better than returning a random value (which could trap the app in a loop).
if this happens in the main thread of a process, we LOG an error message once.
Change-Id: Id59620e675a890286ef62a257c02b06e0fdcaf69
Merge commit '287952c35e148811c106bc0f5036eabf20f71562' into gingerbread-plus-aosp
* commit '287952c35e148811c106bc0f5036eabf20f71562':
Fix issue #3022508: Crash during media scan
Don't kill processes for excessive wake lock use, even if they
are in the background, as long as they have running services.
Also fix some problems with this, such as not noting the kill
in battery stats.
And add killing of processes for cpu usage as well, along with
some optimizations to computing CPU usage.
And fix BatteryWaster to be better behaving for testing these
cases.
Add new "monitor" command to am to watch as the activity manager
does stuff (so we can catch things at the point of ANR).
Finally some miscellaneous debug output for the stuff here, as
well as in progress debugging of an ANR.
Change-Id: Ib32f55ca50fb7486b4be4eb5e695f8f60c882cd1
Merge commit 'f9ec03c0f5fc2c6eba5bbead24c4eb314c0205be' into gingerbread-plus-aosp
* commit 'f9ec03c0f5fc2c6eba5bbead24c4eb314c0205be':
Make the logging a little more targeted for the status bar multiple icon problem.
Merge commit 'de04fb0a0366057028369eb3b3efcb75367f74db' into gingerbread-plus-aosp
* commit 'de04fb0a0366057028369eb3b3efcb75367f74db':
Enforce serial ordering of MotionEvents.
Merge commit '7b2ed5d7d607e435b88ea75db3a1a43a00a86275' into gingerbread-plus-aosp
* commit '7b2ed5d7d607e435b88ea75db3a1a43a00a86275':
Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data 'avcC' accordingly.
Merge commit '045398e6243fa4e83fb6435df4e8ffc6a7487a70' into gingerbread-plus-aosp
* commit '045398e6243fa4e83fb6435df4e8ffc6a7487a70':
Fix a deadlock I ran into.
This change modifies ViewRoot to wait until the MotionEvent has been
delivered before telling the input dispatcher that it is finished.
The serial ordering guarantee will be required by new features that
may need to transfer touch focus from one window to another.
Change-Id: I0a64d1f0c8bc3f08846f213d6e28ce48b1d48e58
Merge commit '37cedce14bc0e68e8bf27c2cecb181728226e6ed' into gingerbread-plus-aosp
* commit '37cedce14bc0e68e8bf27c2cecb181728226e6ed':
Add an aapt option to allow string variations for different devices.
Merge commit '5c6c5c7a43d44316395f5c35ab713372124b8b4c' into gingerbread-plus-aosp
* commit '5c6c5c7a43d44316395f5c35ab713372124b8b4c':
fix [3028370] GL get error should return a valid error if no context is bound.
glGetError() will now always return GL_INVALID_OPERATION if called from a thread
with no GL context bound.
Change-Id: I28ba458871db051bb4f5a26668a1fa123526869c
Merge commit '4f564cdeb8478f1a20263fc036c74cc4a63145c3' into gingerbread-plus-aosp
* commit '4f564cdeb8478f1a20263fc036c74cc4a63145c3':
Tweaks to download manager API based on API review feedback
DownloadManager was set up to return file URIs for public API
downloads to external, but to return content URIs for all others.
This included browser downloads, which are on external but don't go
through the public API. Since the new downloads UI uses
DownloadManager, it was affected by this change when the user opened a
file from the UI. Apparently numerous things don't handle content
URIs well, including music preview (clicking on downloaded mp3) and
package installer (clicking on downloaded APK), so this change makes
it generate file URIs for legacy external downloads.
Change-Id: I5c34d8ba188cc8b0d11865262cb451208be78eae
* improved documentation of the default destination on the download
cache and the concomitant consequences
* removed NETWORK_WIMAX flag for setting allowed networks
* changed request headers behavior to support multiple instances of
the same header (as allowed in the HTTP spec), renamed
setRequestHeader() to addRequestHeader()
* accept user-facing strings as CharSequences instead of Strings
* new convenience methods setDestinationInExternalFilesDir() and
setDestinationInExternalPublicDir() for setting a destination in
either shared or app-private external storage directories
* renamed setMediaType() to setMimeType()
Change-Id: I8781e2214d939c340209cab917bbbba264ab919c
Merge commit '2dc43f3d4c721acf331d699e24d9aac4d4cc2f95' into gingerbread-plus-aosp
* commit '2dc43f3d4c721acf331d699e24d9aac4d4cc2f95':
docs: add more info about state list drawable and onclick attribute to Button
Merge commit '5b7328f257a76ff6b7b60872d6a106002ff1f679' into gingerbread
* commit '5b7328f257a76ff6b7b60872d6a106002ff1f679':
docs: add more info about state list drawable and onclick attribute to Button
Merge commit '6e98c280f792932d60bf9374c8979d9eadce2d9c' into gingerbread-plus-aosp
* commit '6e98c280f792932d60bf9374c8979d9eadce2d9c':
Fix for IndexOutOfBounds in setComposingRegion.
PackageManagerTests was catching assertion errors and just spitting out
a generic "Hey, there was an error!" message. This eliminates that and
adds some expected outcomes in the assertions.
Change-Id: I27baa3c57c85b0cae4ea76aaf1e2a9b61b2c32b7
- Created sub-package android.media.audiofx for audio effects.
- Hid AudioEffect class contructor, methods and variables not needed by
applications
- Added more javadoc comments for AudioEffect Class
Change-Id: Ibbb40d4e714bb248aa32cf82d7763d74efae96d1
Merge commit '49a8bbf4eacbf0bde71bab05be0ab40488df109c' into gingerbread-plus-aosp
* commit '49a8bbf4eacbf0bde71bab05be0ab40488df109c':
Don't crash if we've never gotten a signal strength update.
The --product option to aapt is a comma-separated list of characteristics
of the device being built for. For example, --product nosdcard,grayscale
for a device with no SD card and a grayscale screen.
Strings can specify a product="characteristic" option to cause that version
of the string to be used only for that type of device. All such strings
should also specify, at the end of the block, product="default", which
will be used if none of the variations match. For example:
<string name="choose" product="bw">Choose black or white</string>
<string name="choose" product="grayscale">Choose a shade of gray</string>
<string name="choose" product="default">Choose a color</string>
The default characteristic will also be used when no --product option
is specified.
Change-Id: Ie6c1505599e02e15b7818e8be6ec47bc6ce71aaa
It looks like this timing bug has been there forever, and we're just starting to hit it now.
Bug: 3027952
Change-Id: I5c14ccd7f74205dc6930f4282cec0e23eeb54cab
