Nimrod Gileadi
0ec86c4602
Copy IDC for goldfish_rotary to /system/usr/idc am: 8570bcea52
...
am: a5b069e38b
Change-Id: I2b65b68e4e6aa8705fe0782becb2c26bc2da36d1
2017-01-18 18:21:07 +00:00
Jorim Jaggi
89abe45160
Merge "Revert "SELinux: split property_contexts into platform and non-platform components."" am: ce0bae2f47
am: 27b7101c6c
...
am: 4f34f3d6f0
Change-Id: Ied71fc8b2771ba2383723f83554abb8153c1d9ec
2017-01-18 18:18:56 +00:00
Jorim Jaggi
a82a67145f
Revert "SELinux: split property_contexts into platform and non-platform components." am: 8cbd925748
am: b909e2c1aa
...
am: 82968395c1
Change-Id: I5b5d6bd944b4aed152aebaed7e3758cbcbfb0411
2017-01-18 18:18:46 +00:00
Nimrod Gileadi
ed2000f147
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev am: 11111d875f
...
am: d70bbef6bc
Change-Id: Ie9bba383ca175ee50b393918f09c12203f5219c5
2017-01-18 17:00:24 +00:00
Nimrod Gileadi
ab0fd43472
Copy IDC for goldfish_rotary to /system/usr/idc am: 8570bcea52
...
am: edfdd39433
Change-Id: I140c793c21fa7ec9b9422c94558aa842e013bb22
2017-01-18 16:59:52 +00:00
Nimrod Gileadi
b3aa218921
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev
...
am: 11111d875f
Change-Id: I111591054d3131d5a0b0c0011d8b5940b74ce932
2017-01-18 16:53:54 +00:00
Nimrod Gileadi
d70bbef6bc
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev
...
am: 11111d875f
Change-Id: I08546a16803fa27c99a39c15ef8cb1b12aa63249
2017-01-18 16:53:53 +00:00
Nimrod Gileadi
a5b069e38b
Copy IDC for goldfish_rotary to /system/usr/idc
...
am: 8570bcea52
Change-Id: If6276de7e9eb16b4b627bc3c76599937a5100198
2017-01-18 16:53:23 +00:00
Nimrod Gileadi
edfdd39433
Copy IDC for goldfish_rotary to /system/usr/idc
...
am: 8570bcea52
Change-Id: I2a699ee186c08b60f2f5f98a00a0a5cc3230944c
2017-01-18 16:53:23 +00:00
Jorim Jaggi
4f34f3d6f0
Merge "Revert "SELinux: split property_contexts into platform and non-platform components."" am: ce0bae2f47
...
am: 27b7101c6c
Change-Id: Idce14b6caac043b5c2880c1d46365ad0610f48a3
2017-01-18 16:47:50 +00:00
Jorim Jaggi
82968395c1
Revert "SELinux: split property_contexts into platform and non-platform components." am: 8cbd925748
...
am: b909e2c1aa
Change-Id: I4549c025a473768a504a908acf388abc0266f616
2017-01-18 16:47:43 +00:00
Nimrod Gileadi
11111d875f
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev
2017-01-18 16:44:36 +00:00
Jorim Jaggi
27b7101c6c
Merge "Revert "SELinux: split property_contexts into platform and non-platform components.""
...
am: ce0bae2f47
Change-Id: I230c5966278be38339fd369075be30320d27bcd2
2017-01-18 16:42:00 +00:00
Jorim Jaggi
b909e2c1aa
Revert "SELinux: split property_contexts into platform and non-platform components."
...
am: 8cbd925748
Change-Id: Id5007d02d02bf27e7ab96c48dbecb908f81dd496
2017-01-18 16:41:33 +00:00
Jorim Jaggi
ce0bae2f47
Merge "Revert "SELinux: split property_contexts into platform and non-platform components.""
2017-01-18 16:33:32 +00:00
Jorim Jaggi
8cbd925748
Revert "SELinux: split property_contexts into platform and non-platform components."
...
This reverts commit c5ffdd4bb4
.
Change-Id: I4c5fa6c68cbf0124117153660a2fd363f72388b6
2017-01-18 15:37:30 +00:00
Nimrod Gileadi
8570bcea52
Copy IDC for goldfish_rotary to /system/usr/idc
...
This IDC file won't be used by the emulator, unless there's an input
device called goldfish_rotary. That device is being added to the kernel
in http://r.android.com/321420 .
Once that device is present, EventHub will look for a file named
goldfish_rotary.idc in the system/usr/idc directory to get the device
configuration.
Bug: 33292948
Change-Id: I384f29980d802280e626915844bddc49bc46110d
2017-01-18 11:02:02 +00:00
Sandeep Patil
2e0e89a0f5
Merge "SELinux: split property_contexts into platform and non-platform components." am: f91d163625
am: cb0a92be8b
...
am: e3ce754d96
Change-Id: I3cec1cfe55262b018a12559e94dbb1c0c6492a01
2017-01-18 06:24:38 +00:00
Sandeep Patil
8a3f41af27
SELinux: split property_contexts into platform and non-platform components. am: c5ffdd4bb4
am: a94ae916ce
...
am: eec071a34a
Change-Id: I675d59aabc9c6aab96e986413ebc03d5cf80eead
2017-01-18 06:22:01 +00:00
Sandeep Patil
e3ce754d96
Merge "SELinux: split property_contexts into platform and non-platform components." am: f91d163625
...
am: cb0a92be8b
Change-Id: Icf60fccc8999b98dbf07cd52a4d34ce2b118dab8
2017-01-18 06:19:13 +00:00
Sandeep Patil
cb0a92be8b
Merge "SELinux: split property_contexts into platform and non-platform components."
...
am: f91d163625
Change-Id: I014a2249a6bc7808292a3253721fe0d6724cd344
2017-01-18 06:17:24 +00:00
Sandeep Patil
eec071a34a
SELinux: split property_contexts into platform and non-platform components. am: c5ffdd4bb4
...
am: a94ae916ce
Change-Id: I91f8f35dbf12f97ba81d7d45951323eccf298cf2
2017-01-18 06:16:59 +00:00
Sandeep Patil
a94ae916ce
SELinux: split property_contexts into platform and non-platform components.
...
am: c5ffdd4bb4
Change-Id: Id6a41eb5a4c1cc63c6ca93197f357a7de0604bab
2017-01-18 06:12:26 +00:00
Treehugger Robot
f91d163625
Merge "SELinux: split property_contexts into platform and non-platform components."
2017-01-18 06:09:02 +00:00
Sandeep Patil
7500744864
Merge "SELinux: split service_contexts into platform and non-platform components." am: a91d63fa65
am: bbf5e0b99b
...
am: fbd4ec4d59
Change-Id: I236a97bff0f22db1499fdedbdb533d6159d8b28f
2017-01-18 00:50:46 +00:00
Sandeep Patil
d091ce20b1
SELinux: split service_contexts into platform and non-platform components. am: e4ade08f63
am: 0068df10f6
...
am: 29c9cb811d
Change-Id: Ia50fec868a07669ab9e20c212684892e248ff24b
2017-01-18 00:50:36 +00:00
Sandeep Patil
fbd4ec4d59
Merge "SELinux: split service_contexts into platform and non-platform components." am: a91d63fa65
...
am: bbf5e0b99b
Change-Id: I080b0b58e8c86a444f43fa65c7a92187e9a4fd5f
2017-01-18 00:46:12 +00:00
Sandeep Patil
29c9cb811d
SELinux: split service_contexts into platform and non-platform components. am: e4ade08f63
...
am: 0068df10f6
Change-Id: I0c049562c6afb08c2fc3bb033be874e483d68ddb
2017-01-18 00:46:05 +00:00
Sandeep Patil
bbf5e0b99b
Merge "SELinux: split service_contexts into platform and non-platform components."
...
am: a91d63fa65
Change-Id: I872a51e28f8cd70972c1d924ba6591c0e9df4f13
2017-01-18 00:41:38 +00:00
Sandeep Patil
c5ffdd4bb4
SELinux: split property_contexts into platform and non-platform components.
...
Bug: 33746484
Test: Successfully boot with original service and property contexts.
Successfully boot with split serivce and property contexts.
Change-Id: I1f218ca842407d30650b8987ded6679672171091
Signed-off-by: Sandeep Patil <sspatil@google.com>
2017-01-18 00:41:15 +00:00
Sandeep Patil
0068df10f6
SELinux: split service_contexts into platform and non-platform components.
...
am: e4ade08f63
Change-Id: Icad4eca1ac22b99a6aa0f130799143ee89727f55
2017-01-18 00:41:03 +00:00
Treehugger Robot
a91d63fa65
Merge "SELinux: split service_contexts into platform and non-platform components."
2017-01-18 00:36:56 +00:00
Android Build Merger (Role)
9f58ec2f1c
Merge changes from topic 'am-8f2774833da54dc1bf4ce7062adbf934' into nyc-mr2-dev-plus-aosp
...
* changes:
[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/34345751 am: 3597d69559
am: 97c071f5ae
am: 61c5e5075c
-s ours am: 074c3265aa
-s ours am: 2e9eb28b99
am: fef824f53d
-s ours am: e5d862ad75
am: 2fff24ead3
am: e85f5851e4
am: 5c2bd9cb75
-s ours am: bf3f53de1f
am: 91e97eda54
am: 28332a1767
am: b243bee240
am: ac3e93e3b4
[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am: 6cece247c4
am: a66bd3ad13
am: 26cd6d4d12
-s ours am: f5ef1d35de
-s ours am: 70e501326e
am: e13222c98f
-s ours am: ed4222f439
am: 1e907b8fe6
am: e61f600b82
am: 1d806358f5
-s ours am: e4f0c9db37
am: 0e5257bcb7
am: 13da0e1089
am: 0a4b68bee7
am: e6906d8961
2017-01-17 23:43:08 +00:00
Adam Seaton
dcd75eb9c6
[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/34345751 am: 3597d69559
am: 97c071f5ae
am: 61c5e5075c
-s ours am: 074c3265aa
-s ours am: 2e9eb28b99
am: fef824f53d
-s ours am: e5d862ad75
am: 2fff24ead3
am: e85f5851e4
am: 5c2bd9cb75
-s ours am: bf3f53de1f
am: 91e97eda54
am: 28332a1767
am: b243bee240
...
am: d672d69641
Change-Id: Ib8221434812089d823781435e17b64413c4b0f19
2017-01-17 23:42:52 +00:00
Adam Seaton
f42172ccc7
[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/34345751 am: 3597d69559
am: 97c071f5ae
am: 61c5e5075c
-s ours am: 074c3265aa
-s ours am: 2e9eb28b99
am: fef824f53d
-s ours am: e5d862ad75
am: 2fff24ead3
am: e85f5851e4
am: 5c2bd9cb75
-s ours am: bf3f53de1f
am: 91e97eda54
am: 28332a1767
am: b243bee240
...
am: ac3e93e3b4
Change-Id: Ic6433947c1764ca54ccbd3967ced14788012ae23
2017-01-17 23:42:52 +00:00
Adam Seaton
925e40dcaa
[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am: 6cece247c4
am: a66bd3ad13
am: 26cd6d4d12
-s ours am: f5ef1d35de
-s ours am: 70e501326e
am: e13222c98f
-s ours am: ed4222f439
am: 1e907b8fe6
am: e61f600b82
am: 1d806358f5
-s ours am: e4f0c9db37
am: 0e5257bcb7
am: 13da0e1089
am: 0a4b68bee7
...
am: e69a8f1710
Change-Id: I033e4f845fc2645c4586616c2ced29a2052a4362
2017-01-17 23:42:43 +00:00
Adam Seaton
15016225c6
[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am: 6cece247c4
am: a66bd3ad13
am: 26cd6d4d12
-s ours am: f5ef1d35de
-s ours am: 70e501326e
am: e13222c98f
-s ours am: ed4222f439
am: 1e907b8fe6
am: e61f600b82
am: 1d806358f5
-s ours am: e4f0c9db37
am: 0e5257bcb7
am: 13da0e1089
am: 0a4b68bee7
...
am: e6906d8961
Change-Id: Ide7fc48d153d1d30415c15581e3272e4cd7567a1
2017-01-17 23:42:43 +00:00
Adam Seaton
d672d69641
[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/34345751 am: 3597d69559
am: 97c071f5ae
am: 61c5e5075c
-s ours am: 074c3265aa
-s ours am: 2e9eb28b99
am: fef824f53d
-s ours am: e5d862ad75
am: 2fff24ead3
am: e85f5851e4
am: 5c2bd9cb75
-s ours am: bf3f53de1f
am: 91e97eda54
am: 28332a1767
...
am: b243bee240
Change-Id: I377c335de55d4ace879f5bfd9ee4fdea0a47dc8a
2017-01-17 23:40:52 +00:00
Adam Seaton
ac3e93e3b4
[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/34345751 am: 3597d69559
am: 97c071f5ae
am: 61c5e5075c
-s ours am: 074c3265aa
-s ours am: 2e9eb28b99
am: fef824f53d
-s ours am: e5d862ad75
am: 2fff24ead3
am: e85f5851e4
am: 5c2bd9cb75
-s ours am: bf3f53de1f
am: 91e97eda54
am: 28332a1767
...
am: b243bee240
Change-Id: Ia7ecd0e0ceb11ef3ff543674dfad20332f807201
2017-01-17 23:40:50 +00:00
Adam Seaton
e69a8f1710
[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am: 6cece247c4
am: a66bd3ad13
am: 26cd6d4d12
-s ours am: f5ef1d35de
-s ours am: 70e501326e
am: e13222c98f
-s ours am: ed4222f439
am: 1e907b8fe6
am: e61f600b82
am: 1d806358f5
-s ours am: e4f0c9db37
am: 0e5257bcb7
am: 13da0e1089
...
am: 0a4b68bee7
Change-Id: I0a6aada7d6fac92cb7739af7ec6eec4af7a481f4
2017-01-17 23:40:43 +00:00
Adam Seaton
e6906d8961
[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am: 6cece247c4
am: a66bd3ad13
am: 26cd6d4d12
-s ours am: f5ef1d35de
-s ours am: 70e501326e
am: e13222c98f
-s ours am: ed4222f439
am: 1e907b8fe6
am: e61f600b82
am: 1d806358f5
-s ours am: e4f0c9db37
am: 0e5257bcb7
am: 13da0e1089
...
am: 0a4b68bee7
Change-Id: I4751946af4cc4837693c132ca8007ec18730fac6
2017-01-17 23:40:43 +00:00
Adam Seaton
b243bee240
[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/34345751 am: 3597d69559
am: 97c071f5ae
am: 61c5e5075c
-s ours am: 074c3265aa
-s ours am: 2e9eb28b99
am: fef824f53d
-s ours am: e5d862ad75
am: 2fff24ead3
am: e85f5851e4
am: 5c2bd9cb75
-s ours am: bf3f53de1f
am: 91e97eda54
...
am: 28332a1767
Change-Id: I227d27e63b707f037671cf8c0b783833f0f6ab93
2017-01-17 23:38:21 +00:00
Adam Seaton
0a4b68bee7
[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am: 6cece247c4
am: a66bd3ad13
am: 26cd6d4d12
-s ours am: f5ef1d35de
-s ours am: 70e501326e
am: e13222c98f
-s ours am: ed4222f439
am: 1e907b8fe6
am: e61f600b82
am: 1d806358f5
-s ours am: e4f0c9db37
am: 0e5257bcb7
...
am: 13da0e1089
Change-Id: I3e72055f0873a08ac9d0d4049c52f2653bc3e74f
2017-01-17 23:38:14 +00:00
Android Build Merger (Role)
791cfd0d57
Merge changes from topic 'am-1ca7f6cf4c7e4b4fb54938d8b0fff1f0' into nyc-mr2-dev-plus-aosp
...
* changes:
[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev am: 84888652e0
-s ours am: d438fc526d
am: b40dc64ed2
-s ours am: 0a46d4edcf
am: 59cd888132
am: f3d5948c42
am: 0a25d51000
-s ours am: 83731b0a4d
am: 5467ba8cd1
am: 797e24cf9b
am: 85b71b92b5
am: 78052362cf
[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev am: 28dae4b62b
-s ours am: b0d0a4ec9b
am: 80bc7863c8
-s ours am: 151506a2a3
am: 4a0196f3e3
am: 536287567a
am: 98afadbfc7
-s ours am: 04418ff1d7
am: a3e343bff5
am: 320061f5f1
am: fd459b20de
am: 58488c7d70
2017-01-17 23:36:06 +00:00
Adam Seaton
8aef5ef139
[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev am: 84888652e0
-s ours am: d438fc526d
am: b40dc64ed2
-s ours am: 0a46d4edcf
am: 59cd888132
am: f3d5948c42
am: 0a25d51000
-s ours am: 83731b0a4d
am: 5467ba8cd1
am: 797e24cf9b
am: 85b71b92b5
...
am: f3e0efb74c
Change-Id: I24fc36c6ff78b01cf81aa048290428966eba87a9
2017-01-17 23:35:51 +00:00
Adam Seaton
28332a1767
[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/34345751 am: 3597d69559
am: 97c071f5ae
am: 61c5e5075c
-s ours am: 074c3265aa
-s ours am: 2e9eb28b99
am: fef824f53d
-s ours am: e5d862ad75
am: 2fff24ead3
am: e85f5851e4
am: 5c2bd9cb75
-s ours am: bf3f53de1f
...
am: 91e97eda54
Change-Id: I962a1306117126258586fa159e423f7a3957f784
2017-01-17 23:35:50 +00:00
Adam Seaton
ee73e2ed91
[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev am: 84888652e0
-s ours am: d438fc526d
am: b40dc64ed2
-s ours am: 0a46d4edcf
am: 59cd888132
am: f3d5948c42
am: 0a25d51000
-s ours am: 83731b0a4d
am: 5467ba8cd1
am: 797e24cf9b
am: 85b71b92b5
...
am: 78052362cf
Change-Id: Icaeee68ef7d16ae61c4a3b5082a23632532fe3da
2017-01-17 23:35:50 +00:00
Adam Seaton
13da0e1089
[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am: 6cece247c4
am: a66bd3ad13
am: 26cd6d4d12
-s ours am: f5ef1d35de
-s ours am: 70e501326e
am: e13222c98f
-s ours am: ed4222f439
am: 1e907b8fe6
am: e61f600b82
am: 1d806358f5
-s ours am: e4f0c9db37
...
am: 0e5257bcb7
Change-Id: Ie8d8e1be3cb6dce9ba11ceaea869812f800c9857
2017-01-17 23:35:43 +00:00
Adam Seaton
08533a2cd4
[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev am: 28dae4b62b
-s ours am: b0d0a4ec9b
am: 80bc7863c8
-s ours am: 151506a2a3
am: 4a0196f3e3
am: 536287567a
am: 98afadbfc7
-s ours am: 04418ff1d7
am: a3e343bff5
am: 320061f5f1
am: fd459b20de
...
am: a7f711dc1f
Change-Id: I2c883f18092310e87015b8f5665661b7398a5f18
2017-01-17 23:35:43 +00:00
Adam Seaton
1faffbb28e
[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev am: 28dae4b62b
-s ours am: b0d0a4ec9b
am: 80bc7863c8
-s ours am: 151506a2a3
am: 4a0196f3e3
am: 536287567a
am: 98afadbfc7
-s ours am: 04418ff1d7
am: a3e343bff5
am: 320061f5f1
am: fd459b20de
...
am: 58488c7d70
Change-Id: I58244342dd55fa52973d8bd5021c8d5de87e4fc5
2017-01-17 23:35:43 +00:00