Merge commit 'a47260887917546fc867b8998fa3ba77639d64a4'
* commit 'a47260887917546fc867b8998fa3ba77639d64a4':
Moving ImProvider to TalkProvider: Change Im.java to use the new TalkProvider; change the authority
Merge commit '905d7f57d44b8598994f3d24ca27db6f9748f05a'
* commit '905d7f57d44b8598994f3d24ca27db6f9748f05a':
Don't init wifiChannels until after supplicant up
Merge commit 'd42da36810b392867341b07d5bf1f2c47fa71c86'
* commit 'd42da36810b392867341b07d5bf1f2c47fa71c86':
If disk-full, don't crash the system server. Still todo: when we have disk we should trigger the event again.
Merge commit '16eae482cec71f0ca1a2f5e90c85c482577b2cd6'
* commit '16eae482cec71f0ca1a2f5e90c85c482577b2cd6':
dumpstate: Switch back to running as non-root
Merge commit 'b04c6689d0369209dbf0485a2e0af7f02b521fad'
* commit 'b04c6689d0369209dbf0485a2e0af7f02b521fad':
Add @Widget annotation to GestureOverlayView to make it usable in ADT.
Merge commit 'f6626fecdf3764bff9d40d3eac5c98f3fb9af643'
* commit 'f6626fecdf3764bff9d40d3eac5c98f3fb9af643':
Fix issue #1983406: Soft keyboard doesn't show up in an EditText with "digits" attribute set
Merge commit 'b7860bea3bcbd5217f42f2fa5ead4c498600d517'
* commit 'b7860bea3bcbd5217f42f2fa5ead4c498600d517':
Various cleanup around resources and nine-patches.
Merge commit 'e055d5833afc4124f0686b8d98f0b1adb3dd006f'
* commit 'e055d5833afc4124f0686b8d98f0b1adb3dd006f':
Save and restore partial supplicant data, not the whole file.
Merge commit '2d1c327eb91073881cd6b902d7209d4938e2bd5f'
* commit '2d1c327eb91073881cd6b902d7209d4938e2bd5f':
Only build the "full" stagefright (including MediaExtractors and MediaPlayer) if BUILD_WITH_FULL_STAGEFRIGHT define is set (to true).
Merge commit '37f62206236dbfe89c15990cd506e5e40dc256b2'
* commit '37f62206236dbfe89c15990cd506e5e40dc256b2':
Minor changes to api levels doc and upgrading doc. Change Linux "tested on" to Hardy Heron.
Merge commit '8797066aa8443df38118f24ed46fd052b2f4a37b'
* commit '8797066aa8443df38118f24ed46fd052b2f4a37b':
Move API change details from highlights doc to version notes doc.
Merge commit '9a0bf14c4f715a8ffa645c77c4c183dcfa3e31c8' into eclair-plus-aosp
* commit '9a0bf14c4f715a8ffa645c77c4c183dcfa3e31c8':
Moving ImProvider to TalkProvider: Change Im.java to use the new TalkProvider; change the authority
Merge commit 'd2cc42733eb13063754c654921a58d34bfdb1c65' into eclair-plus-aosp
* commit 'd2cc42733eb13063754c654921a58d34bfdb1c65':
fix [2111536] [FAST BLOCKER] Device is soft rebooted after ending the call through voice dialer
Merge commit 'f376c837ea9d5b89c668ff8306f2a404bed4ff05' into eclair-plus-aosp
* commit 'f376c837ea9d5b89c668ff8306f2a404bed4ff05':
Don't init wifiChannels until after supplicant up
* changes:
modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java Fix the m4a1 duration and the also fix the random_seek time error in the stress test.
Without this we'd only try a secondary APN once and the stop silently, leaving
no APN connected.
Adds a second retry manager with configuration strings to do a more approriate
retry. Don't retry secondary apn forever.
On permanent failure or retry count hit, we send a Phone.REASON_APN_FAILED
disconnect status.
bug: 2112114
The supplicant can take up to 15 seconds to start - setting the number of wifi channels
immediately after requested wifi start often will fail.
Changed to set the number of channels when the supplicant is reported as alive.
bug:2083601
+ For bug 1810508
- Added PerformanceCollector class to collect runtime and memory usage data
* Moved performance snapshotting from Intrumentation to PerformanceCollector
- Added PerformanceResultsWriter interface which defines functions for
reporting performance data
+ Framework integration
- Added TimedTest annotation to automatically time tests and write results
to instrumentation output
- Modified PerformanceTestBase to add collection hooks and wrapper methods
- Modified WatcherResultPrinter in InstrumentationTestRunner to implement
PerformanceResultsWriter for instrumentation output of performance data
- Modified InstrumentationTestRunner and AndroidTestRunner to pass writer
instance to test
Merge commit '38eeac305a188b7ea4f586071c1d467c3f952be6' into eclair-plus-aosp
* commit '38eeac305a188b7ea4f586071c1d467c3f952be6':
Don't backup/restore telephony material from secure settings
modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
Fix the m4a1 duration and the also fix the random_seek time error in the stress test.
modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
* Remove several nonportable telephony settings from the set to be included in
the backed-up dataset
* Explicitly ignore those settings if they're encountered during a restore
operation, so that we don't inadvertently do things like configure a GSM
phone to use CDMA logic.
Merge commit 'd3e061fc8f4a2a1e6b98ee43fd706ac09c786b61' into eclair-plus-aosp
* commit 'd3e061fc8f4a2a1e6b98ee43fd706ac09c786b61':
If disk-full, don't crash the system server. Still todo: when we have disk we should trigger the event again.
Merge commit '66c2a976705b62fe1721157e934b52d4a49de8f7' into eclair-plus-aosp
* commit '66c2a976705b62fe1721157e934b52d4a49de8f7':
dumpstate: Switch back to running as non-root
