Merge commit 'c1c82509fb78403a969040cf057a66cbe3bfa538'
* commit 'c1c82509fb78403a969040cf057a66cbe3bfa538':
Fix permission hole for RECORD_AUDIO created when we moved the MediaRecorder
Merge commit 'bb7b7b316a6a15f4df6af3c62a293920c68c7b00'
* commit 'bb7b7b316a6a15f4df6af3c62a293920c68c7b00':
make sure to fail to software when the h/w renderer cannot be initialized
* changes:
Fix permission hole for RECORD_AUDIO created when we moved the MediaRecorder implementation to the mediaserver process. The permission check was previously enforced only at the AudioRecord binder interface for clients not in the same process. This change adds an additional check when the client tries to set the audio source. Bug 1868334
Merge commit '7269d9ac10d4c6ed5086b9f5677821e8d4382390'
* commit '7269d9ac10d4c6ed5086b9f5677821e8d4382390':
Tweak the Gestures Overlay demo. This shortens the fade duration to make it more usable and also adds a longer pause before the fade. This change also introduce a new compile-time setting to decide whether or not the overlay should steal the events from the underlying ListView. It is now off by default, per discussion with hackbod. It feel a little bit better but it may vary from user to user so studies will be necessary.
Merge commit 'b204d4f12773ec67c7f0ded41cb111018f154476'
* commit 'b204d4f12773ec67c7f0ded41cb111018f154476':
First pass at cleaning up the gestures code.
Merge commit 'aa9833885d89d42a0cd0b4202485e67b63d51412'
* commit 'aa9833885d89d42a0cd0b4202485e67b63d51412':
Qualify a type and add some explanatory comments.
Merge commit '2d10ba33190c2ff1b24d6c48dd621c55a25bf2cc'
* commit '2d10ba33190c2ff1b24d6c48dd621c55a25bf2cc':
GPS: Add support for forcing NTP time and XTRA data injection.
Merge commit '4174e2682f4eb6ea35c84e35810312967ea7e233'
* commit '4174e2682f4eb6ea35c84e35810312967ea7e233':
Fixes #1866819.\nTextView sets the bounds of its compound drawables to contain only the width and the height of the drawables. This causes View.invalidateDrawable() to invalidate the compound drawables at location (0, 0) within the view, thus invalidating the wrong part of the View. This prevents animation from running correctly when using animated drawable. This change overrides invalidateDrawable() in TextView to take into account the real position of the compound drawable.
* changes:
Fixes #1866819.\nTextView sets the bounds of its compound drawables to contain only the width and the height of the drawables. This causes View.invalidateDrawable() to invalidate the compound drawables at location (0, 0) within the view, thus invalidating the wrong part of the View. This prevents animation from running correctly when using animated drawable. This change overrides invalidateDrawable() in TextView to take into account the real position of the compound drawable.
Merge commit 'f209b46c52dc25fbd2c08b14824de9845cc64b07'
* commit 'f209b46c52dc25fbd2c08b14824de9845cc64b07':
Make sure smsHeader != null before using it.
Merge commit 'e29146158b6048936671decc060d398a68333fc0'
* commit 'e29146158b6048936671decc060d398a68333fc0':
Hook up the backup data writer, and add a utility to read the backup data files.
* changes:
Increment BatteryStatsImpl's VERSION. That'll make it stop trying to interpret older records with the new format. Also applied other comments involving name changes to remove un-needed 'Wifi' labels in WifiManager API, etc.
Merge commit 'a59aba8cd88b8f98fa4de2a903899bc6ac9f73e8'
* commit 'a59aba8cd88b8f98fa4de2a903899bc6ac9f73e8':
Update more references to openInputStream in support classes.
Modify AudioFlinger to use updated openInputStream factory method.
Merge commit '90bd7338df76c0a6185f4ff2fe7f981fa1a1d36c'
* commit '90bd7338df76c0a6185f4ff2fe7f981fa1a1d36c':
Fix bad filtering of error code when set_position_mode() is being called.
Merge commit '5bc21aa0671d83e406b46e0431816dea8d9ca5cb'
* commit '5bc21aa0671d83e406b46e0431816dea8d9ca5cb':
SmsHeader rewrite, in preparation for migration to public API.
Merge commit '95fc68f24a2a93e5664e2234abcfe479d385cc05'
* commit '95fc68f24a2a93e5664e2234abcfe479d385cc05':
Fix issue where apps could prevent the user from going home.
