The TelephonyRegistry service crashed badly in the generic build, because
there is no system property to tell if the phone is GSM or CDMA. Adding a
simple null check solves the issue and allows the system to boot properly.
Merge commit '896b15abea4e1c0ee98330964474672a7316ee50' into eclair-plus-aosp
* commit '896b15abea4e1c0ee98330964474672a7316ee50':
A variety of work on animations.
- The lock screen now fades in and out.
- Fixed a bug where we would accidentally freeze the screen when switching
to an activity with a different orientation than the current (but
the screen itself is in the current orientation). This would mess up
the animations on the car dock.
- New API to force a particular animation for an activity transition
(untested).
- New wallpaper animations.
- Resources now uses the next API version when in a development build,
to help applications being developed against such builds.
Change-Id: I2d9998f8400967ff09a04d693dc4ce55f0dbef5b
* changes:
Fix bug 2129190 The context used by the status bar (i.e., the system context) was not properly initialized to have the right ApplicationInfo inside its PackageInfo. This eventually caused it to believe that it was running at 160dpi.
The context used by the status bar (i.e., the system context) was
not properly initialized to have the right ApplicationInfo inside
its PackageInfo. This eventually caused it to believe that it
was running at 160dpi.
Kudos to Dianne for figuring this out.
* We now check for in-progress backups when asked to perform one, and don't
bother firing off another one concurrently (nor do we adjust the scheduling;
after all, someone asked to do a backup "now" and we're doing one, so we are
in line with expectations). We also defer backup passes while a restore is
in flight, and abort attempts to perform a restore during a backup pass.
* When a backup attempt fails, we now ask the transport how far in the future we
should put our retry. Previously we were simply not bothering to consult with
the transport, so we would wind up retrying backup while network connectivity
was known to be down, etc.
Change-Id: Ic7758010b74e06e90c50d46b7b0dd01b17af7c90
Merge commit '4cc86e1ae80eb1938500fe5fa06bbdf8b4b7b50d' into eclair-plus-aosp
* commit '4cc86e1ae80eb1938500fe5fa06bbdf8b4b7b50d':
Clear the device's data from the transport when backup is disabled
Turning off backup in the Settings UI constitutes an opt-out of the whole
mechanism. For privacy reasons we instruct the backend to wipe all of the data
belonging to this device when the user does this. If the attempt fails it is
rescheduled in the future based on the transport's requestBackupTime()
suggestion. If network connectivity changes prompt the transport to indicate a
backup pass is appropriate "now," any pending init operation is processed before
the backup schedule is resumed.
The broadcasts used internally to the backup manager are now fully protected;
third party apps can neither send nor receive them.
(Also a minor logging change; don't log 'appropriate' EOF encountered during
parsing of a backup data stream.)
Merge commit 'ffa424800d0338b8b894aef2ea1e3e3344cbda7a' into eclair-plus-aosp
* commit 'ffa424800d0338b8b894aef2ea1e3e3344cbda7a':
Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off
Lot of infrastructure for more things to go away when "clear system dialogs"
happens, and now do this when we turn on the lock screen.
Change-Id: I567130296fe47ce82df065ed58ef21b37416ceaf
Merge commit 'c413d54cd9283778e6d73965a1d1d5f63ba62ec3' into eclair-plus-aosp
* commit 'c413d54cd9283778e6d73965a1d1d5f63ba62ec3':
Fix bug where onStartCommand() was never called with a null intent.
Merge commit '7c47adefea3101876f747926e7631406b4fbf45e' into eclair-plus-aosp
* commit '7c47adefea3101876f747926e7631406b4fbf45e':
Dock screen on config can now select AC or USB.
Merge commit 'b03b3bbd6833f7c6fbd8100fa3958220554f66a3' into eclair-plus-aosp
* commit 'b03b3bbd6833f7c6fbd8100fa3958220554f66a3':
If backup fails, reenqueue all of the affected packages for next time.
Merge commit '9bfb707597898f54722460b48588007b682f3e2a' into eclair-plus-aosp
* commit '9bfb707597898f54722460b48588007b682f3e2a':
Various fixes and improvements to window, activity.
- New meta-data you can add to a dock activity to have it launched by the
home key when the device is in that dock.
- Fix a deadlock involving ActivityThread's internal content provider lock.
- New window flag to have a non-secure keyguard entirely dismissed when a
window is displayed.
- New WindowManagerPolicy APIs to allow the policy to tell the system when
a change it makes during layout may cause the wall paper or
overall configuration to change.
- Fix a bug where an application token removed while one of its windows is
animating could cause the animating window to get stuck on screen.
Change-Id: I6d33fd39edd796bb9bdfd9dd7e077b84ca62ea08
Merge commit '6c644f248f553898248b8a6948fac4d62874fedd' into eclair-plus-aosp
* commit '6c644f248f553898248b8a6948fac4d62874fedd':
Add parameter for the restore set (device id) data is being restored from to the restore_start event
Merge commit '94db928d8cf5a69e8c2907fc33a6d656045f263d' into eclair-plus-aosp
* commit '94db928d8cf5a69e8c2907fc33a6d656045f263d':
PowerManager: Require proximity sensor value be less than Sensor.getMaximumRange()
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 '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 '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
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 '9568fb21766684083ec256303a6ed7949ada7d9f' into eclair-plus-aosp
* commit '9568fb21766684083ec256303a6ed7949ada7d9f':
Reset backup tracking in response to transport data-wipe notification
When attempting a backup, the transport may inform us that the backend is in an
uninitialized state. This typically means that the device's data has been wiped
after a period [e.g. 90 days] of inactivity. This means that we need to
re-store all data subject to backup, and all of our incremental state tracking
on the device is now stale.
In response, we wipe all of our recorded backup state and restart the backup
pass on all participants.
Merge commit '77fa24a5ef3ee3bc108d4bf3c77b7b4c7d0d5451' into eclair-plus-aosp
* commit '77fa24a5ef3ee3bc108d4bf3c77b7b4c7d0d5451':
Fix NPE crash-loop when cpufreq not available in the kernel.
Merge commit 'e705ca961f6c4f76f5b403d8556ee38305553aa7' into eclair-plus-aosp
* commit 'e705ca961f6c4f76f5b403d8556ee38305553aa7':
Handle restore of the original naive wallpaper backup schema
Merge commit '5ea916b17cf0071f4d49936a370f4b873e4eb3e3' into eclair-plus-aosp
* commit '5ea916b17cf0071f4d49936a370f4b873e4eb3e3':
Track CPU speed stepping to get more accurate CPU cost per app.
More CPU speed stepping happening with newer devices, so we need
to qualify CPU time with the CPU speed, since power consumption
varies greatly by speed. Apps that peg the CPU should get a higher
penaltly.
Also, fix for 2062930: NPE at VolumePreference.onKey()
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.
