102408 Commits

Author SHA1 Message Date
Elliott Hughes
3ae3048377 am a19647d3: Merge "Correct executable bit for source files [Take 2]"
* commit 'a19647d3d81d3bdd15ad3bc8a2ece8e7bd1095fe':
  Correct executable bit for source files [Take 2]
2013-03-28 14:27:09 -07:00
Geremy Condra
f21a34bf1b am 2ff853da: Merge "Add data validation on seinfo labels."
* commit '2ff853daa89ca47491c3f7b096872a432d4a19e7':
  Add data validation on seinfo labels.
2013-03-28 14:27:06 -07:00
Kenny Root
02c86306d2 Merge "Add ability to install credentials as other UID" 2013-03-28 20:56:58 +00:00
Ying Wang
6a9d93ac47 Merge "Fix doc build." into jb-mr2-dev 2013-03-28 20:52:43 +00:00
Ying Wang
b162617143 Fix doc build.
Change-Id: I479df06f2aed33bf29bb8d90be2339a80248beaa
2013-03-28 13:50:40 -07:00
Elliott Hughes
a19647d3d8 Merge "Correct executable bit for source files [Take 2]" 2013-03-28 20:50:34 +00:00
Jatin Lodhia
3df7d697ca AccountManager changes for profile seeding.
Add a new error code to AccountManager and remove the check for
limited user during add account to allow Authenticators to seed
account during limited profile startup.

Change-Id: I5a73def9fc3baeb8e6de1b42e923829c335e1668
2013-03-28 13:46:58 -07:00
Chris Craik
dc1975ea71 Merge "Fix issues related to saveLayer/restore deferral" into jb-mr2-dev 2013-03-28 20:46:47 +00:00
Amith Yamasani
e494a81f9b Merge "Restricted account visibility" into jb-mr2-dev 2013-03-28 20:31:44 +00:00
Geremy Condra
2ff853daa8 Merge "Add data validation on seinfo labels." 2013-03-28 20:30:36 +00:00
Romain Guy
696dcf84a3 Update layers to clear them
Bug #8489505

A layer should be updated even with an empty deferred display list. It is
possible for a layer to request an update just to execute a clear which
will be handled by LayerRenderer::prepareDirty().

Change-Id: Iffb98bd71d6caa8d4a701df98197676f9423c0c2
2013-03-28 13:06:58 -07:00
Ben Cheng
3eba5ad1e2 Merge "Crank up the mOomMinFreeHigh values by 50%." into jb-mr2-dev 2013-03-28 19:59:55 +00:00
Craig Mautner
54241a31e9 Merge "Add flag to method's javadoc." into jb-mr2-dev 2013-03-28 19:41:19 +00:00
Maggie Benthall
c92342bb01 Merge "Add user restrictions for bluetooth, sideloading, usb file transfer" into jb-mr2-dev 2013-03-28 19:15:46 +00:00
Craig Mautner
ecbfe253fb Add flag to method's javadoc.
MOVE_TASK_NO_USER_ACTION was feeling neglected.

Change-Id: I1b8281878e99755ad9960904ba71b83ba3f05620
2013-03-28 11:58:25 -07:00
Jeff Brown
1263deb936 Merge "Allow system server to bind to USB devices." into jb-mr2-dev 2013-03-28 18:55:10 +00:00
Jeff Brown
0aba3b18a8 Merge "Support specifying buffer start offset for USB requests." into jb-mr2-dev 2013-03-28 18:53:33 +00:00
Romain Guy
58f7689ac6 Merge "Don't crash when making a layer larger than supported dimensions Bug #8437401" into jb-mr2-dev 2013-03-28 18:50:53 +00:00
Chris Craik
7273daace9 Fix issues related to saveLayer/restore deferral
bug:8464795

Changes drawModifiers and alpha to be restored for all operations,
since saveLayer/restore use these values, not just draw operations

Also forces a renderer state restoration before a deferred restore op
is played back, in case it is associated with a saveLayer that
doesn't have the save_clip flag set

Change-Id: I9da5d44fefbfffdee164c98f4f139843dacf85df
2013-03-28 11:33:13 -07:00
Romain Guy
ce4a7dfc51 Don't crash when making a layer larger than supported dimensions
Bug #8437401

A misplaced ref count decrement was causing a crash when attempting to
resize a layer to dimensions larger than the max texture size supported
by the GPU.

This change fixes the crash and clarifies the warnings to make it more
obvious what's happening.

Change-Id: I632dc1b90aaa2605969e10523491a81c4922d3dc
2013-03-28 11:32:33 -07:00
Kenny Root
3e7be43e25 Add ability to install credentials as other UID
We need the ability to install from the system UID to wifi UID
to explicitly bind WiFi credentials to the WiFi profile. This adds the
ability for Wifi Settings to invoke installation of a PKCS12 file for
the wifi UID.

