Merge commit '79ec07b333f8982ee83de8eeb0b1927a6cb112ed'
* commit '79ec07b333f8982ee83de8eeb0b1927a6cb112ed':
Fixes#1444844. Set a maximum fling velocity in scrollable views.
Merge commit '56fbd8d86a1ea60ae42185349cf8809df24d262a'
* commit '56fbd8d86a1ea60ae42185349cf8809df24d262a':
Fix the comment -- "charged" not "sharted." Also, the other
* changes:
Fix the comment -- "charged" not "sharted." Also, the other strings on that screen seem to have periods. I think that's wrong, but it's better to be consistent that right.
Merge commit '57f2cba2db4b5565b0f70bd5501e8d964dce3ad4'
* commit '57f2cba2db4b5565b0f70bd5501e8d964dce3ad4':
Fix the comments for the string resources for the charge status.
Merge commit '0d725f7d5a7efd9dc63f6ddb67a619d659bb4428'
* commit '0d725f7d5a7efd9dc63f6ddb67a619d659bb4428':
Hold a wakelock during backup/restore/clear operations
* changes:
Fix bugs 1317754 - "Idle screen displays "Charging (100%)" even when fully charged." and 1885870 - "Shorten 'Clear notification' button to 'Clear' to match latest design"
Merge commit 'ef1f21b34f5624adb7436d3da927660ed16c97c7'
* commit 'ef1f21b34f5624adb7436d3da927660ed16c97c7':
Don't trim() in the mediascanner, as that would remove the special "sort first" character.
Merge commit '816cf52abd8f45770f0ac922bbb819184ed4b90f'
* commit '816cf52abd8f45770f0ac922bbb819184ed4b90f':
Fix the DEFAULT_SORT_ORDER value for media files. Changing this
We need to make sure we stay alive for the duration of a backup or (especially)
restore operation. The existing Handler-based timing system was simply not
properly functional, so it's been retooled to use a repeating alarm delivering a
broastcast PendingIntent to our registered receiver.
We acquire a partial wake lock in the broadcast receiver [i.e. while the Alarm
Manager is holding one for the duration of broadcast delivery] and pass the
wakelock object to the backup thread, which eventually releases it when it's
finsihed operations. A similar pattern is used for the threads handling restore
and clear.
The bug (1947162) is caused by the fact that sometimes, surfaceChanged() is called after onCompletion().
In surfaceChanged(), start() is called automatically. The fix is to use a flag is avoid calling start()
when onCompletion() has been called already.
Merge commit '1f2bb46b9a2762a6f57ca8801d91e9dee002158f'
* commit '1f2bb46b9a2762a6f57ca8801d91e9dee002158f':
Migrate to new keystore with the CertTool lib.
Merge commit '3383df385e208807b1dc5f2956f82a7f75f65fd8'
* commit '3383df385e208807b1dc5f2956f82a7f75f65fd8':
keystore: Provide a generic getter for native components.
Merge commit '2f97e984b52b243a5433596c8c291f35778d6b38'
* commit '2f97e984b52b243a5433596c8c291f35778d6b38':
Make backup agent run in the system process as well.
Merge commit 'e15df4017c3625de700e9f9953073f38898bbc89'
* commit 'e15df4017c3625de700e9f9953073f38898bbc89':
If we can't get the restore set's metadata, don't continue
Merge commit 'fe11ea5e2df4a4414aa266e93179c3098b03a795'
* commit 'fe11ea5e2df4a4414aa266e93179c3098b03a795':
Use 'LOCAL_PATH' instead of 'local_path', so it's easier to see a diff of the two .mk files.
A small optimization to the resource code, to not re-parse the framework
resources every time we build a new AssetManager. Instead, you can now
construct a ResTable from a previously created one... of course, like the
existing code for using the data in-place, you can't delete the original
ResTable until you have deleted the one that has been constructed from it.
