Merge commit 'ef3c63ad20c4c45c0ae1748a67b5f33d26415938' into eclair-mr2-plus-aosp
* commit 'ef3c63ad20c4c45c0ae1748a67b5f33d26415938':
Make sdk version and code names static finals in PackageParser.
Merge commit 'baad552dfd6e9d244659e7509ff958ec8f449c03' into eclair-mr2-plus-aosp
* commit 'baad552dfd6e9d244659e7509ff958ec8f449c03':
Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
Tell the broadcast receiver whether it is getting an initial sticky value,
so it will be quiet about attempts to do ordered broadcast stuff.
Note that the original bug being reported was not actually a crash, just
an error log. So all we are doing here is making the log quieter.
Change-Id: Iaf1b718d82093ec1197142410a64feff47eb3859
Merge commit 'a4a8a88bf7aeec3413eda09c8a61c1df01c474ac' into eclair-mr2-plus-aosp
* commit 'a4a8a88bf7aeec3413eda09c8a61c1df01c474ac':
Fix issue #2161169: onStop not being called.
There was a bug with the starting window where it could be added to
the app window list twice, so the buddy list would end up with one
left over after all was done. This would result in visibility
changes not being delivered to it correctly, delaying the dispatch
of onStop.
Change-Id: If1993eaf9cfbba1f523ce5aaa478be0239d0c7db
We now just don't send out dock broadcasts/launches when the
device is not provisioned. Good enough for our purposes.
Change-Id: Iee6384121675e0e9854745ec1168245e8a23a241
Merge commit '9825ec61b4a40ed92a5bb28019289e5bab9cfb56' into eclair-plus-aosp
* commit '9825ec61b4a40ed92a5bb28019289e5bab9cfb56':
Prevents the WindowManager from requesting empty or negative surfaces.
Windows with a negative Y position can end up in createSurfaceLocked()
with mFrame containing a negative height, causing SurfaceFlinger to go
crazy when asked to create the surface. This change simply guards
against such a situation by instead asking for a 1x1 surface and relying
or later layout operations to resize the window to the appropriate size.
Change-Id: I66f2058f4cd1cf069b12d3d23e6fd340dc76b74e
Merge commit 'e88846eeaf70f9f4299af9e3d54ba5dacede42b6' into eclair-plus-aosp
* commit 'e88846eeaf70f9f4299af9e3d54ba5dacede42b6':
Semi-workaround for #2027266: app drawer showing up on the side of the screen
(when booted while docked)
This isn't really a fix, but we now have the activity report the configuration
it actually launched in, so the activity manager will later adjust it if
needed. Should help us recover from hitting the race in this particular case.
Change-Id: I3bb83a48c2d692b4cb1822d8ae7d924cfa9187b2
Merge commit '5f3c928f5ecdd2f41f238807c59241d34a02517e' into eclair-plus-aosp
* commit '5f3c928f5ecdd2f41f238807c59241d34a02517e':
Turn off the last of the STOPSHIP verbose debugging
Merge commit '436344ae12c819f58306ceb94241a266141e1218' into eclair-plus-aosp
* commit '436344ae12c819f58306ceb94241a266141e1218':
Turn off most of the backup-related debug logging
The core logging in BackupManagerService and in the Google backup transport are
still enabled at this point.
Change-Id: I10abfa565bbd1097dd3631051b6aca163e4af33a
Stop using SIM card icons for USB notifications
Fixes b/1700510
Change-Id: Ic7e251a7ecad3ed46044181eae41481791df85bd
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '48e9a0dd66b832cfaf668deba584394eba0ffdfc' into eclair-plus-aosp
* commit '48e9a0dd66b832cfaf668deba584394eba0ffdfc':
Fix issue #2150258: Suggestions become inactive and do not respond when pressed.
Merge commit '094e3e0bcc81a795f35ac2ea218d0fc0109100cf' into eclair-plus-aosp
* commit '094e3e0bcc81a795f35ac2ea218d0fc0109100cf':
Check if rename of backed up file fails before persisting new changes.
If not these system services will end up with inconsistent settings files
when the device runs out of storage.
Delete mangled settings file in PackageManager if the current write fails
so that we don't end up overwriting the backed up version with the
mangled version
Include null check when retrieving fwd locked resource for an existing package
Merge commit 'a33e3f79259b56b03c7912af35944f34ad190e3c' into eclair-plus-aosp
* commit 'a33e3f79259b56b03c7912af35944f34ad190e3c':
Fix issue #2154794: Force close when start facebook application.
I think when we were scanning the updated app in the system image,
from an older version on the data partition, we were not setting
the existing package to have the system flag, so not auto-granting
any new permissions.
This also includes some other cleanup in the package manager to
remove old files in various places, and tighten up logging.
Also similar logging cleanup elsewhere.
Change-Id: I6d113c7cf7e736ab9be512d6d7c94c806a24199a
Merge commit '46e462a380f90ed8101f9ac3f950a3c702772842' into eclair-plus-aosp
* commit '46e462a380f90ed8101f9ac3f950a3c702772842':
Only re-initialize backup state if @pm@ metadata is missing,
* changes:
Only re-initialize backup state if @pm@ metadata is missing, to defensively work around a still-mysterious bug where the list of saved packages ends up being empty even though we still have state pending. If we do re-initialize, then wipe all state to make sure the right thing happens.
Merge commit '935cbda0df2d55247c30d65534ecf31b1ee164b5' into eclair-plus-aosp
* commit '935cbda0df2d55247c30d65534ecf31b1ee164b5':
Debugging for #2027266: app drawer showing up on the side
to defensively work around a still-mysterious bug where the
list of saved packages ends up being empty even though we still
have state pending. If we do re-initialize, then wipe all state
to make sure the right thing happens.
Don't keep open journal files -- close them after every update.
A bit less efficient, but possibly more reliable (again, this is
defensive programming here). Also change "rwd" to "rws" mode
for fully synchronous operation.
Merge commit '609c2c08d7d059681434ea322b551264abab8a71' into eclair-plus-aosp
* commit '609c2c08d7d059681434ea322b551264abab8a71':
- make SyncManager get the accounts list during the constructor,
* changes:
- make SyncManager get the accounts list during the constructor, which will allow syncs to be scheduled during bootup. The providers need this so that they can potentially schedule syncs while they are starting up. - make the SyncManager message handler wait until boot has completed to start dispatching messages
which will allow syncs to be scheduled during bootup. The
providers need this so that they can potentially schedule
syncs while they are starting up.
- make the SyncManager message handler wait until boot
has completed to start dispatching messages
Merge commit 'a3431e4c7d6307b845d7008955d99425d842ff72' into eclair-plus-aosp
* commit 'a3431e4c7d6307b845d7008955d99425d842ff72':
Add a delay to wifi driver stop on screen off.
We already had a delay if we were associated, but we have some race conditions
we think will be masked if we delay the driver stop for the other cases
too. Don't wait as long (2 min instead of 15).
bug: 2147260
on success, record "backup_initialize" event; on failure,
record "backup_transport_failure" event (and add tags to
"backup_transport_failure" events that aren't associated
with a particular package -- namely "(initialize)" and
"(finish)").
Merge commit '072c9e7473f4ff1a1b08ec08a906cc8308ed1c91' into eclair-plus-aosp
* commit '072c9e7473f4ff1a1b08ec08a906cc8308ed1c91':
Add more useful-for-debug info to 'dumpsys backup'
Track requests independently with seperate timers. Clean up on expiration
by just stopping that particular request, not immediately restoring the default.
bug: 2127590