Merge commit '53cf55c64f85c11c4da4c47edddb387a396bb8b6'
* commit '53cf55c64f85c11c4da4c47edddb387a396bb8b6':
Change the media key algorithm to also ignore double quotes.
Merge commit '73c551d2582c2704cf60c7530fbc77eab846f4ed'
* commit '73c551d2582c2704cf60c7530fbc77eab846f4ed':
AI 149208: Remove statement about WIndows codecs and licensing.
Merge commit '226299446197689499bc3c7dc44d0026745da677' into donut
* commit '226299446197689499bc3c7dc44d0026745da677':
AI 149208: Remove statement about WIndows codecs and licensing.
Merge commit 'd50a458bb291801ab9fdc119301bc7b84b42a6e3'
* commit 'd50a458bb291801ab9fdc119301bc7b84b42a6e3':
Fix a major bug in Bundle when unparcelling from AIDL.
Merge commit '4e1afc1a569d05cc6a1ee213c65ffb49513600ca'
* commit '4e1afc1a569d05cc6a1ee213c65ffb49513600ca':
Fixes#1872506. Prevents NPE in ListView. When the opaque property changes at runtime, it is possible to end up in a situation in which the divider's Paint instance has not been instanciated. This change simples uses a final Paint that is guaranteed to not be null.
* changes:
Fixes#1872506. Prevents NPE in ListView. When the opaque property changes at runtime, it is possible to end up in a situation in which the divider's Paint instance has not been instanciated. This change simples uses a final Paint that is guaranteed to not be null.
To address issues where we could leave half-installed applications around if there was a failure during the install, we split getPackageLP() into two phases: the first would create the record, and only after doing all verification checks would we call insertPackageSettingLP() to do the remaining part of the original implementation and actually insert the record into the data structures.
Unfortunately it was only in insertPackageSettingLP() that we would set the sharedUser field of the PackageSetting structure, so when before that we went to verify certificates, we didn't think it had requested a shared user ID, and let it through without checking.
This fix simply sets the sharedUser field when the PackageSetting structure is first created, so we will actually check against its certs. We still also set this again in insertPackageSettingLP(), but there is no harm in this because the only time we call this function is in that big install func, which just passes in the same shared user that it had when first getting the package.
BUG=1851541
Automated import of CL 148824
This adds the PowerProfile class and data file that provides power consumption numbers
for different subsystems. Also added Audio/Video subsystems to track on a per UID basis.
There was a serious problem in the Bundle(Parcel) and readFromParcel() methods,
where it wasn't doing the copying of the Parcel that Parcel.readBundle() does
and is a basic requirement for it to work correctly.
This re-arranges the code to make all of these functions (hopefully) correct.
Also fix a problem in Parcel where we were not duping fds when copying data from
one Parcel to another.
The corresponding fix has already been made for GSM.
When data state is in CONNECTING state and and we try
to disable the data, we set a pending disconnect but never
disconnect once we are connected.
Merge commit '9d892a8e3037fd2f6d692137cd5d91acc46ddf5a'
* commit '9d892a8e3037fd2f6d692137cd5d91acc46ddf5a':
dumpstate: Add to AID_SDCARD_RW group to fix saving bugreports to the SD card.
Merge commit '9681a5e06badbd817342e8f6be4ffbe9102c1e98'
* commit '9681a5e06badbd817342e8f6be4ffbe9102c1e98':
runtime: Add CAP_SYS_NICE to the system server capabilities list so it
Merge commit '36e862a699aa2a23df1543665f39b5b0c96885fb'
* commit '36e862a699aa2a23df1543665f39b5b0c96885fb':
Fixed vertical text position in search suggestion items.
Background:
mlebeau said: "Cole had complained that the vertical alignment of the
text fields in search_dropdown_item_icons_2line.xml was a little
off. Specifically, when both lines are visible he wanted to see line1
pushed down 2-4 pixels (while keeping line2 in the same position as
now), and when only line1 is visible, he said it needed to be pushed
up 2-4 pixels from current."
Here's how the layout worked before (note that text2 and text1
are in this order in the layout file):
- If text2 is present, it is put at the bottom, with height set by
layout_height (currently 29dip) . - The line2 text is put at the top
of text2 (gravity=top).
- I think the paddingBottom=4dip in text2 has no effect, since the
text is top-aligned anyway.
- text1 is put at the top of the list item. If text2 is present, it
will have height 29dip (58 dip - 29 dip height of text2). It's a bit
weird, layout_height of text1 is completely ignored, but it has to be
set to something. If text2 is missing, it will fill the entire list
item height (58 dip).
- The line1 text is placed 4dip below the vertical center of text1
(4dip because of paddingTop).
Now, instead, text1 has height=wrap_content, and is placed right above
text2, if that's present. If text2 is absent, text1 is centered
vertically in the list item. This should have the desired effect.
If we want to tweak the positioning further in the case where text2
is visible, we can adjust the padding of text1.
* changes:
Add a new API to ListView: setGestures(int). This allows developers to enable gestures to jump inside the list or filter it. This change also introduces a new XML attribute to control this API. It also adds the ability to theme the GestureOverlayView from the gestures library. Finally, this adds a new VERSION header to the binary format used to store the letters for the recognizer.
