Merge commit '83a6ec600259d245b799a99a8e963704db031a63'
* commit '83a6ec600259d245b799a99a8e963704db031a63':
Add a method to get the PhoneType in CellLocation.
CellLocation uses TelephonyManager to get the PhoneType.
TelephonyManager uses the system property to get the phoneType,
if the ITelephony interface is not up.
Merge commit 'eba1ffb1468ce348bcd55a2d200728d5ac3b1eb3'
* commit 'eba1ffb1468ce348bcd55a2d200728d5ac3b1eb3':
TextView was not setting the callback on its compound drawables, thus preventing them from refreshing the view when updating their internal state. This would for instance prevent animated drawables from actually animating. Quite infuriating.
* changes:
TextView was not setting the callback on its compound drawables, thus preventing them from refreshing the view when updating their internal state. This would for instance prevent animated drawables from actually animating. Quite infuriating.
Merge commit '379d3bd974cfde9480fda733d4f442311924cbb9'
* commit '379d3bd974cfde9480fda733d4f442311924cbb9':
Replaced the old test media files with the new open source test media files.
Merge commit 'f9df6bd6e92fcef6bc32225bde412d3b1c0df180'
* commit 'f9df6bd6e92fcef6bc32225bde412d3b1c0df180':
Fixes external #2686. Make @android:anim/linear_interpolator public since the default intperpolator for all animations is accelerate_decelerate.
* changes:
Fixes external #2686. Make @android:anim/linear_interpolator public since the default intperpolator for all animations is accelerate_decelerate.
Merge commit '988c4d1a3ece97c078658a67b15949db900641e0'
* commit '988c4d1a3ece97c078658a67b15949db900641e0':
Added the write sdcard permission so that the mediarecorder test
Merge commit '3e458241d9930465a20a861ecb42744355d48e48'
* commit '3e458241d9930465a20a861ecb42744355d48e48':
process: Add setProcessGroup() hidden API call to set the cgroup of
Merge commit '65ff54c44bbd8c1dd6818d42b7c91c634c644aa9'
* commit '65ff54c44bbd8c1dd6818d42b7c91c634c644aa9':
Document the media scanner's flow through native and java code, since
ACCESS_FINE_LOCATION should imply ACCESS_COARSE_LOCATION, so either of these
permissions should be sufficient to allow TelephonyManager.getCellLocation().
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit 'c3320dbe1c7acf040a3ec895129d8aae09c570ea'
* commit 'c3320dbe1c7acf040a3ec895129d8aae09c570ea':
Minor performance improvement when filtering intents by package.
Network Location Provider requires user opt-in, so it should be disabled by default
and only enabled if the user agrees to the terms of service and privacy policy.
Use GPS as default location provider instead.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '5615d35b28119865cd65a79814a69f910e0a3862'
* commit '5615d35b28119865cd65a79814a69f910e0a3862':
Add tests for the new SQLite _TOKENIZE() 'tag' column.
Merge commit '51b22d74a39ef7f6a3684a36bb48ace523e83413'
* commit '51b22d74a39ef7f6a3684a36bb48ace523e83413':
AI 148972: fix link to the installing guide to 1.5;
Merge commit '3975fe3f21311e41b41e3a3e234a45ca24bed521'
* commit '3975fe3f21311e41b41e3a3e234a45ca24bed521':
AI 148962: Default language in Switzerland should be german and not english.
Merge commit '15e74b9da8b4cda11ee54da1e77a02d1a86c944a'
* commit '15e74b9da8b4cda11ee54da1e77a02d1a86c944a':
Temporarily suppress flaky test LocationManagerProximityTest until test harness support can be rolled out.
Fix build breakage
Revise the ImageButton class description to include information
Record statistics about whether HTTP connections are reused.
Merge commit '221c95526d3e3e23288478b6dd2d24b5ec7e97d5' into donut
* commit '221c95526d3e3e23288478b6dd2d24b5ec7e97d5':
AI 148972: fix link to the installing guide to 1.5;
Merge commit '808f2919ee9cd9ff678ef091da0c7b703c929003' into donut
* commit '808f2919ee9cd9ff678ef091da0c7b703c929003':
AI 148962: Default language in Switzerland should be german and not english.
