Merge commit '3fd5fa4ca9dbdd5be46ec2952c7038cdd59e35d5' into gingerbread-plus-aosp
* commit '3fd5fa4ca9dbdd5be46ec2952c7038cdd59e35d5':
Fix the runtime restart due to name change.
Merge commit '344d96635ec40e0c541f32064f42c8ad38e4505a' into gingerbread-plus-aosp
* commit '344d96635ec40e0c541f32064f42c8ad38e4505a':
Close tz query cursor when done.
We were creating a static AsyncQueryHandler which only held a
weak reference to the content resolver. This caused db updates
to be dropped once the original context had been gc'd. This
fix creates a new handler for each update to ensure we have a
valid resolver.
Change-Id: I049d8390ac0215e12e63d57b0bae4d3f6df64b6a
Merge commit '8f385affafddc1147b9dc4f0c4f49449ebf477c9' into gingerbread-plus-aosp
* commit '8f385affafddc1147b9dc4f0c4f49449ebf477c9':
Add new/changed drawable assets from design team
Merge commit 'a6f41495962c6427cfb3976daeb7f7b4df63ac57' into gingerbread-plus-aosp
* commit 'a6f41495962c6427cfb3976daeb7f7b4df63ac57':
Update camera API and javadoc for API review comments.
Merge commit '8626d1a33609287cffd5b0f7d187f478ff6d22ed' into gingerbread-plus-aosp
* commit '8626d1a33609287cffd5b0f7d187f478ff6d22ed':
Mark MODIFY_PHONE_STATE permission as signatureOrSystem
Merge commit '5bade703fd8434ba4cd5c9d1e8e1dc0f383b32b5' into gingerbread-plus-aosp
* commit '5bade703fd8434ba4cd5c9d1e8e1dc0f383b32b5':
DO NOT MERGE Correct the PackageManager.checkSignatures documentation.
This permission isn't needed right now, since there aren't actually any
public APIs that require it. (There are a few calls in the ITelephony
interface that do, but they're all hidden.)
Since there's no good reason for 3rd party apps to declare it, let's
mark it signatureOrSystem for now. We can bring it back -- and probably
split it apart into multiple finer-grained permissions -- once we
finally expose full telephony APIs to 3rd party apps (see bug 1043005).
Bug: 2989096
Change-Id: Idf898d5e12d648a959f622cd815e75597195aa82
Merge commit '426ee7f22eeaa016cdbf0addbb7b2cc6b6cc3487' into gingerbread-plus-aosp
* commit '426ee7f22eeaa016cdbf0addbb7b2cc6b6cc3487':
Fixes some bugs in TimeZoneUtils
TimeZoneUtils was updating the db and modifying the selection. This
creates a static selection for each update type and creates new
values for each update. Also adds a method for apps to force the
local tz cache to refresh if they think another app has modified
the db.
Change-Id: Iaaade635ac8ff11bb116005a0f6b44efcd4c4056
Merge commit '09340a4bb99507d9b6bfbfc68a450d4d4f354d73' into gingerbread-plus-aosp
* commit '09340a4bb99507d9b6bfbfc68a450d4d4f354d73':
Replace epoll() with poll() and rename PollLoop to Looper.
Merge commit 'b92788aa040d0971b4e54589aef7675f34d96e5d' into gingerbread-plus-aosp
* commit 'b92788aa040d0971b4e54589aef7675f34d96e5d':
Adds time zone functionality into fw as a hidden api
Merge commit '52e19d5917b8f057131c1dc8b3eb772febd791d9' into gingerbread-plus-aosp
* commit '52e19d5917b8f057131c1dc8b3eb772febd791d9':
Change the keep alive time for excess idle threads.
Merge commit '405d4db50b3db1fc5e015475218e190d193332d4' into gingerbread-plus-aosp
* commit '405d4db50b3db1fc5e015475218e190d193332d4':
Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
This is the start of work towards pushing api that is needed for
Calendar to become unbundled into frameworks. This adds functions
for getting and setting time zones for the Calendar app. The new
methods are currently hidden.
Change-Id: I1b4265b23630c46d9730a179ec02da8d6c0e03ea
Merge commit '901b7b9b17d20dc8085fb5fd3bab0f0804f3906b' into gingerbread-plus-aosp
* commit '901b7b9b17d20dc8085fb5fd3bab0f0804f3906b':
Add an option to hide the Voice Search icon.
Merge commit 'ca8f3d04284a26477257a0c2b34d83c86d15efe9' into gingerbread
* commit 'ca8f3d04284a26477257a0c2b34d83c86d15efe9':
Add an option to hide the Voice Search icon.
Merge commit 'a224f70b1efc29d9698da5b5c143251a43838f2b' into gingerbread-plus-aosp
* commit 'a224f70b1efc29d9698da5b5c143251a43838f2b':
Fix interaction between BluetoothEventLoop and BluetoothService.
Some search engines do not support voice search, so provide a flag
to disable showing the icon in the SearchDialog.
Change-Id: I7ef4ad5d382edb86c08014260defa4af6d5eca0a
As part of this change, consolidated and cleaned up the Looper API so
that there are fewer distinctions between the NDK and non-NDK declarations
(no need for two callback types, etc.).
Removed the dependence on specific constants from sys/poll.h such as
POLLIN. Instead looper.h defines events like LOOPER_EVENT_INPUT for
the events that it supports. That should help make any future
under-the-hood implementation changes easier.
Fixed a couple of compiler warnings along the way.
Change-Id: I449a7ec780bf061bdd325452f823673e2b39b6ae
BluetoothEventLoop primarily handles event notifications from Bluez.
It should know innards of Bonding and especially BondState.
BondState class and BluetoothService call into each other.
When BluetoothEvent loop gets the handle to BondState it leads
to deadlocks and ANRs.
Change-Id: I785c57f6246c1288350d26d4acb87d879b27a5f9
