Commit Graph

12630 Commits

Author SHA1 Message Date
Svetoslav Ganov
b3100e4e3d am bf4e8472: am fddc4bfe: am b1cd745f: Merge "Fail print jobs targeted to unavailable services." into klp-dev
* commit 'bf4e84724fbfaff8f2876af04e16f7047812f858':
  Fail print jobs targeted to unavailable services.
2013-10-02 09:43:47 -07:00
Craig Mautner
61f5d97984 am c5495c93: am eba784f0: am 3c98926b: Merge "Add a timeout for removing starting windows." into klp-dev
* commit 'c5495c93e51ba6493a6b99aaabd44abc9d25cd1e':
  Add a timeout for removing starting windows.
2013-10-02 09:43:32 -07:00
Jeff Sharkey
b6ab3b982b am 7f60e70e: am 666b998b: am 364fc14f: Merge "Detect wedged ContentProviders, treat as ANR." into klp-dev
* commit '7f60e70e815d381035b141843395830407c198d9':
  Detect wedged ContentProviders, treat as ANR.
2013-10-02 09:43:21 -07:00
Svetoslav Ganov
bf4e84724f am fddc4bfe: am b1cd745f: Merge "Fail print jobs targeted to unavailable services." into klp-dev
* commit 'fddc4bfed524df4f6245721c3ebc82ba2afbcf89':
  Fail print jobs targeted to unavailable services.
2013-10-02 09:36:13 -07:00
Craig Mautner
c5495c93e5 am eba784f0: am 3c98926b: Merge "Add a timeout for removing starting windows." into klp-dev
* commit 'eba784f0847a1d7c747603994d09937dcfdc0671':
  Add a timeout for removing starting windows.
2013-10-02 09:35:49 -07:00
Jeff Sharkey
7f60e70e81 am 666b998b: am 364fc14f: Merge "Detect wedged ContentProviders, treat as ANR." into klp-dev
* commit '666b998b67fe7bb6fc11dd6d683a18b5690afd39':
  Detect wedged ContentProviders, treat as ANR.
2013-10-02 09:35:14 -07:00
Matthew Williams
95906af264 Merge commit '0e0f6003' into manualmerge
Conflicts:
	services/java/com/android/server/content/SyncManager.java

Change-Id: If4c3275300892934e11faa7a624c1f2486a64c08
2013-10-01 20:54:01 -07:00
Craig Mautner
1cbb42dfea am 7d4e6365: am 312ab4bd: Merge "Don\'t display hidden activities over home screen." into klp-dev
* commit '7d4e6365fb87c198ca54fc1d8e979b67d578c28a':
  Don't display hidden activities over home screen.
2013-10-01 18:50:07 -07:00
Carlos Valdivia
3a748632e7 am d6957d5f: Merge "Prevent authenticators from using Settings to launch arbitrary activities." into klp-dev
* commit 'd6957d5f8ddf3b542996955bf2d6efe0e9804ef4':
  Prevent authenticators from using Settings to  launch arbitrary activities.
2013-10-01 18:45:47 -07:00
Dianne Hackborn
81f87faede am 57d96f0e: Merge "Fix issue #10948509: Crash in procstats when there is no data" into klp-dev
* commit '57d96f0e92e8af842878660a8271e65cec2426d3':
  Fix issue #10948509: Crash in procstats when there is no data
2013-10-01 18:45:11 -07:00
Craig Mautner
62de783230 am 564e8e6f: Merge "Ensure correct window ordering." into klp-dev
* commit '564e8e6f548951c9fe5825aaad327b9ffbeece82':
  Ensure correct window ordering.
2013-10-01 18:44:54 -07:00
Craig Mautner
d476b96d71 am 64ce6b78: Merge "Don\'t kill home process with the rest of its package." into klp-dev
* commit '64ce6b78ccb8522a6147843f4206a5b128571b03':
  Don't kill home process with the rest of its package.
2013-10-01 18:44:50 -07:00
Craig Mautner
1c3489ae4b am 5a0c54a5: Merge "Remove home package name methods." into klp-dev
* commit '5a0c54a5112612777becd7a0f12f74cf720c1b7f':
  Remove home package name methods.
