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.
Use a class to hold the high priority requests and low priority requests. Each
request is appended to the correct list in the order received. If a request
needs to be requeued after an error, it is placed at the head of the
corresponding list.
* 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.
* changes:
Update more references to openInputStream in support classes. Continuation of bug 1846343
Modify AudioFlinger to use updated openInputStream factory method. Continuation of bug 1846343
If an installerPackageName was specified when the app was installed,
looks for a receiver of ACTION_APP_ERROR in that package. If found,
this is the bug report receiver and the crash/ANR dialog will get a
"Report" button. If pressed, a bug report will be delivered.
Now we have a 5-second time after home is pressed, during which
only the home app (and the status bar) can switch to another app.
After that time, any start activity requests that occurred will
be executed, to allow things like alarms to be displayed. Also
if during that time the user launches another app, the pending
starts will be executed without resuming their activities and
the one they started placed at the top and executed.
