Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add a new permission in AOSP" am: 4b22e7c281 am: 1f728acac0

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440636

Change-Id: I2a65d7c9a91f5b3f5772ba8b2b199bfe3096077b
This commit is contained in:
Neil Fuller
2020-09-30 09:35:03 +00:00
committed by Automerger Merge Worker
parent 5d8e5249d6 1f728acac0
commit 8a0ce64177
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/res/AndroidManifest.xml
View File

@@ -2682,6 +2682,14 @@
<permission android:name="android.permission.SUGGEST_MANUAL_TIME_AND_ZONE"
android:protectionLevel="signature" />
<!-- Allows applications like settings to manage configuration associated with automatic time
and time zone detection.
<p>Not for use by third-party applications.
@hide
-->
<permission android:name="android.permission.MANAGE_TIME_AND_ZONE_DETECTION"
android:protectionLevel="signature|privileged" />
<!-- ==================================================== -->
<!-- Permissions related to changing status bar -->
<!-- ==================================================== -->

2
data/etc/privapp-permissions-platform.xml
View File

@@ -427,6 +427,8 @@ applications that come with the platform
<permission name="android.permission.CAPTURE_AUDIO_OUTPUT" />
<!-- Permissions required for CTS test - AdbManagerTest -->
<permission name="android.permission.MANAGE_DEBUGGING" />
<!-- Permissions required for CTS test - TimeManagerTest -->
<permission name="android.permission.MANAGE_TIME_AND_ZONE_DETECTION" />
</privapp-permissions>
<privapp-permissions package="com.android.statementservice">

3
packages/Shell/AndroidManifest.xml
View File

@@ -326,6 +326,9 @@
<!-- Permission needed for CTS test - DisplayTest -->
<uses-permission android:name="android.permission.OVERRIDE_DISPLAY_MODE_REQUESTS" />
<!-- Permission needed for CTS test - TimeManagerTest -->
<uses-permission android:name="android.permission.MANAGE_TIME_AND_ZONE_DETECTION" />
<application android:label="@string/app_label"
android:theme="@android:style/Theme.DeviceDefault.DayNight"
android:defaultToDeviceProtectedStorage="true"