2013-10-01 18:44:47 -07:00
Svetoslav
a4e395057f am c6568719: Merge "Ignore historical printer records for installed services" into klp-dev
* commit 'c6568719671206e726f260fad390680f7fb0ee9e':
  Ignore historical printer records for installed services
2013-10-01 18:44:25 -07:00
Alan Viverette
46bb58ca69 Fix monochromacy simulation
Change-Id: I1e42218abbb097fd657c200b37b10a734d0b86d4
2013-10-01 18:08:35 -07:00
Jim Miller
d273cae2c4 resolved conflicts for merge of fb2e3c8d to master
Change-Id: Ic9fe2674e0eb82d071f9b547b6089acacf705576
2013-10-01 15:42:45 -07:00
Svetoslav Ganov
b1cd745fd2 Merge "Fail print jobs targeted to unavailable services." into klp-dev 2013-10-01 21:30:53 +00:00
Craig Mautner
3c98926bf2 Merge "Add a timeout for removing starting windows." into klp-dev 2013-10-01 20:35:01 +00:00
Alan Viverette
18c631931b Merge "Add accessibility display adjustments" 2013-10-01 18:33:01 +00:00
Craig Mautner
68cc241e8d Add a timeout for removing starting windows.
If two activities are started at the same time the first activity can
add a starting window but never start. In that case there is no event
that will clear the starting window. This change adds a 10 second
timeout for the starting window to be cleared after which it will
clear the starting window automatically.

Fixes bug 10797865.

Change-Id: I1d59c3058c63367ff688d426474e8a6f006b2e0d
2013-10-01 10:39:43 -07:00
Jeff Sharkey
7aa7601c09 Detect wedged ContentProviders, treat as ANR.
All ContentProvider calls are currently blocking, making it hard for
an app to recover when a remote provider is wedged.  This change adds
hidden support to ContentProviderClient to timeout remote calls,
treating them as ANRs.  This behavior is disabled by default.

Update DocumentsUI to use a 20 second timeout whenever interacting
with a storage provider.

Bug: 10993301, 10819461, 10852518
Change-Id: I10fa3c425c6a7225fff9cb7a0a07659028230cd3
2013-10-01 09:50:41 -07:00
Svetoslav Ganov
db85ad56ad Fail print jobs targeted to unavailable services.
It is possible that a print job is scheduled for handling, i.e. it is
queued, after the target print service is uninstalled or disabled.
In case like this we fail the print job with an appropriate error
message. Now the user can cancel the job when he/she sees the notification
or the status in the print settings. Trying to restart such a job will
end up failing it again with the same error message. So the user will
just have to canel the print job.

This apporach quarantees that the user is informed for the failure and
also is much simpler than trying to update the UI when print job's
target serivce is uninstalled. For example, the settings UI has to
be updated as well as the notifications. Also due to the async nature
of the system this we cannot completely avoid having a restart option
for a print job whose target service is gone. This scenario is very
unlikely but still we have to handle it.

bug:11012251

Change-Id: Id8c8c3cff75e0b6325552676b130ff1406edc069
2013-10-01 07:49:06 -07:00
Chris Wren
0b664c3f83 Merge "add a test for BackupData helpers." 2013-10-01 13:57:20 +00:00
Matthew Williams
0e0f600379 am 508a57f5: Merge "Remove blocking from SM before boot completed." into klp-dev
* commit '508a57f58f873efcabc4d771b5f11285193685f6':
  Remove blocking from SM before boot completed.
2013-10-01 05:26:42 -07:00
Svetoslav Ganov
ce5cb02eca am b415525a: Merge "Print job files and print job records not always cleaned up." into klp-dev
* commit 'b415525a16074b6dc8e295655648b7c7c1074bbb':
  Print job files and print job records not always cleaned up.
