Merge commit 'bdf8034c657147226b2390eef113ff841e0d6065' into gingerbread-plus-aosp
* commit 'bdf8034c657147226b2390eef113ff841e0d6065':
OBB: use PBKDF2 for key generation.
Switch to using PBKDF2 for the key generation for OBBs. Any previously
generated OBBs will stop being read correctly. A small pbkdf2gen program
is available to allow generation of appropriate keys with the salts.
Bug: 3059950
Change-Id: If4305c989fd692fd1150eb270dbf751e09c37295
Merge commit 'c911097095d0dd909abf4f77628f2154be6dbf9a' into gingerbread-plus-aosp
* commit 'c911097095d0dd909abf4f77628f2154be6dbf9a':
Updated media transport controls
Unlike previous releases where the set of classes-to-be-preloaded
was generated on a first-generation device (G1 and MyTouch 3G), this
round I used a second-generation device, a Nexus One. As a consequence,
class loading is faster (win) and fewer classes hit the 1250ms threshold.
Instead of sharing classes based on load time alone, classes are now shared
based on the number of applications loading them.
Change-Id: I18f7aa3e7e6258818871b3968b515c06314371b3
http://b/2546002
Merge commit 'c008ca96bb32289958010dcf8f247c35ab9b1f18' into gingerbread-plus-aosp
* commit 'c008ca96bb32289958010dcf8f247c35ab9b1f18':
Work around for errant headsets.
1. Some headsets send an AVCTP connection before an AVDTP connection
When that AVCTP connection fails, we get stuck in IncomingA2DP state
because we don't handle AVCTP signals for now.
We need to handle the signals and fix it better.
2. Also when ACL gets disconnected, reset state i.e
when the low level connection disconnected reset our state.
This is like a fail safe in case we get stuck.
Bug: 3051490
Change-Id: Ibcf188103999ffb1e08c36c2554504c639fb7f50
Merge commit '998c67774aa2260ed05a39df45d983feb72e683c' into gingerbread-plus-aosp
* commit '998c67774aa2260ed05a39df45d983feb72e683c':
Never show overscroll if the page scrolls at all.
Merge commit '868322ced806ec58750edd8ce964f4e17507ddad' into gingerbread-plus-aosp
* commit '868322ced806ec58750edd8ce964f4e17507ddad':
Reduce the time it takes to decay the glow after a pull.
gingerbread.
(for more detailed comments, please see the dependent CL
Change-Id: Ib90eb9e647f543312c865d3bbf9a06fb867a648b )
2 changes in this CL.
1. add 2 new columns to downloads table in downloads.db:
mediaprovider_uri = downloaded file's content_uri in mediaprovider db
deleted = flag is set to true if a file is to be deleted
2. download UI app shows only those files whose 'deleted' flag is not set
Change-Id: I47c5f72b0a0b354fac3abe3a97752130b8189794
The decay is now in line for the decay for absorb glows.
Fixes b/3094064 Overscroll fade timeout is too long
Change-Id: Ida987c8f6193fcb15f743d72c590a5c1daef056d
Merge commit '011b5bcc0355338b7ff906656282a54ffaa04b5a' into gingerbread-plus-aosp
* commit '011b5bcc0355338b7ff906656282a54ffaa04b5a':
implement part of [3094280] New animation for screen on and screen off
Merge commit '90d59d180bd963f00161e6bfaabfda432960cab6' into gingerbread-plus-aosp
* commit '90d59d180bd963f00161e6bfaabfda432960cab6':
Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.
Merge commit '5c62ab0af9dadc3bccdad7b01c3ae17266f0b0e1' into gingerbread-plus-aosp
* commit '5c62ab0af9dadc3bccdad7b01c3ae17266f0b0e1':
Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify
Merge commit '5f42391701c0657d520d00f62a4c061b18ba1280' into gingerbread-plus-aosp
* commit '5f42391701c0657d520d00f62a4c061b18ba1280':
Attempt to derive the avg. bitrate of the entire stream from metadata.
Merge commit '646e0d5ab342f414f556574f2d078bd6deb22ed3' into gingerbread-plus-aosp
* commit '646e0d5ab342f414f556574f2d078bd6deb22ed3':
Some webcams output rtp streams but never send any rtcp data in violation of
