7d3fc02dfb
Merge "Add framework sysconfig content to the build"
2017-01-18 22:32:13 +00:00
482d92addf
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev am: 11111d875f am: b3aa218921
...
am: e33294ec98
2017-01-18 19:01:10 +00:00
ec167c38b5
Copy IDC for goldfish_rotary to /system/usr/idc am: 8570bcea52 am: a5b069e38b
...
am: 0ec86c4602
2017-01-18 18:59:25 +00:00
c6a02d27c0
Merge "Revert "SELinux: split property_contexts into platform and non-platform components."" am: ce0bae2f47 am: 27b7101c6c am: 4f34f3d6f0
...
am: 89abe45160
2017-01-18 18:56:42 +00:00
362f19e3df
Revert "SELinux: split property_contexts into platform and non-platform components." am: 8cbd925748 am: b909e2c1aa am: 82968395c1
...
am: a82a67145f
2017-01-18 18:56:27 +00:00
e33294ec98
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev am: 11111d875f
...
am: b3aa218921
2017-01-18 18:22:53 +00:00
0ec86c4602
Copy IDC for goldfish_rotary to /system/usr/idc am: 8570bcea52
...
am: a5b069e38b
2017-01-18 18:21:07 +00:00
89abe45160
Merge "Revert "SELinux: split property_contexts into platform and non-platform components."" am: ce0bae2f47 am: 27b7101c6c
...
am: 4f34f3d6f0
2017-01-18 18:18:56 +00:00
a82a67145f
Revert "SELinux: split property_contexts into platform and non-platform components." am: 8cbd925748 am: b909e2c1aa
...
am: 82968395c1
2017-01-18 18:18:46 +00:00
9802dfc019
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev am: 11111d875f am: d70bbef6bc
...
am: ed2000f147
2017-01-18 17:06:58 +00:00
001a362523
Copy IDC for goldfish_rotary to /system/usr/idc am: 8570bcea52 am: edfdd39433
...
am: ab0fd43472
2017-01-18 17:06:24 +00:00
ed2000f147
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev am: 11111d875f
...
am: d70bbef6bc
2017-01-18 17:00:24 +00:00
ab0fd43472
Copy IDC for goldfish_rotary to /system/usr/idc am: 8570bcea52
...
am: edfdd39433
2017-01-18 16:59:52 +00:00
b3aa218921
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev
...
am: 11111d875f
2017-01-18 16:53:54 +00:00
d70bbef6bc
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev
...
am: 11111d875f
2017-01-18 16:53:53 +00:00
a5b069e38b
Copy IDC for goldfish_rotary to /system/usr/idc
...
am: 8570bcea52
2017-01-18 16:53:23 +00:00
edfdd39433
Copy IDC for goldfish_rotary to /system/usr/idc
...
am: 8570bcea52
2017-01-18 16:53:23 +00:00
4f34f3d6f0
Merge "Revert "SELinux: split property_contexts into platform and non-platform components."" am: ce0bae2f47
...
am: 27b7101c6c
2017-01-18 16:47:50 +00:00
82968395c1
Revert "SELinux: split property_contexts into platform and non-platform components." am: 8cbd925748
...
am: b909e2c1aa
2017-01-18 16:47:43 +00:00
11111d875f
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev
2017-01-18 16:44:36 +00:00
27b7101c6c
Merge "Revert "SELinux: split property_contexts into platform and non-platform components.""
...
am: ce0bae2f47
2017-01-18 16:42:00 +00:00
b909e2c1aa
Revert "SELinux: split property_contexts into platform and non-platform components."
...
am: 8cbd925748
2017-01-18 16:41:33 +00:00
ce0bae2f47
Merge "Revert "SELinux: split property_contexts into platform and non-platform components.""
2017-01-18 16:33:32 +00:00
8cbd925748
Revert "SELinux: split property_contexts into platform and non-platform components."
...
This reverts commit c5ffdd4bb4
2017-01-18 15:37:30 +00:00
84fcd62cb4
Revert "SELinux: split property_contexts into platform and non-platform components."
...
This reverts commit c5ffdd4bb4
2017-01-18 16:28:54 +01:00
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
a2f758ee16
Merge "SELinux: split property_contexts into platform and non-platform components." am: f91d163625 am: cb0a92be8b am: e3ce754d96
...
am: 2e0e89a0f5
2017-01-18 06:29:25 +00:00
3d425305ee
SELinux: split property_contexts into platform and non-platform components. am: c5ffdd4bb4 am: a94ae916ce am: eec071a34a
...
am: 8a3f41af27
2017-01-18 06:27:05 +00:00
2e0e89a0f5
Merge "SELinux: split property_contexts into platform and non-platform components." am: f91d163625 am: cb0a92be8b
...
am: e3ce754d96
2017-01-18 06:24:38 +00:00
8a3f41af27
SELinux: split property_contexts into platform and non-platform components. am: c5ffdd4bb4 am: a94ae916ce
...
am: eec071a34a
2017-01-18 06:22:01 +00:00
e3ce754d96
Merge "SELinux: split property_contexts into platform and non-platform components." am: f91d163625
...
am: cb0a92be8b
2017-01-18 06:19:13 +00:00
cb0a92be8b
Merge "SELinux: split property_contexts into platform and non-platform components."
...
am: f91d163625
2017-01-18 06:17:24 +00:00
eec071a34a
SELinux: split property_contexts into platform and non-platform components. am: c5ffdd4bb4
...
am: a94ae916ce
2017-01-18 06:16:59 +00:00
a94ae916ce
SELinux: split property_contexts into platform and non-platform components.
...
am: c5ffdd4bb4
2017-01-18 06:12:26 +00:00
f91d163625
Merge "SELinux: split property_contexts into platform and non-platform components."
2017-01-18 06:09:02 +00:00
e2f7cf29b6
Merge "SELinux: split service_contexts into platform and non-platform components." am: a91d63fa65 am: bbf5e0b99b am: fbd4ec4d59
...
am: 7500744864
2017-01-18 00:55:15 +00:00
1b8d3bc0e2
SELinux: split service_contexts into platform and non-platform components. am: e4ade08f63 am: 0068df10f6 am: 29c9cb811d
...
am: d091ce20b1
2017-01-18 00:55:09 +00:00
7500744864
Merge "SELinux: split service_contexts into platform and non-platform components." am: a91d63fa65 am: bbf5e0b99b
...
am: fbd4ec4d59
2017-01-18 00:50:46 +00:00
d091ce20b1
SELinux: split service_contexts into platform and non-platform components. am: e4ade08f63 am: 0068df10f6
...
am: 29c9cb811d
2017-01-18 00:50:36 +00:00
fbd4ec4d59
Merge "SELinux: split service_contexts into platform and non-platform components." am: a91d63fa65
...
am: bbf5e0b99b
2017-01-18 00:46:12 +00:00
29c9cb811d
SELinux: split service_contexts into platform and non-platform components. am: e4ade08f63
...
am: 0068df10f6
2017-01-18 00:46:05 +00:00
bbf5e0b99b
Merge "SELinux: split service_contexts into platform and non-platform components."
...
am: a91d63fa65
2017-01-18 00:41:38 +00:00
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
0068df10f6
SELinux: split service_contexts into platform and non-platform components.
...
am: e4ade08f63
2017-01-18 00:41:03 +00:00
a91d63fa65
Merge "SELinux: split service_contexts into platform and non-platform components."
2017-01-18 00:36:56 +00:00
c445371de7
Merge changes from topic 'am-8f2774833da54dc1bf4ce7062adbf934' into nyc-mr2-dev-plus-aosp
...
am: 9f58ec2f1c
2017-01-17 23:46:08 +00:00
41abb5c671
[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
...
am: f42172ccc7
2017-01-17 23:46:06 +00:00
9e724389a8
[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
...
am: 15016225c6
2017-01-17 23:45:52 +00:00
d4d05b250d
[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
...
am: dcd75eb9c6
2017-01-17 23:45:23 +00:00
866c7861b6
[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
...
am: 925e40dcaa
2017-01-17 23:45:13 +00:00
TreeHugger Robot