Bug: 8183258
Change-Id: I652b7e6fa93deda6d6d310be33f224e5a356c787
2013-03-28 11:30:11 -07:00
Irfan Sheriff
ce449d9ee5 Merge "Add support for setMiracastMode" into jb-mr2-dev 2013-03-28 17:29:14 +00:00
Irfan Sheriff
8b485adffd Add support for setMiracastMode
Usage is setMiracastMode(WifiP2pManager.MIRACAST_SOURCE) or
setMiracastMode(WifiP2pManager.MIRACAST_SINK) as an example.
Only available for internal use and can be called as long as
driver is active. P2p connection is not needed for it to be
called

Bug: 8493089
Change-Id: I1f87eaf3311212aae980077de26c05651a8cc811
2013-03-28 10:27:17 -07:00
Robert Greenwalt
5acc8632a7 Merge "Add BT - DataTracker connection" into jb-mr2-dev 2013-03-28 16:45:33 +00:00
Robert Craig
d417ab0ea5 Add data validation on seinfo labels.
Ensure that policy contains a clean seinfo
string. Where clean means no whitespace characters.

Change-Id: I814411cbc8d16eaed99a1389f5487529e36e617b
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2013-03-28 12:19:27 -04:00
Wink Saville
224100f705 Merge "Cleanup some debug in LinkCapabilities and Properties." into jb-mr2-dev 2013-03-28 16:09:26 +00:00
Jeff Brown
e8eea12a24 Allow system server to bind to USB devices.
Change-Id: I31f9ed1ff3fcda53f62f08ae198d18d0df3321b7
2013-03-28 03:15:40 -07:00
Jeff Brown
6c81a93ef3 Support specifying buffer start offset for USB requests.
Deprecated existing API which only supported passing buffer
and length in favor of a new one that also supports passing
the start.

Being able to pass a start index is very important because
the kernel imposes size limits on how much data can be transferred
at a time so we often need to transmit large buffers in chunks.

Change-Id: I3484b5e68f1ece61d4645ea04be8ee6a3b79169d
2013-03-28 03:13:09 -07:00
Lorenzo Colitti
d2ef1e50c4 Stop clat if it's no longer in use.
Normally, clatd is stopped when a connection disconnects.
However, if the connection's LinkProperties change, or if the
disconnect somehow gets lost (e.g., because of bug 8486114),
then we need to stop it (and possibly restart it).

Bug: 8276725
Change-Id: Ib8ad0d653ed8d0cd70b7414bcaa8fdaef8ba5fcc
2013-03-28 14:45:36 +09:00
kmccormick
7e81e223f5 am 9773b6e9: am f508cb7b: am 571c01b4: am a8115d06: am f65b5d08: Merge "Doc update: typo" into jb-mr1.1-docs
* commit '9773b6e9aeb27dc0164c57e8b38673834a9474bb':
  Doc update: typo
2013-03-27 19:26:53 -07:00
kmccormick
61c213ad54 am fcc42da4: am 7aec7790: am 061d4a95: am 3af7b848: am 821d4943: Merge "Doc update: use parse, not new" into jb-mr1.1-docs
* commit 'fcc42da4d9e3dc6dfd98b374a03eda051a869a74':
  Doc update: use parse, not new
2013-03-27 19:26:50 -07:00
kmccormick
9773b6e9ae am f508cb7b: am 571c01b4: am a8115d06: am f65b5d08: Merge "Doc update: typo" into jb-mr1.1-docs
* commit 'f508cb7bdb6a994e241711f91763ac8951311e2b':
  Doc update: typo
2013-03-27 19:24:43 -07:00
kmccormick
24b8947f62 resolved conflicts for merge of 603f987f to jb-mr2-dev
Change-Id: I4a130dad9d4669799f5d477f67e0f9a6a04381ca
2013-03-27 19:23:51 -07:00
kmccormick
f508cb7bdb am 571c01b4: am a8115d06: am f65b5d08: Merge "Doc update: typo" into jb-mr1.1-docs
* commit '571c01b494be76af9291b87c09f43a0fb30b3edb':
  Doc update: typo
2013-03-27 19:22:18 -07:00
kmccormick
571c01b494 am a8115d06: am f65b5d08: Merge "Doc update: typo" into jb-mr1.1-docs
* commit 'a8115d06afa29146edcab5f1edca83d2c7a89f2d':
  Doc update: typo
