Merge commit '00453ad22a445f1cdef768ed1f062f0fac7c1dc9'
* commit '00453ad22a445f1cdef768ed1f062f0fac7c1dc9':
Open some methods on PrefereneManager to allow others use the inflater.
Merge commit '0dbc9317540ce3200cf0587ee0f8f5fb241574b9'
* commit '0dbc9317540ce3200cf0587ee0f8f5fb241574b9':
Integrated the profiler into the framework. We run it all the time if the persist.sampling_profiler
Merge commit 'd4344ba9ba5091c7f10c927c3ca8917ee496e87b' into eclair-plus-aosp
* commit 'd4344ba9ba5091c7f10c927c3ca8917ee496e87b':
Open some methods on PrefereneManager to allow others use the inflater.
Merge commit '88e625795943dea84b2e7c32f37e71303143b728' into eclair-plus-aosp
* commit '88e625795943dea84b2e7c32f37e71303143b728':
Integrated the profiler into the framework. We run it all the time if the persist.sampling_profiler
* changes:
Integrated the profiler into the framework. We run it all the time if the persist.sampling_profiler system property is set. Saves snapshots to the SD card.
Merge commit 'a81d6afd57c175fbe64aeaa0d5894d83201d13ea'
* commit 'a81d6afd57c175fbe64aeaa0d5894d83201d13ea':
dumpstate: Add the ctime (time the file was harvested out of /proc) to dump.
Merge commit 'a4eb91da03bd785bc91bed0d25a9efaa9baba1c1' into eclair-plus-aosp
* commit 'a4eb91da03bd785bc91bed0d25a9efaa9baba1c1':
dumpstate: Add the ctime (time the file was harvested out of /proc) to dump.
Merge commit 'ffae4fcc78d0f280da6052d102b11962fb8041b7' into eclair-plus-aosp
* commit 'ffae4fcc78d0f280da6052d102b11962fb8041b7':
attempt to fix [2099362] Possible SurfaceFlinger crash
Merge commit '542051f19f614c06c4637e3a32ca45e6e2a4add4'
* commit '542051f19f614c06c4637e3a32ca45e6e2a4add4':
Fixing a concurrency problem by changing the contact aggregation exception API.
Merge commit '9cc1817d46d8092865d8f1e7a6391dcae197a26a' into eclair-plus-aosp
* commit '9cc1817d46d8092865d8f1e7a6391dcae197a26a':
Fixing a concurrency problem by changing the contact aggregation exception API.
Merge commit '70712f19b49278e07ee76d6f5d0667dec6a635f8'
* commit '70712f19b49278e07ee76d6f5d0667dec6a635f8':
Minor perf improvement to fall and expand use of struct.
Merge commit 'ac67ebe667d30f3cd2e39fa57164d4f3ddaea677' into eclair-plus-aosp
* commit 'ac67ebe667d30f3cd2e39fa57164d4f3ddaea677':
Minor perf improvement to fall and expand use of struct.
Merge commit '64a663e3e13cd5d6ee99610608dd1d0b5f4a62ab'
* commit '64a663e3e13cd5d6ee99610608dd1d0b5f4a62ab':
Fix mncLength in cases with a malformed AD_DONE msg from SIM
Merge commit 'c2042f5e4910c4f7c5b812787ad2b025d93da497' into eclair-plus-aosp
* commit 'c2042f5e4910c4f7c5b812787ad2b025d93da497':
Fix mncLength in cases with a malformed AD_DONE msg from SIM
The current API requires a contact_id and a raw_contact_id
There are at least two issues with this approach I did not recognize initially:
1. Contact_id may be changed asynchronously by aggregation or some other process.
2. A raw contacts may need to be added to an aggregate before the actual aggregation pass
has gotten to it, so the client would need to wait for the aggregation to complete
before it can set an aggregation exception. That's backwards.
Merge commit 'bdbe87d0756a54dbc2edd24b75b9cd98cab31442'
* commit 'bdbe87d0756a54dbc2edd24b75b9cd98cab31442':
Wallpapers: new transitions, hiding when not visible, other cleanup.
