Commit Graph

1229 Commits

Author SHA1 Message Date
Patrick Tjin
5090484fba Merge changes from topic 'elabel' into oc-dr1-dev
am: 8014ac1c9a

Change-Id: Id1431b3ef7d37ab6723253e2abb400981297798e
2017-07-07 15:51:50 +00:00
TreeHugger Robot
8014ac1c9a Merge changes from topic 'elabel' into oc-dr1-dev
* changes:
  Add copy from /persist/elabel to /data/misc/elabel
  Add permissions for elabel data access
2017-07-07 15:39:47 +00:00
Patrick Tjin
4402ccfb27 Add copy from /persist/elabel to /data/misc/elabel
Bug: 62837579
Test: place test files in /persist/elabel, check that they are copied to /data/misc/elabel on boot
Change-Id: Id29e7c7c01ed54bf4d2f488cfa6dba51046bc5bf
Merged-In: Id29e7c7c01ed54bf4d2f488cfa6dba51046bc5bf
2017-07-07 03:04:46 +00:00
Jeff Vander Stoep
0e1346c32c Add permissions for elabel data access
Allow init to copy elabel data from /persist/elabel to
/data/misc/elabel. Allow settings app to access elabel data
from /data/misc/elabel.

Bug: 62837579
Change-Id: Ie2241abe8c2384a537b001a90830a3f42c566748
Merged-In: Ie2241abe8c2384a537b001a90830a3f42c566748
2017-07-07 03:03:52 +00:00
Andrew Chant
9ad43f3801 Merge "Enable ramdump on debug.htc.ramdump.crash" into oc-dr1-dev
am: f00d7ba646

Change-Id: Idf06bb91a4d199180e97e71418d9a6560d1d20a2
2017-07-07 02:47:07 +00:00
TreeHugger Robot
f00d7ba646 Merge "Enable ramdump on debug.htc.ramdump.crash" into oc-dr1-dev 2017-07-07 02:39:23 +00:00
Keun-young Park
05de229991 Merge "add rmt_storage to "shutdown critical"" into oc-dr1-dev
am: 92f59e7bf0

Change-Id: I9a7c0c96129be726ea2858dab5f0a83d5a07c413
2017-07-07 02:32:21 +00:00
Siddharth Ray
07b52a0836 Merge "Wahoo sepolicy changes" into oc-dr1-dev
am: 271fd0c603

Change-Id: I517b359636cbffca257b848ca7f3cba1700d8b73
2017-07-07 02:32:09 +00:00
Ruchi Kandoi
4e04b9271e Merge "libnfc-brcm.conf changes for NCI2.0" into oc-dr1-dev
am: c0622b2134

Change-Id: I40bed9d9646b089881d6229d3be7db139c5b6a8f
2017-07-07 02:22:57 +00:00
TreeHugger Robot
92f59e7bf0 Merge "add rmt_storage to "shutdown critical"" into oc-dr1-dev 2017-07-07 02:11:43 +00:00
TreeHugger Robot
271fd0c603 Merge "Wahoo sepolicy changes" into oc-dr1-dev 2017-07-07 02:09:47 +00:00
Andrew Chant
dceb04a94f Enable ramdump on debug.htc.ramdump.crash
Enable ramdump on a live system by enabling the
property debug.htc.ramdump.crash.

This property is protected by selinux policy
with the label ramdump_prop.

Bug: 62437259
Test: forced ramdump from Ramdump Uploader app.
Change-Id: Ifa9b7cf22749c0686e7d01ca2a4fc10dbd4b729c
2017-07-06 17:43:43 -07:00
Keun-young Park
fca9e0cc79 add rmt_storage to "shutdown critical"
- should be kept to write modem data befure shutdown.

bug: 37626581
Test: build only

Change-Id: I8ce1c590a84fb0ad04a93c135c1b1f86bc59a69f
2017-07-06 22:58:41 +00:00
Wei Wang
640e5c108a Merge "init.hardware.rc: shutdown ssr_setup early to avoid subsystem restart" into oc-dr1-dev
am: ac6bf2845b

Change-Id: I5f81e9c3e60d5c8009c9332df4e8296d502a37a3
2017-07-06 22:49:04 +00:00
TreeHugger Robot
c0622b2134 Merge "libnfc-brcm.conf changes for NCI2.0" into oc-dr1-dev 2017-07-06 22:39:45 +00:00
Wei Wang
ac6bf2845b Merge "init.hardware.rc: shutdown ssr_setup early to avoid subsystem restart" into oc-dr1-dev 2017-07-06 22:36:46 +00:00
Siddharth Ray
078daa1c8b Wahoo sepolicy changes
Wahoo's sepolicy is changed merged to add Marlin permissions
based on compliance test needs. Marlin's sepolicy can be
found at device/google/marlin/sepolicy/hal_gnss_default.te

