Commit Graph

31893 Commits

Author SHA1 Message Date
Romain Guy
bb1d4d3896 am d6c1870d: am 5fceada3: Merge "Fragement, or Fragment: that is the question"
* commit 'd6c1870d434562a10e015915dd9da9f8a956661c':
  Fragement, or Fragment: that is the question
2013-09-30 16:23:05 -07:00
Romain Guy
d6c1870d43 am 5fceada3: Merge "Fragement, or Fragment: that is the question"
* commit '5fceada31f0dc8f8e003e9c1d0a0ed0363711343':
  Fragement, or Fragment: that is the question
2013-09-30 16:19:22 -07:00
Cyril Mottier
2de5082f43 Fragement, or Fragment: that is the question
Change-Id: Iac3a14b9d2d7b4bd1e452db987b3c5c95dbefd3b
2013-09-30 22:43:59 +02:00
Nick Kralevich
19db889424 am 19f9f445: am 7a56d949: Merge "Fix SELinux.java doc errors"
* commit '19f9f445bfe368f801f893aad6dbd372562746ac':
  Fix SELinux.java doc errors
2013-09-27 09:37:56 -07:00
Nick Kralevich
19f9f445bf am 7a56d949: Merge "Fix SELinux.java doc errors"
* commit '7a56d949ef524d00e4091827104ac2450e4ec9db':
  Fix SELinux.java doc errors
2013-09-27 09:35:01 -07:00
Nick Kralevich
7a56d949ef Merge "Fix SELinux.java doc errors" 2013-09-27 16:32:57 +00:00
Jeff Sharkey
66ee877f5d am 8c6c0419: Merge "Tighten flags enforcement, API to test Uris." into klp-dev
* commit '8c6c04197e58be6f3e46ba6a38f5d16e4fb091fa':
  Tighten flags enforcement, API to test Uris.
2013-09-26 13:37:21 -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
db2aacfb7b am 8f4e289f: Merge "Camera2: Fix focusRange type" into klp-dev
* commit '8f4e289f8c1f4743a459b232b9e5ac9d58095139':
  Camera2: Fix focusRange type
2013-09-26 13:30:23 -07:00
Zhijun He
8f4e289f8c Merge "Camera2: Fix focusRange type" into klp-dev 2013-09-26 20:28:19 +00: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
Svetoslav Ganov
4609d9a9eb am 5cab967b: Merge "Adding hidden APIs for observing the print jobs state." into klp-dev
* commit '5cab967bf2bab49777bfa86dff8b0f892192ede6':
  Adding hidden APIs for observing the print jobs state.
2013-09-26 12:25:10 -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
Martijn Coenen
f12e49f32e am 1de64c0a: Merge "Fix crash in ApduServiceInfo parsing." into klp-dev
* commit '1de64c0aa55f74f5b2692dcac3b3350dacda4041':
  Fix crash in ApduServiceInfo parsing.
2013-09-26 11:52:28 -07: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
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
7979e170b5 am bde988ad: Merge "Add Graphics alloc tracking via memtrack" into klp-dev
* commit 'bde988ade5f75c3d241422dce2ee4124871fab53':
  Add Graphics alloc tracking via memtrack
2013-09-26 10:27:55 -07:00
Adam Lesinski
bde988ade5 Merge "Add Graphics alloc tracking via memtrack" into klp-dev 2013-09-26 17:22:31 +00:00
Dianne Hackborn
63cff11b8a am c222f57b: Merge "Fix issue #10919261: Don\'t clear OP_WRITE_SMS when resetting app prefs" into klp-dev
* commit 'c222f57b5c992fb661b7112a7cd5e5dbe1c6030c':
  Fix issue #10919261: Don't clear OP_WRITE_SMS when resetting app prefs
2013-09-26 09:45:10 -07:00
Dianne Hackborn
c222f57b5c Merge "Fix issue #10919261: Don't clear OP_WRITE_SMS when resetting app prefs" into klp-dev 2013-09-26 16:41:14 +00:00
Dianne Hackborn
8828d3a153 Fix issue #10919261: Don't clear OP_WRITE_SMS when resetting app prefs
Add a new array indicating whether each op allows itself to
be reset, and use it.

Change-Id: I494f630bda170e061196a380563512e9e77b51a8
2013-09-26 09:40:19 -07:00
Svetoslav Ganov
704697b619 Adding hidden APIs for observing the print jobs state.
This is needed for implementing the print job settigns UI.

bug:10935736

