Merge commit 'd4b74574a071eaa692fe6612ee99f519f9f56311'
* commit 'd4b74574a071eaa692fe6612ee99f519f9f56311':
Add an 'init everything' operation to the first backup pass
Merge commit '3a66413af33f2f2a3511f644efe5b4e45198d7df' into eclair-plus-aosp
* commit '3a66413af33f2f2a3511f644efe5b4e45198d7df':
Add an 'init everything' operation to the first backup pass
IBackupTransport.performBackup() now takes a flag "wipeAllFirst", which if set
will result in the entire restore set for the current device/account being wiped
clean prior to the storage of the provided package. This ensures that a device
on which backup has just been enabled will not confront potentially-stale
information, nor will the restore set potentially contain mismatched data from
orphaned packages.
The Backup Manager has also been revised to pass this flag when first backing up
its master metadata block (and never pass it thereafter unless something has
caused the backup state tracking to be erased, e.g. the user has opted out of
backup and then later re-enabled it).
Merge commit '23bd5042ca6806995e019ea997f73740c754df9e'
* commit '23bd5042ca6806995e019ea997f73740c754df9e':
handle calendars with an access level of "root"
Merge commit '7d9db612bdecad3d6667858ac296f5ede27aabfa' into eclair-plus-aosp
* commit '7d9db612bdecad3d6667858ac296f5ede27aabfa':
handle calendars with an access level of "root"
This call has been synchronus since Bluez3.36.
However, since the semantics for all Bluetooth API calls are
asynchronous make this so too. It does fix an occasional ANR
seen while unpairing.
Change-Id: If81f8ec262ea1f6f62775282ab33855a8669c41a
Merge commit '9122a49cd68ab2a472516c568298699f376bf80a'
* commit '9122a49cd68ab2a472516c568298699f376bf80a':
Don't back up / restore certain sync-related settings
Merge commit 'd163f4babe101b89aaf322c34d3bafeae237f7da' into eclair-plus-aosp
* commit 'd163f4babe101b89aaf322c34d3bafeae237f7da':
Don't back up / restore certain sync-related settings
Merge commit '33c29f9691e584a0fd37266381ccd47e2ac3c197'
* commit '33c29f9691e584a0fd37266381ccd47e2ac3c197':
Show silent mode icon associated with current state instead of what it will be.
Merge commit '9603715ae3813290dcf18f2f6a3fb5299dc27a70' into eclair-plus-aosp
* commit '9603715ae3813290dcf18f2f6a3fb5299dc27a70':
Add better transition to rotary lock widget when triggering: spin around instead of snap back.
Merge commit 'ad12b1407b4f615765bca0f496ccbb0a11678a4f'
* commit 'ad12b1407b4f615765bca0f496ccbb0a11678a4f':
Support for forcing accelerometer based orientation management when docked.
Merge commit 'b4c0b3d8ccbadca9d4e8a0e5c50a4549f2c84bf6' into eclair-plus-aosp
* commit 'b4c0b3d8ccbadca9d4e8a0e5c50a4549f2c84bf6':
Add resources to allow forcing accelerometer based orientation management when docked.
Merge commit 'c01513005085fd4a1e3c7183348cd22e4ac214f3'
* commit 'c01513005085fd4a1e3c7183348cd22e4ac214f3':
Wake the screen if the proximity wakelock is released while the proximity sensor is active.
Merge commit 'c70f90b484af17393986ff2a948f56575580c272'
* commit 'c70f90b484af17393986ff2a948f56575580c272':
Change the broadcast intent for dock state changes from a sticky broadcast to
Merge commit 'b8155068ef855147d86465817be2660a5212a6bb' into eclair-plus-aosp
* commit 'b8155068ef855147d86465817be2660a5212a6bb':
Wake the screen if the proximity wakelock is released while the proximity sensor is active.
Merge commit '2b1cfef19efb11d283a08042d37a326141c28429' into eclair-plus-aosp
* commit '2b1cfef19efb11d283a08042d37a326141c28429':
Change the broadcast intent for dock state changes from a sticky broadcast to
* changes:
Change the broadcast intent for dock state changes from a sticky broadcast to a sticky ordered broadcast. This is so individual apps can override the default behavior and stop the related dock app from launching.
This fixes a problem that resulted in the screen staying off indefinitely if the prox sensor
is active at the beginning of a bluetooth call and could result in the screen staying off
in other similar circumstances.
Change-Id: Icfa0046d3179f9bb2247e7a3c1f9ff073312667a
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '7b17c0bf355e6a5fd66b14a4c2cbbbd772f0ab6b'
* commit '7b17c0bf355e6a5fd66b14a4c2cbbbd772f0ab6b':
Add config_use_strict_phone_number_comparation, which will be used by internal applications.
Merge commit '927b86f3a7bdf419dea40ecdfaa6678517d8593c' into eclair-plus-aosp
* commit '927b86f3a7bdf419dea40ecdfaa6678517d8593c':
Add config_use_strict_phone_number_comparation, which will be used by internal applications.
The process for starting wifi was using a wakelock around a message-pass and this was causing
an exception for meer mortals (who don't have WAKE_LOCK permission).
bug: 1750535
Merge commit 'c23bf575b9b00601d75a92caaffb93e665b93f38'
* commit 'c23bf575b9b00601d75a92caaffb93e665b93f38':
Implement compareStrictly() using phone_number_compare() written in C.
Merge commit '9a24bc563f28d8489c7178b93ff05f02e8b8a893' into eclair-plus-aosp
* commit '9a24bc563f28d8489c7178b93ff05f02e8b8a893':
Implement compareStrictly() using phone_number_compare() written in C.
As per several discussions, we stick to the default behavior now.
In stead, we provide compareStrictly() as a hidden method, so that some
internal components are able to use the method if needed.
Since these are static methods, they cannot refer to the configuration files,
whose values can be obtained only via Resources object.
Please make callers' side if you want to use strict version of compare().
Internal issue number: 1892808
Merge commit '3bd5e2b22efe0da3864bc6d8c5aae68742c3c707'
* commit '3bd5e2b22efe0da3864bc6d8c5aae68742c3c707':
Add better APIs for the battery status, and other cleanup.
