Merge commit 'd9a874a4cb8e82ae64c1698bd71ced8d87bbc5cd'
* commit 'd9a874a4cb8e82ae64c1698bd71ced8d87bbc5cd':
Fixes NPE in ListViews with non-selectable items. This was caused by a weird initialization issue in ListView and AbsListView: a private final field instanciated in the declaration in ListView was used in AbsListView<init> via an overriden method and that field was somehow null at this time. This fix moves the instanciation at a later point.
* changes:
Fixes NPE in ListViews with non-selectable items. This was caused by a weird initialization issue in ListView and AbsListView: a private final field instanciated in the declaration in ListView was used in AbsListView<init> via an overriden method and that field was somehow null at this time. This fix moves the instanciation at a later point.
Merge commit '270e87f71abc2edf446dbec20c725c823e8c7f37'
* commit '270e87f71abc2edf446dbec20c725c823e8c7f37':
Sensors: Use a native_handle for the data channel instead of a single file descriptor.
This eliminates the requirement that all sensors share a single file descriptor.
This, along with concurrent changes in other projects, fixes bugs b/1614524 and b/1614481
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '53cf55c64f85c11c4da4c47edddb387a396bb8b6'
* commit '53cf55c64f85c11c4da4c47edddb387a396bb8b6':
Change the media key algorithm to also ignore double quotes.
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.
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.
Merge commit 'cfcc0df2658d0ce7dc753511bb44ab8ae7a636f7'
* commit 'cfcc0df2658d0ce7dc753511bb44ab8ae7a636f7':
Move the Gestures API to the framework in android.gesture.
Merge commit 'c4d5d02667af6989a3121072871f6a4b1e68b594'
* commit 'c4d5d02667af6989a3121072871f6a4b1e68b594':
Add new window manager type for a hacking second-level media surface.
This adds a new window type that is a surface that sits between the
current media type and the application window, in theory allowing you
to have two surface views in your hierarchy and control their
Z-ordering. There is also another hidden API on SurfaceView to set
the type of your window.
All a big hack, but for the good of the commonwealth!
Merge commit 'd1874747c281e3277980fe7318f9007643a25f60'
* commit 'd1874747c281e3277980fe7318f9007643a25f60':
Fixes external http://code.google.com/p/android/issues/detail?id=2732. ExpandableListView is wrongly assuming that the saved state if of the correct type. A similar bug fix was made in TextView.onRestoreInstanceState() a while ago. This fix simply ensures that the state received is of the right type.
* changes:
Fixes external http://code.google.com/p/android/issues/detail?id=2732. ExpandableListView is wrongly assuming that the saved state if of the correct type. A similar bug fix was made in TextView.onRestoreInstanceState() a while ago. This fix simply ensures that the state received is of the right type.
Merge commit '6dd1bb71dbafbacd87e46b736888cb1371ddd53a'
* commit '6dd1bb71dbafbacd87e46b736888cb1371ddd53a':
Trigger the LocationManager whenever the SearchDialog is shown
Merge commit 'f9c7d9a75b2355d8ad8282d9b4cf817c77ea8b10'
* commit 'f9c7d9a75b2355d8ad8282d9b4cf817c77ea8b10':
Add support to SuggestionsAdapter to query the 'working' status
(and stop when the SearchDialog is stopped). This way we get a
network-based location quickly so that by the time any location-
based suggestion provider wants to do suggestions, it's likely
to have a good fresh location.
Merge commit 'aa9833885d89d42a0cd0b4202485e67b63d51412'
* commit 'aa9833885d89d42a0cd0b4202485e67b63d51412':
Qualify a type and add some explanatory comments.
This provided SDP functionality to Java, but is not currently used by any Apps.
I will shortly be providing SDP functionality in a new API, but it will be
quite different to this one, and in the mean-time keeping this stale code
updated with other API changes is a pain.
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 'e29146158b6048936671decc060d398a68333fc0'
* commit 'e29146158b6048936671decc060d398a68333fc0':
Hook up the backup data writer, and add a utility to read the backup data files.
