Skip to content

Commit

Permalink
Merge "Grant Marlin and Sailfish default permission" into nyc-mr1-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
sganov authored and Android (Google) Code Review committed Aug 18, 2016
2 parents cd4260f + b92109c commit 961c80b
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 0 deletions.
58 changes: 58 additions & 0 deletions default-permissions.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>

<!-- Copyright (C) 2016 Google Inc.
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.
-->

<!--
This file contains permissions to be granted by default. Default
permissions are granted to special platform components and to apps
that are approved to get default grants. The special components
are apps that are expected tto work out-of-the-box as they provide
core use cases such as default dialer, default email, etc. These
grants are managed by the platform. The apps that are additionally
approved for default grants are ones that provide carrier specific
functionality, ones legally required at some location, ones providing
alternative disclosure and opt-out UI, ones providing highlight features
of a dedicated device, etc. This file contains only the latter exceptions.
Fixed permissions cannot be controlled by the user and need a special
approval. Typically these are to ensure either legally mandated functions
or the app is considered a part of the OS.
-->

<exceptions>

<!-- This is an example of an exception:
<exception
package="foo.bar.permission"
<permission name="android.permission.READ_CONTACTS" fixed="true"/>
<permission name="android.permission.READ_CALENDAR" fixed="false"/>
</exception>
-->

<exception
package="com.google.android.youtube">
<!-- Contacts -->
<permission name="android.permission.READ_CONTACTS" fixed="false"/>
</exception>

<exception
package="com.motricity.verizon.ssodownloadable">
<!-- Phone -->
<permission name="android.permission.READ_PHONE_STATE" fixed="false"/>
<!-- SMS -->
<permission name="android.permission.RECEIVE_SMS" fixed="false"/>
</exception>

</exceptions>
4 changes: 4 additions & 0 deletions device-common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,10 @@ TARGET_RECOVERY_WIPE := \
PRODUCT_COPY_FILES += \
device/google/marlin/gps.conf:system/etc/gps.conf

# Default permission grant exceptions
PRODUCT_COPY_FILES += \
device/google/marlin/default-permissions.xml:system/etc/default-permissions/default-permissions.xml

# A/B OTA dexopt package
PRODUCT_PACKAGES += otapreopt_script

Expand Down

0 comments on commit 961c80b

Please sign in to comment.