Merge commit 'eb8aad7b2a99d3332a2fa6d8778356d634c47127' into eclair-plus-aosp
* commit 'eb8aad7b2a99d3332a2fa6d8778356d634c47127':
Fix up the first-backup-ever tracking
This changes a couple of bits of the Backup Manager's logic around
first-backup-ever handling. First, it uses the same "what we've ever backed up"
handling as the rest of the system for purposes of instructing the backend to do
a wipe when the metadata is initialized for the device, instead of looking at
the presence of the @pm@ file. Secondly, for the time being we won't be using
the saved state produced by agents' doRestore() logic. Until the server is
migrating each restored package's data over to the new dataset, this was
resulting in the client holding an agent state blob for which no data existed on
the server under this device's identity but which the device thought was fully
up to date.
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 '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
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>
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 'e69335f8b4f4195e57613fe6b83e18e23e0c2760' into eclair-plus-aosp
* commit 'e69335f8b4f4195e57613fe6b83e18e23e0c2760':
Add better APIs for the battery status, and other cleanup.
Merge commit '90d8a6a449dc12fea2b56b557c243e33746d914a' into eclair-plus-aosp
* commit '90d8a6a449dc12fea2b56b557c243e33746d914a':
Inefficient but correct fix for 2122381: call finishBackup after every performBackup
Merge commit 'c3a3b399a9d7707b7f3c4108e0e31a1b664a6f22' into eclair-plus-aosp
* commit 'c3a3b399a9d7707b7f3c4108e0e31a1b664a6f22':
Add a Gservices setting to controll the app error reporting feature.
Merge commit 'ffda371c220de9c97663fef4e9d14bee7267383d' into eclair-plus-aosp
* commit 'ffda371c220de9c97663fef4e9d14bee7267383d':
Show the live wallpaper on the lock screen.
This also takes care of the problem of system dialogs like the
crash dialog causing the status bar to dim behind the lock screen.
On the down side, the fade transition from the lock screen is
now gone, and I'm not sure how likely it is for it to return.
Change-Id: I7f9e6d0f3510a1fdbbe6ad252d986bd85a16475d
Merge commit 'fa82f22f1d8c4c828bdf9b670006be4f4fec772e' into eclair-plus-aosp
* commit 'fa82f22f1d8c4c828bdf9b670006be4f4fec772e':
Fix issue #2093608: Calendar widget takes a few seconds to launch
Avert your eyes!
The key change here is that RemoteViews can now call a Context API to
start its pending intent, which inside of the activity manager we can
use to determine to cancel the timeout delay for external entities
to disrupt the home screen.
Change-Id: If097cf7478cbed7a3c04a304050bd7fd5703d197
Merge commit '1c7c355626ea870605beab6dc07d8ac7509a8b80' into eclair-plus-aosp
* commit '1c7c355626ea870605beab6dc07d8ac7509a8b80':
Report NO_CONNECTIVITY when failover net unavail
Merge commit '0d51d63595014c4237010118aaac891e657c2d23' into eclair-plus-aosp
* commit '0d51d63595014c4237010118aaac891e657c2d23':
Check if rename of current settings file was successful before persisting
Merge commit '4ac137cad9fb9aa5b69776b4ae3c8f906cc57511' into eclair-plus-aosp
* commit '4ac137cad9fb9aa5b69776b4ae3c8f906cc57511':
Add API to retrieve memory used by running processes.
Merge commit 'c2912a662d984e2f23187fa31e7e71122d9472d9' into eclair-plus-aosp
* commit 'c2912a662d984e2f23187fa31e7e71122d9472d9':
Revert "Don't activate keyguard if screen is turned off while proximity sensor is active."
Merge commit '6c41feadc30448adba4f771b3c1b4ecda8d875b6' into eclair-plus-aosp
* commit '6c41feadc30448adba4f771b3c1b4ecda8d875b6':
LocationManagerService: Take fix accuracy into account in proximity zone logic.
Merge commit 'b8eb1cb79b2912b91a1b0198ba3e61776af07a79' into eclair-plus-aosp
* commit 'b8eb1cb79b2912b91a1b0198ba3e61776af07a79':
Be sure to include shared lib path info when dealing with agents
Merge commit 'e777e0a3d1645c1b54f12af5779cb7ccf0c82234' into eclair-plus-aosp
* commit 'e777e0a3d1645c1b54f12af5779cb7ccf0c82234':
Fix#1827299: Google login screen to re-enter password is not viewable
This was a problem with not hiding the starting window when it got
transfered to an activity whose window (instead of token) animates
when displayed.
Change-Id: I9eb58faa6e27d53144687952a715fc083a5c5842
Merge commit '9092ab4d458ad60b459d5fad52368bde5d25f665' into eclair-plus-aosp
* commit '9092ab4d458ad60b459d5fad52368bde5d25f665':
Add support for launching activities when attaching to a car or desk dock.
Categories CATEGORY_CAR_DOCK and CATEGORY_DESK_DOCK can be assigned to
activities to make them launchable on docked events.
This is a better mechanism than listening for ACTION_DOCK_EVENT with a broadcast receiver.
Change-Id: Ic5f3ab3555ce02ca922bc31ebba41978cefe8bda
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '2a66eee3ef88bdc7167e5e5d0471c1e8b2e68fc6' into eclair-plus-aosp
* commit '2a66eee3ef88bdc7167e5e5d0471c1e8b2e68fc6':
Remove deadlock in PackageManager when installing or upgrading packages.
* changes:
Remove deadlock in PackageManager when installing or upgrading packages. PM first creates a temporary file from the input package uri before installing it. if the package uri points to a content uri, the content provider has to be retrieved via the ActivityManager which could cause deadlocks with the package manager locks being held. Clean up by always copying or creating temporary files before acquiring these locks. Fix issue when restoring a failed upgrade for third party apps.
Merge commit '4337476a6669ce52549ce4a60f5e4d07f8e3033f' into eclair-plus-aosp
* commit '4337476a6669ce52549ce4a60f5e4d07f8e3033f':
Fix the missing part for reading enterprise fields in wifi configuration
Merge commit '7fc39b26fc4ec9df7d147ff34ebba90556cdb4da' into eclair-plus-aosp
* commit '7fc39b26fc4ec9df7d147ff34ebba90556cdb4da':
Implement issue #1780928: Need support hiding nav keys.