Change-Id: I63b42cbf4ce6a259fa1af47fa368b148ca5621c1
2013-09-25 17:57:07 -07:00
Zhijun He
fbf3801637 am 822ac0ba: Merge "Camera2: Implement CameraManager#getCameraCharacteristics" into klp-dev
* commit '822ac0bada06b2185b4d5e8304160b680a72cff2':
  Camera2: Implement CameraManager#getCameraCharacteristics
2013-09-25 17:00:05 -07:00
Zhijun He
822ac0bada Merge "Camera2: Implement CameraManager#getCameraCharacteristics" into klp-dev 2013-09-25 23:57:24 +00:00
Dianne Hackborn
f9ad7b9d92 am 66a9b2d7: Merge "Fix issue #10903002: com.facebook.katana keeps itself in A Services" into klp-dev
* commit '66a9b2d7392a7f6334b5fe23d00ba718f3fa1851':
  Fix issue #10903002: com.facebook.katana keeps itself in A Services
2013-09-25 16:09:13 -07:00
Jeff Sharkey
687c6221c8 am be17a614: Merge "Require that persistable Uri permissions be taken." into klp-dev
* commit 'be17a61447e1a7992a6c855059a3c43ab3216610':
  Require that persistable Uri permissions be taken.
2013-09-25 16:05:36 -07:00
Dianne Hackborn
66a9b2d739 Merge "Fix issue #10903002: com.facebook.katana keeps itself in A Services" into klp-dev 2013-09-25 23:04:50 +00:00
Dianne Hackborn
cbd9a52f25 Fix issue #10903002: com.facebook.katana keeps itself in A Services
Now when memory low, if a service's process is above
a selected pss, then the process is not allowed to go
in to the service a list.

Also simplified the normal meminfo details dump to not
include the shared dirty and shared clean sizes by
default, since these can be very confusing.  You will
still get to see them with the "-a" flag.

Finally some small steps to better managing service
processes in the LRU list, so hopefully we can some
day be better about letting them drop down in the list
when there isn't really much interesting happening in
the process.  Not yet used at this point.

Change-Id: I654bfd6d05de2a63120185ebb15ffda8cbeb5dac
2013-09-25 15:45:56 -07:00
Jeff Sharkey
e66c1778f8 Require that persistable Uri permissions be taken.
Change our Intent flag to indicate that a Uri permission grant is
persistable, but don't actually persist it until explicitly taken by
the receiving app.  This prevents apps from spamming each other if
persisted permissions aren't really required.

Remember the last time a persisted grant was taken by an app, and
use this to prune away the oldest grants when the number of grants
grows too large.  Allow apps to query persisted grants they are
holding, and allow them to release previously persisted grants. Add
public UriPermission class to return grant details and timestamp.

Track various permission strengths separately, and combine together
after each mutation pass.  Persistable grants are currently treated
like global grants, but they could be moved to have owners in the
future.  Require that grant holders trying to extend a persistable
permission actually hold a persistable permission themselves.

Bug: 10835779
Change-Id: I95b2f797c04ce7fd2612f9a644685dbd44e03759
2013-09-25 15:16:41 -07:00
Adam Lesinski
5b4ef81f2b Add Graphics alloc tracking via memtrack
Any OpenGL memory reported by /proc/pid/smaps will not be included
in the GPU GL memory count and will be considered Unknown. This is
an artifact of how some memory reporting is done in libmemtrack
and some is done in this module.

bug:10294768

Change-Id: Id8fb63b2e86520f4dbc8410573a509e66b96b13b
2013-09-25 14:41:49 -07:00
Zhijun He
2001188be3 Camera2: Implement CameraManager#getCameraCharacteristics
Bug: 10904541
Bug: 10360518
Change-Id: I1da0b0319703fda46789f15a232e56ed1d928bc3
2013-09-25 13:54:25 -07:00
Eino-Ville Talvala
6934e994a0 am 9ca833f4: Merge "Camera2: Add PASSIVE_UNFOCUSED autofocus state." into klp-dev
* commit '9ca833f4a5eca732b1618bc1a183215c21ae11e5':
  Camera2: Add PASSIVE_UNFOCUSED autofocus state.
2013-09-25 12:32:53 -07:00
Eino-Ville Talvala
9ca833f4a5 Merge "Camera2: Add PASSIVE_UNFOCUSED autofocus state." into klp-dev 2013-09-25 19:28:03 +00:00
Dianne Hackborn
8715dc1401 am 4213e68f: am 3a7d5f71: Merge "Replace SEAndroid with SELinux."
* commit '4213e68f67d59c0912d2a8729fcec4539197756a':
  Replace SEAndroid with SELinux.
2013-09-25 11:45:38 -07:00
Dianne Hackborn
4213e68f67 am 3a7d5f71: Merge "Replace SEAndroid with SELinux."
* commit '3a7d5f71456b57f712b0f878beb5317f0ce6d564':
  Replace SEAndroid with SELinux.
