The main consumer of this feature is shortcuts.
The LOOKUP KEY column will contain an encoded concatenation of the contact's row id
as well as sync_ids of all constituent raw contacts. It goes with the "contacts/lookup/*/#" URI.
When we get such a URI, we will first try to load the
contact with the specified _id and lookup_key. If we cannot find the contact
that way, we will go scout for the contact that contains most of the sync_ids
we found in the lookup key.
We will need to make sure that the contact picker returns the lookup-style URIs.
Merge commit '66360af891ac1b77fa5a48d668bd848c84b6f041' into eclair-plus-aosp
* commit '66360af891ac1b77fa5a48d668bd848c84b6f041':
disable canceling until the http connection code is understood
Merge commit '56d8eeae6f863771d759448d45f7ce75aef73b21' into eclair-plus-aosp
* commit '56d8eeae6f863771d759448d45f7ce75aef73b21':
applications are at level 2
Merge commit '1553c82e084ac5763fb393857224145506771b99' into eclair-plus-aosp
* commit '1553c82e084ac5763fb393857224145506771b99':
Add a flag (-G) to aapt to have it output the classes that shouldn't be obfuscated by ProGuard.
Merge commit 'b0a054048329c31948c2f5dbcc11b6f99e454177' into eclair-plus-aosp
* commit 'b0a054048329c31948c2f5dbcc11b6f99e454177':
SensorService: call close_data_source when we have no more sensor clients.
Merge commit '2d93a11663d1d872bc7e9d6512a445fa84148583' into eclair-plus-aosp
* commit '2d93a11663d1d872bc7e9d6512a445fa84148583':
Do not send dock state changed broadcasts until the system has finished booting.
Merge commit 'f810d1a88b2d3166064c4a36d8cc9314f02094e0' into eclair-plus-aosp
* commit 'f810d1a88b2d3166064c4a36d8cc9314f02094e0':
Put vibration patterns in resources.
Merge commit '284ac93aa30642fda87d5c40263a1263677c21cd' into eclair-plus-aosp
* commit '284ac93aa30642fda87d5c40263a1263677c21cd':
More work on wallpapers: animations, lifecycle, scaling, etc.
Yet more work on improving the behavior of wallpapers. This fixes a few
problems in their lifecycle (corresponding change in the picker also
required for this), makes their animations better for hardware that supports
alpha fades, adds animations for the wallpapers themselves, eliminates
fixed size wallpapers, and adjusts the API for retrieving a wallpaper
bitmap to take care of scaling the raw wallpaper image to match the current
desired width and height.
Change-Id: If1c0aaceba4ea4e175dcb7a8416ca7ddbb9bfa6f
Merge commit 'd2227277d405fc368c1baf1a80c2d600dca96145' into eclair-plus-aosp
* commit 'd2227277d405fc368c1baf1a80c2d600dca96145':
add searchable dictionary to html docs and dev guide nav
Merge commit 'a84a26d2afab503ed32e6ecc94acba46a5eb9eb3' into eclair
* commit 'a84a26d2afab503ed32e6ecc94acba46a5eb9eb3':
add searchable dictionary to html docs and dev guide nav
Merge commit '56f67d21459ad3f136c73c8932904d4a495989c0' into eclair-plus-aosp
* commit '56f67d21459ad3f136c73c8932904d4a495989c0':
add the ability to specify yieldpoints in a ContentProviderOperation
Merge commit '6ce96faa0c8dc74ea6d1391aa54d9c6909810dc1' into eclair-plus-aosp
* commit '6ce96faa0c8dc74ea6d1391aa54d9c6909810dc1':
Don't mark an APN disabled if setup fails
We need to leave the phone in a connectable state so that it connects whenever it's able
(reception or just timing). If we mark it disabled on failure it wont try again. The retry
comes from the phone layer, not from ConnectivityService.
Also Fix the Phone layer so it retries even if it disconnected by request (DATA_DISABLED).
This was a bug from long ago that didn't become visible until recently with fast wifi and slow
mobile teardown.
Change-Id: I04bf39fba0cb578c87d5fc6ea5d220820ff9f364
Merge commit '616195a3b3a50b4f504806cea629af2fe34ae953' into eclair-plus-aosp
* commit '616195a3b3a50b4f504806cea629af2fe34ae953':
MO SMS fail after sending 100 messages
Merge commit '1615ccc8a45ea2521339ae6f5b5d543a131915cf' into eclair-plus-aosp
* commit '1615ccc8a45ea2521339ae6f5b5d543a131915cf':
Remove flaky test LifecycleTest.testDialog from large continuous suite.
Merge commit 'e1df82248a68282a4d556ce61db09949fc186827' into eclair
* commit 'e1df82248a68282a4d556ce61db09949fc186827':
Remove flaky test LifecycleTest.testDialog from large continuous suite.
Merge commit 'e8e4c7e4fa6e936eb14bc6c4658c19a1f52f5f59' into eclair-plus-aosp
* commit 'e8e4c7e4fa6e936eb14bc6c4658c19a1f52f5f59':
Fixing bug 2086021. AccessiblityService could sometimes get a null pointer
* changes:
Fixing bug 2086021. AccessiblityService could sometimes get a null pointer exception if multiple accessibility services are running and there are several events all happening within a short period of time.
Merge commit '4b027f128fea32bfcabee55bf4d994400453c00c' into eclair-plus-aosp
* commit '4b027f128fea32bfcabee55bf4d994400453c00c':
Fixes a race condition between entering ERROR state and initial buffer submit.