Bug: 37409476
Test: Boots with no avc denials or crashes. GNSS incl. post XTRA
delete runs well with no denials.

Change-Id: Id51197120d142850fe0d7c97f747818e23c178f8
2017-07-06 12:30:04 -07:00
Jayachandran C
68067a79df Merge changes I45a49628,Icf764bf3 into oc-dr1-dev
am: f5ed4d3d87

Change-Id: I2d937cf50f41962cf38d48f3f3af8a38e3119485
2017-07-06 16:22:48 +00:00
TreeHugger Robot
f5ed4d3d87 Merge changes I45a49628,Icf764bf3 into oc-dr1-dev
* changes:
  Fix netmgrd crash recovery denials
  sepolicy: Separate system partition sepolicy and hal macros from vendor partition
2017-07-06 16:11:19 +00:00
Android Build Merger (Role)
fb57056ad6 Merge "Merge "Device specific wakeup packet mark/mask" into oc-dr1-dev am: 7b9577e9b0" into oc-dr1-dev-plus-aosp 2017-07-06 16:10:52 +00:00
Android Build Merger (Role)
9475bbc377 Merge "Merge "Device specific wakeup packet mark/mask" into oc-dr1-dev am: 7b9577e9b0" into oc-dr1-dev-plus-aosp 2017-07-06 16:10:34 +00:00
Lorenzo Colitti
3c9cb0a27c Merge "Device specific wakeup packet mark/mask" into oc-dr1-dev
am: 7b9577e9b0

Change-Id: I341fe2636b91db3bf7e73b2ad65e151776837d86
2017-07-06 16:08:46 +00:00
Lorenzo Colitti
16b88b8be1 Merge "Device specific wakeup packet mark/mask" into oc-dr1-dev
am: 7b9577e9b0

Change-Id: If4ef2bcb73e35d855298ec0fc5ed1fab03595e9d
2017-07-06 16:08:30 +00:00
Android Build Merger (Role)
18b17baf7c Merge "Merge "sepolicy for mke2fs tools" into oc-dr1-dev am: e7d2b88004 -s ours" into oc-dr1-dev-plus-aosp 2017-07-06 16:07:54 +00:00
Jin Qian
64331b2993 Merge "sepolicy for mke2fs tools" into oc-dr1-dev
am: e7d2b88004  -s ours

Change-Id: I09d16ff93b0091e76d1419a22882de21a86f6f62
2017-07-06 16:06:18 +00:00
Jin Qian
69243ccd11 Merge "sepolicy for mke2fs tools" into oc-dr1-dev
am: e7d2b88004  -s ours

Change-Id: Ic34dafcbfd2453bb2211a140f72575f903c57b4e
2017-07-06 16:05:58 +00:00
Lorenzo Colitti
7b9577e9b0 Merge "Device specific wakeup packet mark/mask" into oc-dr1-dev 2017-07-06 15:19:11 +00:00
TreeHugger Robot
e7d2b88004 Merge "sepolicy for mke2fs tools" into oc-dr1-dev 2017-07-06 14:24:05 +00:00
Jayachandran C
06f2fdfb7e Fix netmgrd crash recovery denials
This change fixes the following denials

auditd  : type=1400 audit(0.0:30032): avc: denied { unlink } for
comm="netmgrd" name="netmgr_connect_socket" dev="tmpfs" ino=31621
scontext=u:r:netmgrd:s0 tcontext=u:object_r:netmgrd_socket:s0
tclass=sock_file permissive=0

auditd  : type=1400 audit(0.0:35887): avc: denied { search } for
comm="netmgrd" name="diagchar" dev="sysfs" ino=26926
scontext=u:r:netmgrd:s0 tcontext=u:object_r:sysfs_diag:s0 tclass=dir
permissive=0

Test: Force crashed netmgrd and validated data working

Bug: 63360347
Change-Id: I45a49628b486cb264e07037cfa8397e381f72a00
2017-07-05 18:52:15 -07:00
Jiyong Park
67a1351f79 Merge "vndk: add ro.vendor.vndk.version" into oc-dr1-dev
am: 4e86a6c446

Change-Id: Idfc61a5923b53245e68be58e9687d191616ea266
2017-07-05 23:26:04 +00:00
Sunmeet Gill
28511cb3df sepolicy: Separate system partition sepolicy and hal macros from vendor partition
Test: VoLTE, VT & VoWiFi on Vzw and T-Mobile SIM cards

Bug: 62574674

Change-Id: Icf764bf353bbdfb7831f5ea8528414a271525c63
2017-07-05 16:24:33 -07:00
TreeHugger Robot
4e86a6c446 Merge "vndk: add ro.vendor.vndk.version" into oc-dr1-dev 2017-07-05 23:21:19 +00:00
Android Build Merger (Role)
054d46d89d Merge "Merge "Disable snapshat timer" into oc-dr1-dev am: 555d3c7910" into oc-dr1-dev-plus-aosp 2017-07-05 20:16:21 +00:00
Jayachandran C
6a833ea97a Merge "Disable snapshat timer" into oc-dr1-dev
am: 555d3c7910