2013-03-27 19:20:34 -07:00
kmccormick
a8115d06af am f65b5d08: Merge "Doc update: typo" into jb-mr1.1-docs
* commit 'f65b5d085bc62382eba530179a24a1cf1a7d353d':
  Doc update: typo
2013-03-27 19:18:43 -07:00
kmccormick
f65b5d085b Merge "Doc update: typo" into jb-mr1.1-docs 2013-03-28 02:16:05 +00:00
kmccormick
fcc42da4d9 am 7aec7790: am 061d4a95: am 3af7b848: am 821d4943: Merge "Doc update: use parse, not new" into jb-mr1.1-docs
* commit '7aec77901b92423b835a87be88fbbf3bc5ff0c91':
  Doc update: use parse, not new
2013-03-27 19:03:12 -07:00
kmccormick
7aec77901b am 061d4a95: am 3af7b848: am 821d4943: Merge "Doc update: use parse, not new" into jb-mr1.1-docs
* commit '061d4a95cf924fcf113d11b2d4d001f696a65e1f':
  Doc update: use parse, not new
2013-03-27 19:00:48 -07:00
kmccormick
603f987f14 am 418172bf: am 19840a8d: am 65c66c74: am 6e6e861a: Merge "Doc change: Fix typo DONT_DELTE" into jb-mr1.1-docs
* commit '418172bf8823016785526b433801d44a4630f276':
  Doc change: Fix typo DONT_DELTE
2013-03-27 18:59:42 -07:00
kmccormick
061d4a95cf am 3af7b848: am 821d4943: Merge "Doc update: use parse, not new" into jb-mr1.1-docs
* commit '3af7b848143bef17230674bbed79ca77d3527e8e':
  Doc update: use parse, not new
2013-03-27 18:59:10 -07:00
kmccormick
1946eb0549 am d55e676a: am 7db86662: am 63dc67bd: am b1c453f2: am 353e7a2f: Merge "Doc Update: bug fix." into jb-mr1.1-docs
* commit 'd55e676a592442f034cfbd3a45e05ba2cbe8ff11':
  Doc Update: bug fix.
2013-03-27 18:58:05 -07:00
kmccormick
418172bf88 am 19840a8d: am 65c66c74: am 6e6e861a: Merge "Doc change: Fix typo DONT_DELTE" into jb-mr1.1-docs
* commit '19840a8d40139a12469ef92c3541f2a433d5ae85':
  Doc change: Fix typo DONT_DELTE
2013-03-27 18:57:27 -07:00
kmccormick
3af7b84814 am 821d4943: Merge "Doc update: use parse, not new" into jb-mr1.1-docs
* commit '821d4943702e49844629ae9b522383a21210a64f':
  Doc update: use parse, not new
2013-03-27 18:57:24 -07:00
Amith Yamasani
0ac1fc9d23 Restricted account visibility
When accounts are shared to a restricted/limited user, apps can
opt-in to viewing accounts of a certain type. Other shared accounts
are not visible to the app.

App would specify the account type in the manifest <application> tag
with the attribute restrictedAccountType="foo.bar", where "foo.bar"
is the account type as defined by the authenticator.

Change-Id: I7586da04d6d6d32aae15adc6b1366f325bb07384
2013-03-27 18:56:08 -07:00
kmccormick
d55e676a59 am 7db86662: am 63dc67bd: am b1c453f2: am 353e7a2f: Merge "Doc Update: bug fix." into jb-mr1.1-docs
* commit '7db866620491b3fa09dbcf2abe097bf33a73b034':
  Doc Update: bug fix.
2013-03-27 18:56:08 -07:00
kmccormick
19840a8d40 am 65c66c74: am 6e6e861a: Merge "Doc change: Fix typo DONT_DELTE" into jb-mr1.1-docs
* commit '65c66c74f4db7d16ccff1a67f416f74c716b3773':
  Doc change: Fix typo DONT_DELTE
2013-03-27 18:55:51 -07:00
kmccormick
7db8666204 am 63dc67bd: am b1c453f2: am 353e7a2f: Merge "Doc Update: bug fix." into jb-mr1.1-docs
* commit '63dc67bd6b026d3590af980b5dfddd4e68fd7831':
  Doc Update: bug fix.
2013-03-27 18:54:07 -07:00
kmccormick
65c66c74f4 am 6e6e861a: Merge "Doc change: Fix typo DONT_DELTE" into jb-mr1.1-docs
* commit '6e6e861a58da7bc39e1fbad9ed8730c712e45123':
  Doc change: Fix typo DONT_DELTE
2013-03-27 18:54:02 -07:00
kmccormick
821d494370 Merge "Doc update: use parse, not new" into jb-mr1.1-docs 2013-03-28 01:53:02 +00:00