am: 65c3654b

Change-Id: I9bfc27bf2c0391d7d65740a6108cedaeb0be63f3

am: 5bb3c603

Change-Id: I7b2f66d4f8dc0416c7565f719c45329d321e7303

* changes:
  nonplat_property_contexts: use fc_sort vs sort
  plat_property_contexts: use fc_sort vs sort

am: ed144eba  -s ours

Change-Id: I09a7304634d826728133ba6a18e1859a4401074d

am: 7d1130f1  -s ours

Change-Id: I37cd37e3e4215fecb3aeb1957507f52b3d3e5448

(This reverts internal commit: 82ca9c2e)
Test: None.

Merged-in: I97ffdd48b64ef5c35267387079204512a093a356
Change-Id: I97ffdd48b64ef5c35267387079204512a093a356

am: 58983a3e

Change-Id: I89cdfa3148ff7ec2dd51d3103f9840b5eacd7f81

am: c975bd90

Change-Id: I576189108f7863076070734b958385d1cd545c5b

am: 852aca05

Change-Id: I7897c5211de238b497fabd1fa89da3c4fb38909c

am: 3e21c5f1

Change-Id: I970e7ef889ce0ad8376a1fd98fa92c2f5eb8b613

Used to display kernel version in settings app.

avc: denied { read } for name="version" dev="proc"
scontext=u:r:system_app:s0 tcontext=u:object_r:proc_version:s0
tclass=file permissive=0

Bug: 66985744
Test: kernel version now displayed in settings app.
Change-Id: I53f92f63362b900347fd393a40d70ccf5d220d30

(This reverts internal commit: 82ca9c2e)
Test: None.

Change-Id: I97ffdd48b64ef5c35267387079204512a093a356

sort respects locale settings, so the value of LC_ALL can affect
how sort orders things. This can cause labeling issues.

More information on locale and sort can be found via:
  * locale(1) - man 1 locale
  * sort(1) - man 1 sort
  * https://debbugs.gnu.org/cgi/bugreport.cgi?bug=28539



Rather than deal with this locale setting use fc_sort on
property contexts. This also has the side-effect of
stripping comments, and thus sed can be dropped.

Test: This was tested by:
  * comparing outputs to previous runs
  * compile tested *only*.

Change-Id: I1e1eb4dff76f717b5f82f697e677a108abb69892
Signed-off-by: William Roberts <william.c.roberts@intel.com>

sort respects locale settings, so the value of LC_ALL can affect
how sort orders things. Issues have surfaced when CTS build
servers locale differs from image build server locale. And thus
the prologue of property_contexts differs with what CTS was
expecting.

More information on locale and sort can be found via:
  * locale(1) - man 1 locale
  * sort(1) - man 1 sort
  * https://debbugs.gnu.org/cgi/bugreport.cgi?bug=28539



Rather than deal with this locale setting use fc_sort on
property contexts. This also has the side-effect of
stripping comments, and thus sed can be dropped.

Test: This was tested by:
  * comparing outputs to previous runs
  * booting the x86-64 emulator

Change-Id: I144ef549cc11d9c61849ffc0e1b1b000f1b8d1a8
Signed-off-by: William Roberts <william.c.roberts@intel.com>

This CL was accidentally reverted a second time by commit:
cb5129f9.  Submit it for the third,
and final, time.

(cherry-pick of 5637587d
which was in AOSP and internal master but not stage-aosp-master)

Bug: 62102757
Test: Builds and boots.
Change-Id: I0394907e808c737422e644aec452baa3e777cf6f

am: 2aa045f1

Change-Id: Id94738ab2036d39a7eefbf0679d68f1790437883

Also add missing commit: ca595e11

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I2a210c3b58565a40117bf3d061e9bf904ed687c2

Bug: 37916906
Test: Builds 'n' boots.
Change-Id: Ia1d86264446ebecc1ca79f32f11354921bc77668
Merged-In: I208ec6a864127a059fb389417a9c6b259d7474cb

am: f6081348

Change-Id: If4ce96dc67f8681379d6ab04340be32d64520504

am: 6922dfe3

Change-Id: I366e2005f554ad2b98aeff4a7c83521ad74d12bd

Fixes: 65263013
Test: build
Merged-In: I0ec412481c5990927fcbee7c4303bee2da876210
Change-Id: I0a5b9a80e988fcd16a29807ed83b2c65bba9000f

am: 16efc04d

Change-Id: I9615973f5b9eef7810c3cfb5469bd3ce8797c939

am: 4481b885

Change-Id: I3763d7f5ce22ff43e2adb8f7125e789f2c061e9e

Run-as is running a command under an app's uid and in its data
directory. That data directory may be accessed through a symlink
from /data/user. So give runas rights to read such a symlink.

Bug: 66292688
Test: manual
Test: CTS JVMTI tests
Change-Id: I0e0a40d11bc00d3ec1eee561b6223732a0d2eeb6

am: dfdb9628

Change-Id: I2abe6f86bbb099e044fa49074fa28260c3e5f8ba

am: 3b24ce50

Change-Id: Ibfe45f0105811e120f4e83a52f3ba8e4d6b2fb10

am: bbd7ddaf

Change-Id: I60b634911abc7598141cbe4a3cd913b6ba832b5c

am: 46f41134

Change-Id: Idfb71caeb839cce156bfa181fa53339e2e791e4b

The following commits were cherry-picked from internal master to AOSP,
but to avoid merge-conflicts we'll do a large diff instead of individual
cherry-picks:
521742e9
9aefc916
3686efca
de51e7de
fff3fe2f

Bug: 37916906
Test: angler builds and boots.
Merged-In: Ie010cc12ae866dbb97c387471f433158d3b699f3
Change-Id: I5126ebe88b9c76a74690ecf95851d389cfc22d1f

am: 3b8163bf

Change-Id: I7399449691e69bdb9ce5d5fd16aa6cb45fd7da9e

am: 76d77fd5

Change-Id: I87ce89ce4642116264624288bf367a9ec3087034

am: 29f2e953

Change-Id: Icdce6dc5026da58beee8f218008d09dd39878f39

am: b842836f

Change-Id: If6c0db7fb4838140347a68c39dec9f10b4c298d7

Bug: 65643247
Test: device boots without denials from bootanim to sysfs and cgroup.
Change-Id: Icf8c45906cb83e1b0a60737d67ae584b9d1b34aa

Bug: 65643247
Test: device boots without denials from rild to proc.
Change-Id: I142a228347ef07266cb612e99c90fb5ec187988a

am: 19a06cb0

Change-Id: I7b3098ef83b4aab591d94d68a38af20610b83820