Change-Id: Iec6113d6f6ae3f1f3415607c68513211eb792ac3
2017-07-05 20:16:05 +00:00
Jayachandran C
76566ef57b Merge "Disable snapshat timer" into oc-dr1-dev
am: 555d3c7910

Change-Id: I6034dbe322ecf5ad31e3df20c55cf12c32070e2e
2017-07-05 20:15:53 +00:00
TreeHugger Robot
555d3c7910 Merge "Disable snapshat timer" into oc-dr1-dev 2017-07-05 20:12:36 +00:00
Logan Chien
b79fb529af Merge "Revert "Copy libz.so to vndk-sp"" into oc-dr1-dev
am: 7bfa327827

Change-Id: I3901fa946f1d0e7c34d09d45aa07b437b167dc0a
2017-07-05 13:16:15 +00:00
TreeHugger Robot
7bfa327827 Merge "Revert "Copy libz.so to vndk-sp"" into oc-dr1-dev 2017-07-05 13:11:35 +00:00
Logan Chien
1b65c6d094 Revert "Copy libz.so to vndk-sp"
This reverts commit b5f9e31877.  This
commit removes libz.so from /system/lib[64]/vndk-sp.

We have to remove libz.so from vndk-sp because we don't have a good
mechanism to stop "classloader" linker namespace from loading
/system/lib[64]/vndk-sp/libz.so.  Other alternatives require significant
changes to dynamic linker or CTS test cases.

Let's temporarily revert the commit to fix b/62195853 for oc-dr1-dev.
The long-term solution will be discussed in b/37617391.

Bug: 62195853
Bug: 37617391
Test: Boot sailfish to home screen.
Change-Id: I8591c153a1159ccfce6591b6cdc75722364e564b
2017-07-05 11:17:31 +08:00
Erik Kline
f5a005eab5 Place non-mobile tethering upstream types first
am: 924d8f36c6

Change-Id: I88c3f1655bd9433bf0c2bdcb48801b40762b4dd5
2017-07-04 14:07:51 +00:00
Erik Kline
924d8f36c6 Place non-mobile tethering upstream types first
Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
    - started USB tethering and switched upstreams between mobile and wifi
Bug: 63282480

Change-Id: I2b8cd7d56cfe5131df017ec0a437be01bab2b2d8
2017-07-04 20:06:19 +09:00
Jiyong Park
e332929400 vndk: add ro.vendor.vndk.version
The version of VNDK that the vendor is built against is recorded in the
vendor partition. The version will be used by the dynamic linker to load
the correct version of ld.config.txt to use.

Bug: 63130475
Test: taimen build and boots
Change-Id: Iee9a87340b90bf618c2d241820820f45f114b9f7
2017-07-04 10:02:25 +09:00
Sunny Kapdi
338bf393d4 Enable bt wcnss_filter to collect crash dumps
am: f128f5c538

Change-Id: I18ea562f5297ba911ae0c5c33e87f885c2f7014c
2017-07-01 10:59:41 +00:00
Sunny Kapdi
f128f5c538 Enable bt wcnss_filter to collect crash dumps
Bug: 37298084
Change-Id: Id67e4faf27ea6d59fdbcc2affcd1f2e6eb2ba3dd
2017-07-01 00:39:26 -07:00
Thierry Strudel
64315e9ae2 Merge "system.prop: prefix QCOM properties with vendor." into oc-dr1-dev
am: 2af5bf9c49

Change-Id: Ia458a61630a44709d7f4ac200506427122dc4a6b
2017-07-01 06:12:17 +00:00
Thierry Strudel
2af5bf9c49 Merge "system.prop: prefix QCOM properties with vendor." into oc-dr1-dev 2017-07-01 06:07:29 +00:00
Jeff Vander Stoep
3201ec3e73 Merge "Move chmod of /dev/diag earlier for sensors access" into oc-dr1-dev
am: 9d015bae3b

Change-Id: Ic8670a817966e5b0f585345d66b5acc1e21c26e3
2017-07-01 01:26:24 +00:00
Brian Duddie
e68f891326 Merge "Don't create /data/misc/sensors" into oc-dr1-dev
am: 867145cecc

Change-Id: I8aad9d4cffc76e860918d2702774ee9379208f17
2017-07-01 01:26:09 +00:00
TreeHugger Robot
9d015bae3b Merge "Move chmod of /dev/diag earlier for sensors access" into oc-dr1-dev 2017-07-01 01:19:36 +00:00
TreeHugger Robot
867145cecc Merge "Don't create /data/misc/sensors" into oc-dr1-dev 2017-07-01 01:13:27 +00:00