112407 Commits

Author SHA1 Message Date
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
Jim Miller
398d7f6186 Merge "Update navbar camera icon and widget background assets in keyguard." into klp-dev 2013-09-26 22:27:15 +00:00
Romain Guy
33ed738d49 Expose View.executeHardwareAction()
Bug #10911502

Views creating hardware resources need a way to safely interact
with the hardware. This new method invokes HardwareRenderer.safelyRun()
which executes a Runnable after making sure the hardawre rendering
context is in a valid state.

With the OpenGL backend, executeHardwareAction() tries to call
eglMakeCurrent() if needed. This method is not guaranteed to
work.

Change-Id: I38ec65132eeba85605cffb1a6de12b7a0184e213
2013-09-26 22:01:01 +00:00
Craig Mautner
c449613ec6 Merge "Revert behavior to perform onResume." into klp-dev 2013-09-26 21:43:24 +00:00
Victoria Lease
a4eb894a55 Merge "clarify Paint flag docs" into klp-dev 2013-09-26 21:40:55 +00:00
Craig Mautner
5314a40b96 Revert behavior to perform onResume.
Back out changes from CLs ag/363992 and ag/363859. These introduced
the bugs found in bug 10917435 which is now fixed. Note that backing
out these changes reintroduces bug 10732489.

Change-Id: Ic5105dd4cfc8bf79c6f06188283d1ee3680c370c
2013-09-26 14:24:02 -07:00
Christopher Tate
4e9c7d8ba3 Merge "Sigh." into klp-dev 2013-09-26 21:10:39 +00:00
Svetoslav Ganov
c6afd813ac Merge "PackageManager#queryIntentServices breaks its contract." into klp-dev 2013-09-26 21:10:19 +00:00
Svetoslav Ganov
2c854022bf Merge "Choosing default paper size for the "Save to PDF" fake printer" into klp-dev 2013-09-26 21:09:25 +00:00
Amith Yamasani
d2534f8c05 Merge "Don't remove restrictions files that are valid" into klp-dev 2013-09-26 21:02:10 +00:00
Svetoslav Ganov
0ce3e8743c Choosing default paper size for the "Save to PDF" fake printer
Change-Id: I1e2eb73fd1eb3b1e9812155b69b94cba261243c2
2013-09-26 13:54:49 -07:00
Victoria Lease
8dc7d5ea26 clarify Paint flag docs
Bug: 10460797
Change-Id: Iae622b302cad3dc788f512b472e3a59ec227a8d7
2013-09-26 13:40:47 -07:00
Jeff Sharkey
8c6c04197e Merge "Tighten flags enforcement, API to test Uris." into klp-dev 2013-09-26 20:33:29 +00:00
Zhijun He
8f4e289f8c Merge "Camera2: Fix focusRange type" into klp-dev 2013-09-26 20:28:19 +00:00
Christopher Tate
ae269d5727 Sigh.
Bug 10746233

Change-Id: I18c84f2bd53a511fc86be42b5d72062650e5b289
2013-09-26 13:23:43 -07:00
Amith Yamasani
fc95e70abd Don't remove restrictions files that are valid
This fixes a bug in parsing the package name from a file name. The suffix
was not taken into account, resulting in all restrictions files being
removed on switching to a user.

Bug: 10947554
Change-Id: I62725bbbdc0e15609872de3896130d4acbc35386
2013-09-26 13:20:17 -07:00
Jeff Sharkey
ee2f7df9ee Tighten flags enforcement, API to test Uris.
Check and throw if callers request invalid grant flags.  Add API to
test if a Uri is backend by a DocumentsProvider.

