Merge commit '02c1c46fff22490f884f05520d58eadae1442db8'
* commit '02c1c46fff22490f884f05520d58eadae1442db8':
gps: Time out after 1 minute if we are unable to get a fix and our fix interval is long.
Merge commit 'aa642c0cc20293137376d44f8221876c121e5be9'
* commit 'aa642c0cc20293137376d44f8221876c121e5be9':
Get the backup calling through to the file backup helper.
Fix typos.
Add a new feature to android.os.Debug to add the ability to inject only specific fields when calling setFieldsOn().
Fixes#1836075. Adds consistency checks for the View hierarchy. To enable them, you need a debug build and ViewDebug.sConsistencyCheckEnabled set to true in debug.prop. This change also lets you easily enable drawing and layout profiling in ViewRoot by setting ViewRoot.sProfileDrawing, ViewRoot.sProfileLayout and ViewRoot.sShowFps in debug.prop with a debug build.
Add Intent.ACTION_APP_ERROR
* changes:
Add wifi multicast filter api (enable/disable). Fixes 1833432. Automatically re-disables any request when the app exits/crashes. Also hooked into Battery Stats for power managment analysis.
* changes:
fix window layout problem in ViewRoot * don't scale LayoutParams (this must be app's scale). * scale the layout params' coordinates & size only when requesting layout. In SurfaceView, window's x,y wasn't scaled before sending to window manager.
* changes:
Add a new feature to android.os.Debug to add the ability to inject only specific fields when calling setFieldsOn().
Fixes#1836075. Adds consistency checks for the View hierarchy. To enable them, you need a debug build and ViewDebug.sConsistencyCheckEnabled set to true in debug.prop. This change also lets you easily enable drawing and layout profiling in ViewRoot by setting ViewRoot.sProfileDrawing, ViewRoot.sProfileLayout and ViewRoot.sShowFps in debug.prop with a debug build.
Merge commit 'b91081113692acc87ae67f235956ae1cecab68cc'
* commit 'b91081113692acc87ae67f235956ae1cecab68cc':
AI 148824: Fix issue #1851541 (sharedUserId requests not being checked for matching signatures on .apk).
Merge commit '5d6d773fab559fdc12e553d60d789f3991ac552c' into donut
* commit '5d6d773fab559fdc12e553d60d789f3991ac552c':
AI 148824: Fix issue #1851541 (sharedUserId requests not being checked for matching signatures on .apk).
Merge commit 'c4cdc7d8a1a42f0ce6e28c39f70cfceeee29a781'
* commit 'c4cdc7d8a1a42f0ce6e28c39f70cfceeee29a781':
Replace the search dialog images so that they correctly center
Merge commit '2b52b3ed46c50befcc1111ad0f4afe294a878b22'
* commit '2b52b3ed46c50befcc1111ad0f4afe294a878b22':
Revert dividers back to their original translucent versions but add new opaque dividers to improve the speed of lists.
Merge commit '55d7bd33e3621c0b870d8d84daeb4bf7a8279568'
* commit '55d7bd33e3621c0b870d8d84daeb4bf7a8279568':
AI 148803: Update 1.xml and 2.xml for methods that take Generic Type Varargs. This will allow the CTS Signature Test to be run against older android releases.
Merge commit '7567a7453e853eca75a7162bbb87bfd0d7a5aafe'
* commit '7567a7453e853eca75a7162bbb87bfd0d7a5aafe':
AI 148803: Update 1.xml and 2.xml for methods that take Generic Type Varargs. This will allow the CTS Signature Test to be run against older android releases.
Merge commit '4ce643074874dd79cc3a9219bdfefe63f2400ed7' into donut
* commit '4ce643074874dd79cc3a9219bdfefe63f2400ed7':
AI 148803: Update 1.xml and 2.xml for methods that take Generic Type Varargs. This will allow the CTS Signature Test to be run against older android releases.
Merge commit '541ff5df00984580e0245b3ae2c89b93e76b7c08'
* commit '541ff5df00984580e0245b3ae2c89b93e76b7c08':
Fix issue #1838944: Application sync settings cant be changed with auto sync on
Merge commit '6063a9c9ee91a647680653a4520dfcad83985592'
* commit '6063a9c9ee91a647680653a4520dfcad83985592':
Make pressing the search button within an app that does not support
* changes:
Make pressing the search button within an app that does not support search bring up global search. This still respects the case where an app has chosen to disable search entirely by overriding onSearchRequested() to return false.
Merge commit '8ad028117d4b99883bbc52b29f097b2fb1d9b0c2'
* commit '8ad028117d4b99883bbc52b29f097b2fb1d9b0c2':
With this, the BackupService onBackup method is called.
Merge commit '2bb3ea162a58c0f1dddccdbe68b64e02456f11f9'
* commit '2bb3ea162a58c0f1dddccdbe68b64e02456f11f9':
Fix native core runtime. A messy declaration was causing a problem at boot time.
Merge commit 'c214de5897da8d81378553e25a855c18372d1d29' into donut
* commit 'c214de5897da8d81378553e25a855c18372d1d29':
AI 148752: Fix description of breakText() param.
* changes:
Density Compatibility mode for SurfaceView * use fixed size when requested. Otherwise, give the original size instead of scaled down size. * scale back the motion event to original size when surface view is using the orignal size.