2013-09-25 11:42:07 -07:00
Dianne Hackborn
3a7d5f7145 Merge "Replace SEAndroid with SELinux." 2013-09-25 18:39:58 +00:00
Jean Chalard
424054ba62 am 6a1e32ef: Merge "Don\'t change the text in reaction to a user dict add" into klp-dev
* commit '6a1e32efb686bd5606f62076c70f399ff3bdc37d':
  Don't change the text in reaction to a user dict add
2013-09-25 08:11:31 -07:00
Jean Chalard
6a1e32efb6 Merge "Don't change the text in reaction to a user dict add" into klp-dev 2013-09-25 07:50:15 +00:00
Elliott Hughes
e713f57a6e am d82b1c3b: am 9d8721f8: Merge "Remove dead code."
* commit 'd82b1c3bf2abbc1582c90362267650cf05d38cd5':
  Remove dead code.
2013-09-24 17:54:42 -07:00
Elliott Hughes
d82b1c3bf2 am 9d8721f8: Merge "Remove dead code."
* commit '9d8721f8abb018429e3dba2296bce789b776aa0c':
  Remove dead code.
2013-09-24 17:51:58 -07:00
Elliott Hughes
4b395a3625 Remove dead code.
This hasn't been used since at least 2011, and we're no longer
shipping the data supporting it either.

Change-Id: Ibe42057650b49794c65d6f0d54ed7a492f3b594b
2013-09-24 17:22:11 -07:00
Adam Powell
8dcc0e7dfb am 7ef9b612: Merge "Fix monkey bugs in ListView" into klp-dev
* commit '7ef9b612412a2169c8c0e0b3506b06516cb012b5':
  Fix monkey bugs in ListView
2013-09-24 15:40:44 -07:00
Adam Powell
7ef9b61241 Merge "Fix monkey bugs in ListView" into klp-dev 2013-09-24 22:38:37 +00:00
Adam Powell
31986b5b69 Fix monkey bugs in ListView
* Don't run item click listeners as part of touch mode reset if the
  ListView is being detached from its window. Some calling code makes
  assumptions around this.

* Remove redundant state tracking for window attachment from
  AbsListView now that we have View#isAttachedToWindow(). The timing
  of View's mechanism is closer to what we want here anyway -
  subclasses calling super.onDetachedFromWindow() as the first line of
  an overridden onDetachedFromWindow() method will see the window as
  being in a detached state while the rest of the method runs,
  resulting in the behavior described in the first bullet point above.

Bug 10834897

Change-Id: Ic9fdff3c5cfc4996361a7fb1a863547b4d1a2c9c
2013-09-24 15:20:07 -07:00
Dianne Hackborn
9b7d148466 am 5f86b90b: Merge "Fix issue #10848916: "Always" button is not working." into klp-dev
* commit '5f86b90b8a224e21db89bacf78d4bd4d3f44342d':
  Fix issue #10848916: "Always" button is not working.
2013-09-24 14:49:17 -07:00
Dianne Hackborn
5f86b90b8a Merge "Fix issue #10848916: "Always" button is not working." into klp-dev 2013-09-24 21:46:17 +00:00
Alan Viverette
4e10483de3 am 6bc7cacf: Merge "Fix NPE in PopupMenu.getDragToOpenListener()" into klp-dev
* commit '6bc7cacfc8c34512278460028b7f6f0a4be220b4':
  Fix NPE in PopupMenu.getDragToOpenListener()
2013-09-24 14:33:50 -07:00
Alan Viverette
6bc7cacfc8 Merge "Fix NPE in PopupMenu.getDragToOpenListener()" into klp-dev 2013-09-24 21:28:56 +00:00
Dianne Hackborn
6d8dfbd814 Fix issue #10848916: "Always" button is not working.
The problem was that the ResolverActivity filters some activities
out of the list it shows, but it uses that display list as the
list of components the preference is set against when ultimately
setting it on the package manager...  but that filtered list is *not*
the right component set, since it is not the same as the package
manager's view on it.

The fix here is to retain the original set of matching components
and use that when setting the preferred activity.  Note that this
does mean that in very unusual cases where filtering is happeing
(such as one of the activities not being exported but being seen
as a possible completion from another app), then you will be setting
the preference for the complete set.  Ultimately we probably need
to have the package manager apply these filtering rules up-front so
this is all consistent, but this is a very rare case so not that
important.

And then most of the change here is just improving the debug
output for intent resolution.

Change-Id: Ie35ac2c05a45946439951bbf41433c8b7de79c05
2013-09-24 14:16:38 -07:00