2013-09-30 19:46:15 -07:00
Craig Mautner
8139911239 resolved conflicts for merge of 16e6e203 to master
Change-Id: Id71654464f7b271fdceea047b9549051135f8431
2013-09-30 19:41:20 -07:00
Craig Mautner
7d4e6365fb am 312ab4bd: Merge "Don\'t display hidden activities over home screen." into klp-dev
* commit '312ab4bd2928b152e1f7732a1699677b7df54b2f':
  Don't display hidden activities over home screen.
2013-09-30 17:32:19 -07:00
Carlos Valdivia
d8d900086a am d6957d5f: Merge "Prevent authenticators from using Settings to launch arbitrary activities." into klp-dev
* commit 'd6957d5f8ddf3b542996955bf2d6efe0e9804ef4':
  Prevent authenticators from using Settings to  launch arbitrary activities.
2013-09-30 17:11:14 -07:00
Dianne Hackborn
e2a67ac27b am 57d96f0e: Merge "Fix issue #10948509: Crash in procstats when there is no data" into klp-dev
* commit '57d96f0e92e8af842878660a8271e65cec2426d3':
  Fix issue #10948509: Crash in procstats when there is no data
2013-09-30 17:10:55 -07:00
Craig Mautner
92af22f0d0 am 564e8e6f: Merge "Ensure correct window ordering." into klp-dev
* commit '564e8e6f548951c9fe5825aaad327b9ffbeece82':
  Ensure correct window ordering.
2013-09-30 17:10:43 -07:00
Craig Mautner
5b291397e1 am 64ce6b78: Merge "Don\'t kill home process with the rest of its package." into klp-dev
* commit '64ce6b78ccb8522a6147843f4206a5b128571b03':
  Don't kill home process with the rest of its package.
2013-09-30 17:10:39 -07:00
Craig Mautner
75a3b301e9 am 5a0c54a5: Merge "Remove home package name methods." into klp-dev
* commit '5a0c54a5112612777becd7a0f12f74cf720c1b7f':
  Remove home package name methods.
2013-09-30 17:10:36 -07:00
Svetoslav
82d2d7e4b0 am c6568719: Merge "Ignore historical printer records for installed services" into klp-dev
* commit 'c6568719671206e726f260fad390680f7fb0ee9e':
  Ignore historical printer records for installed services
2013-09-30 17:10:21 -07:00
Jim Miller
a192253bf2 am fb2e3c8d: Merge "Fix permissions on WindowManagerService.showAssistant()" into klp-dev
* commit 'fb2e3c8d47c162166a029a97d68ad3bedff89cce':
  Fix permissions on WindowManagerService.showAssistant()
2013-09-30 17:10:11 -07:00
Svetoslav Ganov
b84aa9fee3 am b415525a: Merge "Print job files and print job records not always cleaned up." into klp-dev
* commit 'b415525a16074b6dc8e295655648b7c7c1074bbb':
  Print job files and print job records not always cleaned up.
2013-09-30 17:10:08 -07:00
Craig Mautner
98b96d2c42 am 16e6e203: Merge "Centralize handleAppDied and fix return to home." into klp-dev
* commit '16e6e203c0c86a1cbc1a7c1cf20cb5447f705a32':
  Centralize handleAppDied and fix return to home.
2013-09-30 17:10:02 -07:00
Craig Mautner
768836b116 am 231bd6c5: Merge "Dismiss keyguard when resuming visible activities" into klp-dev
* commit '231bd6c514f15cb0b42a04d4fc7fc9631c743686':
  Dismiss keyguard when resuming visible activities
2013-09-30 17:07:07 -07:00
Jason Monk
915015a797 am da51d36c: Merge "Fix Sending PAC Broadcast before downloaded" into klp-dev
* commit 'da51d36c74f62a1c50f3960919cb74c5da178cd2':
  Fix Sending PAC Broadcast before downloaded
2013-09-30 17:06:23 -07:00
Craig Mautner
5c60d6b657 am c449613e: Merge "Revert behavior to perform onResume." into klp-dev
* commit 'c449613ec6ffed7b4605a6708a3341ab2dd5320f':
  Revert behavior to perform onResume.
