Merge commit '678fa1898f8928cd6b81d2fe60ed54af60be3695'
* commit '678fa1898f8928cd6b81d2fe60ed54af60be3695':
PowerManager: Require proximity sensor value be less than Sensor.getMaximumRange()
Merge commit '94db928d8cf5a69e8c2907fc33a6d656045f263d' into eclair-plus-aosp
* commit '94db928d8cf5a69e8c2907fc33a6d656045f263d':
PowerManager: Require proximity sensor value be less than Sensor.getMaximumRange()
Merge commit '9ca231c5b616f7240021906b0decd1d412df00ab'
* commit '9ca231c5b616f7240021906b0decd1d412df00ab':
Basic API for third-party apps to define custom Data rows.
This allows us to support binary proximity sensors that only return 0.0 and 1.0
Change-Id: Ifaf3a4e6fc720cb246ac3558e3e733b4b612c95b
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '3f0476a4e283ce4e55caac016293dafe9dca11fa' into eclair-plus-aosp
* commit '3f0476a4e283ce4e55caac016293dafe9dca11fa':
Basic API for third-party apps to define custom Data rows.
To display styled ContactsContract.Data rows in UI, this
change adds basic styling attributes that third-party apps
can use. The Contacts app parses these structures before
displaying Data rows with unrecognized MIME-types.
Partially fixes http://b/2126691
Merge commit 'da2c7b79808f755af148fdb9ee2be30b11e84085'
* commit 'da2c7b79808f755af148fdb9ee2be30b11e84085':
Implement more type checks on Allocations.
Merge commit 'cd263b5c072703e80fe43e46baa831304441369b' into eclair-plus-aosp
* commit 'cd263b5c072703e80fe43e46baa831304441369b':
Implement more type checks on Allocations.
* changes:
Implement more type checks on Allocations. Add tracking for allocations created using the "sized" helper. Add more param validation for data upload calls.
Merge commit 'e5910775c892f37ddc05c63eeaf62b74228cfb30'
* commit 'e5910775c892f37ddc05c63eeaf62b74228cfb30':
Make IBackupTransport.finishBackup() also return an int code, since it too can
Merge commit '9bbd5ee49f4a26b87273c40a955557e63f10da3b' into eclair-plus-aosp
* commit '9bbd5ee49f4a26b87273c40a955557e63f10da3b':
Make IBackupTransport.finishBackup() also return an int code, since it too can
* changes:
Make IBackupTransport.finishBackup() also return an int code, since it too can return TRANSPORT_NOT_INITIALIZED (in fact that's typically how it comes).
Merge commit '7ce7f6333421feed8468d69c920cfe9826e51704'
* commit '7ce7f6333421feed8468d69c920cfe9826e51704':
Don't wake up the screen as soon as the lid opens.
Merge commit 'fe2bddfae1b8c2375f58216871d923cbfe267dd3' into eclair-plus-aosp
* commit 'fe2bddfae1b8c2375f58216871d923cbfe267dd3':
Don't wake up the screen as soon as the lid opens.
Merge commit '7f3fb7dec2afdffa37e3067ca8a5b9d01809a9ce' into eclair-plus-aosp
* commit '7f3fb7dec2afdffa37e3067ca8a5b9d01809a9ce':
Turn animations on by default.
Add API to skip the animation for a particular start activity, so that
a latter better one can be used.
Fix Theme.NoDisplay to actually work.
Fiddle with various animations: don't do a different animation for task
switching, try a scale animation for switching in/out of the wallpaper.
Adjust the animation duration so that at normal speed we have something
more like the slower animation option (so slow is now the default).
Change-Id: Ieba9f3db0bd9a762a19b327a3ecccbc7b547893d
Merge commit '0bee99f074b848a4fbe5138f4a6a200d6284f78b'
* commit '0bee99f074b848a4fbe5138f4a6a200d6284f78b':
Send the address of the device with the UUID intent.
Merge commit '374fd5a148213dd269a54ea9e1745a3b95b6d933'
* commit '374fd5a148213dd269a54ea9e1745a3b95b6d933':
Resolve race conditions with disconnect of CDMA data and airplane mode
Merge commit '9197081f8feca110455740874e06e05771f462c8' into eclair-plus-aosp
* commit '9197081f8feca110455740874e06e05771f462c8':
Send the address of the device with the UUID intent.
Merge commit '6e81a40d078269258d75bf22dd00a9dc22f4d0b9' into eclair-plus-aosp
* commit '6e81a40d078269258d75bf22dd00a9dc22f4d0b9':
Resolve race conditions with disconnect of CDMA data and airplane mode
return TRANSPORT_NOT_INITIALIZED (in fact that's typically how it comes).
For consistency, make other IBackupTransport methods return int instead of
boolean, and handle accordingly.
Make initializeDevice() its own method instead of a flag on performBackup().
This will be needed when un-checking the settings box anyway, and is
conceptually unrelated to whatever happens to be the first post-initialization
backup we perform. (Note that even if the init is sent separately from the
backup operation, the server will remember that an init has been done and
will *not* return NOT_INITIALIZED for the subsequent backup.)
Fix LocalTransport accordingly (trivial changes).
Handle failures more robustly in BackupManagerService -- most notably,
doQueuedBackups() was ignoring the result code of processOneBackup(), so
a NOT_INITIALIZED error would go past unseen (at least until the next
backup pass). Keep track of error code returns more universally now.
(This includes finishBackup(), of course.)
Merge commit 'a7719af31290bea50d822b535b6a886ba7a88097' into eclair-plus-aosp
* commit 'a7719af31290bea50d822b535b6a886ba7a88097':
Cache the remote device's service channel.
Until now we had a race condition where the GL rendering thread could
continue rendering a frame after we have returned from the
SurfaceHolder.Callback.surfaceDestroyed notification.
Bluez Device implementation is such that when a device
is unpaired, we removes the device and hence there is no
way to interact with it unless you pair again. Remote service
channel call is used to get the rfcomm channel number which
will be used in profiles like OPP which don't require pairing.
Change-Id: I868a6cdfdb1b7d3591dd8b66cd0320f41a9c1b92
Merge commit '36322db5752c7ec196f59ba94abe5d5a63cc19f5' into eclair-plus-aosp
* commit '36322db5752c7ec196f59ba94abe5d5a63cc19f5':
Add focus API and FLASH_MODE_VIDEO_LIGHT.
Specifically, wait for data to be deactivated when setPowerStateToDesired()
is called during data activation.
Bug: 2101430
Change-Id: Ia97dd799f779c3f88f66bc1235e7a65958e1e04f
Merge commit 'dbe8bad1d2d68e2f5947ff0a8347dbb498e17ede' into eclair-plus-aosp
* commit 'dbe8bad1d2d68e2f5947ff0a8347dbb498e17ede':
Work around gcc 4.0.3 bug.
