diff options
| author | Adam Connors <adamconnors@google.com> | 2014-09-10 10:07:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-10 10:07:49 +0000 |
| commit | 9e691c1093fa9c00d82f5a33f5382c2610734ca6 (patch) | |
| tree | 06320b9ebb556e1993642ad0684b00713b27f849 | |
| parent | 1173137af3fb93c7708fb7b1109c5b37db72d783 (diff) | |
| parent | cb152a556e14d8bba291d86cdde24ac83c2c3a3a (diff) | |
| download | frameworks_native-9e691c1093fa9c00d82f5a33f5382c2610734ca6.zip frameworks_native-9e691c1093fa9c00d82f5a33f5382c2610734ca6.tar.gz frameworks_native-9e691c1093fa9c00d82f5a33f5382c2610734ca6.tar.bz2 | |
Merge "Add feature flags for verified boot and securely remove users." into lmp-dev
| -rw-r--r-- | data/etc/android.software.securely_removes_users.xml | 19 | ||||
| -rw-r--r-- | data/etc/android.software.verified_boot.xml | 19 |
2 files changed, 38 insertions, 0 deletions
diff --git a/data/etc/android.software.securely_removes_users.xml b/data/etc/android.software.securely_removes_users.xml new file mode 100644 index 0000000..7278bcd --- /dev/null +++ b/data/etc/android.software.securely_removes_users.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<permissions> + <feature name="android.software.securely_removes_users" /> +</permissions>
\ No newline at end of file diff --git a/data/etc/android.software.verified_boot.xml b/data/etc/android.software.verified_boot.xml new file mode 100644 index 0000000..7a9a9c5 --- /dev/null +++ b/data/etc/android.software.verified_boot.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<permissions> + <feature name="android.software.verified_boot" /> +</permissions>
\ No newline at end of file |