Bug: 10919391, 10935608
Change-Id: Ifa6afefb95983558c8c64dc15ddf650e9fe07080
2013-09-26 13:14:45 -07:00
John Spurlock
91949b20c9 Merge "New battery meter view bolt shape + color." into klp-dev 2013-09-26 20:10:20 +00:00
Vineeta Srivastava
aeaecaccca Merge "telephony: Set roam though same named operator" into klp-dev 2013-09-26 19:59:20 +00:00
Marco Nelissen
2c70299029 Merge "Fix logic in fallback ringtone handling" into klp-dev 2013-09-26 19:56:13 +00:00
Sungmin Choi
3cf4dbaba7 telephony: Set roam though same named operator
Show roaming icon though same named operators.
Though same mcc and same operator name, some operator want to roam.
For example, users of 40485 should see the roaming icon as using 40483
network though same Reliance network.
To do this, add 40483 item to values-mcc404-mnc85/config.xml

Bug: 10699045, 10703022
Change-Id: Ife1024ef10a29e43e32040800b25feca9f51fb62

Conflicts:
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml
2013-09-26 12:53:48 -07:00
Scott Main
9f54a5834a am 6d49f698: am ce57e1a6: am 4c9ed63c: update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
* commit '6d49f6980bff8c4ec15db169128b439c0b732ac5':
  update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
2013-09-26 12:51:09 -07:00
Scott Main
6d49f6980b am ce57e1a6: am 4c9ed63c: update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
* commit 'ce57e1a6f373c4f1c39b048adc1f2bbe6232be0e':
  update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
2013-09-26 12:48:04 -07:00
Scott Main
ce57e1a6f3 am 4c9ed63c: update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
* commit '4c9ed63cc66c5558e3b0330b17df92e99290eaf7':
  update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
2013-09-26 12:45:22 -07:00
Marco Nelissen
19a4671b10 Fix logic in fallback ringtone handling
The existing code would only play a fallback ringtone if the requested
ringtone was one of the three ringtone uris that are defined by settings,
and it wasn't set to "silent".
Now it also plays the fallback for custom ringtone uris.

b/10891718

Change-Id: I79c2298c6497165e6845b98532cce0855347e50b
2013-09-26 12:44:55 -07:00
Scott Main
fc8a982e55 am 95fdf3d9: am a37c524f: am 54f8facf: update action bar icon pack with xxhdpi assets bug: 9761668
* commit '95fdf3d91fc49956daea8cdaf30f7a578fdbeb8b':
  update action bar icon pack with xxhdpi assets bug: 9761668
2013-09-26 12:42:26 -07:00
John Spurlock
e54eb7f944 Merge "Add RTL versions of wimax status bar icons." into klp-dev 2013-09-26 19:41:56 +00:00
Scott Main
95fdf3d91f am a37c524f: am 54f8facf: update action bar icon pack with xxhdpi assets bug: 9761668
* commit 'a37c524ffc4a0387fac79e8ad4ab6319eeb99fa8':
  update action bar icon pack with xxhdpi assets bug: 9761668
2013-09-26 12:40:29 -07:00
Scott Main
4c9ed63cc6 update the nav drawer lesson to link to new action bar icon pack,
which now includes the nav drawer icon

Change-Id: I0d6452fa5b4856b96268763141d74dd8f83c221d
2013-09-26 12:39:27 -07:00
Scott Main
a37c524ffc am 54f8facf: update action bar icon pack with xxhdpi assets bug: 9761668
* commit '54f8facfc8d103e6dd7211bbabfe36d083798731':
  update action bar icon pack with xxhdpi assets bug: 9761668
2013-09-26 12:37:44 -07:00
John Spurlock
9e6f69123c Add RTL versions of wimax status bar icons.
Bug:7968781
Change-Id: I9f03d92f7682416ad4b99ecfb18317842b85163d
2013-09-26 15:36:31 -04:00
Svetoslav Ganov
cb247866ac PackageManager#queryIntentServices breaks its contract.
PackageManager#queryIntentServices javadoc contract states that this
method (and the like) never returns null, rather an empty list if
no result is found. However, there is a path in the PackageManagerService
that returns null, thus breaking the contract. Handling the null list
explicitly.

bug:10930560

Change-Id: I708c51b8b7075e529145c8b0bf159efd6b697532
2013-09-26 12:34:49 -07:00
Scott Main
54f8facfc8 update action bar icon pack with xxhdpi assets
bug: 9761668