2013-09-30 16:42:11 -07:00
Alan Viverette
410d4e33c5 Add accessibility display adjustments
BUG: 9057596
Change-Id: I5e7cc05159387cb00701e162d015e2f7ca6cbf4c
2013-09-30 15:38:09 -07:00
Matthew Williams
508a57f58f Merge "Remove blocking from SM before boot completed." into klp-dev 2013-09-30 21:46:59 +00:00
Craig Mautner
aeccbf7720 am 231bd6c5: Merge "Dismiss keyguard when resuming visible activities" into klp-dev
* commit '231bd6c514f15cb0b42a04d4fc7fc9631c743686':
  Dismiss keyguard when resuming visible activities
2013-09-30 14:13:38 -07:00
Jason Monk
179254eb41 am da51d36c: Merge "Fix Sending PAC Broadcast before downloaded" into klp-dev
* commit 'da51d36c74f62a1c50f3960919cb74c5da178cd2':
  Fix Sending PAC Broadcast before downloaded
2013-09-30 14:12:37 -07:00
Craig Mautner
0c5fdaa79b am c449613e: Merge "Revert behavior to perform onResume." into klp-dev
* commit 'c449613ec6ffed7b4605a6708a3341ab2dd5320f':
  Revert behavior to perform onResume.
2013-09-30 14:11:41 -07:00
Matthew Williams
8704fc3dae Remove blocking from SM before boot completed.
Bug: 10916655
Add a stash where the SyncHandler can copy and place
msgs rather than run them. After boot is complete
we iterate through the stash in order and send the
messages off.

Change-Id: I9c175ee79fe60952346003a29225b8687979b44e
2013-09-30 11:20:53 -07:00
Craig Mautner
312ab4bd29 Merge "Don't display hidden activities over home screen." into klp-dev 2013-09-30 18:20:48 +00:00
Carlos Valdivia
d6957d5f8d Merge "Prevent authenticators from using Settings to launch arbitrary activities." into klp-dev 2013-09-30 17:35:45 +00:00
Craig Mautner
19d112d836 Don't display hidden activities over home screen.
Fixes jank exposed in 10881705. Specifically background activity
animating up along with translucent activity. Repro steps on manta:

1. From home start Settings.
2. Press home.
3. From home start Downloads (translucent activity that takes 85% of
screen).
4. Observe that as Downloads zooms up the 15% boundary that should be
dimly transparent are showing Settings.

The cause was that there is a finishing activity in the Downloads task
that was used to launch the DownloadsActivity. The existence of that
activity kept the logic from recognizing that the home activity was
behind the DownloadsActivity, not the Settings activity.

This fix descends through all of the activities in a task sitting on
home and makes sure that they only keep home from showing if such
activities are not finishing and visible.

Change-Id: I607afce6b0000b4db634f2ce40a6c37fcee369d7
2013-09-30 10:34:55 -07:00
Dianne Hackborn
57d96f0e92 Merge "Fix issue #10948509: Crash in procstats when there is no data" into klp-dev 2013-09-30 00:21:48 +00:00
Dianne Hackborn
cb4285537b Fix issue #10948509: Crash in procstats when there is no data
Not dealing with the case where there is a null list.

Also fixed some bugs I found while looking at this:

- When resetting the stats, we would use a newly computed time stamp
  for the total durations rather than the one we used to reset the
  proc/service entries.  This would result in them being able to be
  slightly > 100%.
- There was a bug in how we split a single process state into its
  per-package representation, where we would but the cloned process
  state into the new package's entry (instead of properly for its
  own package entry), to be immediately overwritten by the new
  process state we make for that package.  This could result in
  bad data for processes that have multiple packages.
- There was a bug in resetting service stats, where we wouldn't
  update the overall run timestamp, allowing that time to sometimes
  be > 100%.
- There was a bug in computing pss data for processes with multiple
  packages, where the pss data was not distributed across all of the
  activity per-package process states.
- There was a bug in computing the zram information that would cause
  it to compute the wrong value, and then never be displayed.

Finally a little code refactoring so that ProcessState and ServiceState
can now share a common implementation for the table of duration values.

Change-Id: I5e0f4e9107829b81f395dad9419c33257b4f8902
2013-09-29 17:14:15 -07:00