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.
* 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.
This will prevent us from keeping the processor awake indefinitely if a
background service is requesting periodic updates and we are unable to get a fix.
Signed-off-by: Mike Lockwood <lockwood@android.com>
* 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).
To address issues where we could leave half-installed applications around if there was a failure during the install, we split getPackageLP() into two phases: the first would create the record, and only after doing all verification checks would we call insertPackageSettingLP() to do the remaining part of the original implementation and actually insert the record into the data structures.
Unfortunately it was only in insertPackageSettingLP() that we would set the sharedUser field of the PackageSetting structure, so when before that we went to verify certificates, we didn't think it had requested a shared user ID, and let it through without checking.
This fix simply sets the sharedUser field when the PackageSetting structure is first created, so we will actually check against its certs. We still also set this again in insertPackageSettingLP(), but there is no harm in this because the only time we call this function is in that big install func, which just passes in the same shared user that it had when first getting the package.
BUG=1851541
Automated import of CL 148824
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.