Change-Id: Ib76dec4f90052c803c224f6489876644ee2f44ab
2013-09-26 12:30:30 -07:00
Svetoslav Ganov
5cab967bf2 Merge "Adding hidden APIs for observing the print jobs state." into klp-dev 2013-09-26 19:22:20 +00:00
Svetoslav Ganov
3adc49c678 Merge "Disallow range selection if the document has unknown page count." into klp-dev 2013-09-26 19:21:06 +00:00
Svetoslav Ganov
c9cfd605a2 Merge "Missed signal in FusedPrintersLoader." into klp-dev 2013-09-26 19:20:28 +00:00
Svetoslav Ganov
027ff3855d Merge "Page range validation edge case handling." into klp-dev 2013-09-26 19:19:39 +00:00
Martijn Coenen
1de64c0aa5 Merge "Fix crash in ApduServiceInfo parsing." into klp-dev 2013-09-26 18:48:20 +00:00
Martijn Coenen
eed43391c6 Fix crash in ApduServiceInfo parsing.
Bug: 10949100
Change-Id: I181734074b071179ea5637a070714643508bc64b
2013-09-26 11:20:37 -07:00
Jeff Sharkey
ef2241563f Merge "Update external storage permission strings." into klp-dev 2013-09-26 18:16:50 +00:00
Adam Koch
10fe85739f am f0b67e1f: am cf5a962b: am e405da02: Doc fix: remove insecure sharing suggestions from training class Bug: 10841151
* commit 'f0b67e1f30a8d2825cc99004c1c9141bb866b719':
  Doc fix: remove insecure sharing suggestions from training class Bug: 10841151
2013-09-26 11:12:24 -07:00
Adam Koch
f0b67e1f30 am cf5a962b: am e405da02: Doc fix: remove insecure sharing suggestions from training class Bug: 10841151
* commit 'cf5a962b05aabcdd2c7a25081772af2e7f2a62d5':
  Doc fix: remove insecure sharing suggestions from training class Bug: 10841151
2013-09-26 11:10:34 -07:00
Adam Koch
cf5a962b05 am e405da02: Doc fix: remove insecure sharing suggestions from training class Bug: 10841151
* commit 'e405da02208145d2ea8de0759c0f0027d4560840':
  Doc fix: remove insecure sharing suggestions from training class Bug: 10841151
2013-09-26 11:06:17 -07:00
Jeff Sharkey
6e85d24210 Update external storage permission strings.
Bug: 10681853
Change-Id: I92ee1a349b1dd5fcd08d1e7cb936a77774d72da6
2013-09-26 11:01:56 -07:00
Jeff Sharkey
bb77d99c25 Merge "Directories are always enabled; update assets." into klp-dev 2013-09-26 17:58:41 +00:00
Adam Koch
e405da0220 Doc fix: remove insecure sharing suggestions from training class
Bug: 10841151

Change-Id: I11de149d512340d098a8c23661cd6f6a342718d5
2013-09-26 17:54:46 +00:00
Jeff Sharkey
2a030b05a9 Directories are always enabled; update assets.
Fix bug where item enabled state depended on FLAG_SUPPORTS_WRITE;
directories are now always enabled.  Also unifies enabled testing.

Bug: 10903210, 10946731
Change-Id: I241533d273dfe4a2146bb322a8bd93066bf4ef55
2013-09-26 10:54:19 -07:00
Zhijun He
c59b078acb Camera2: Fix focusRange type
It should be a pair of floats.

Bug: 10360518
Change-Id: Ic0aee6c08eee385ecbf634bafc769e08dc199c1f
2013-09-26 10:39:36 -07:00
Adam Lesinski
bde988ade5 Merge "Add Graphics alloc tracking via memtrack" into klp-dev 2013-09-26 17:22:31 +00:00
Winson Chung
8fe3097c87 Merge "Add QuickSettings all-caps override for certain locales. (Bug 10518893)" into klp-dev 2013-09-26 17:17:18 +00:00