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 am: 8a0ce64177 am: 75ae324fb9

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

Change-Id: Id9f67ecab2beabe967660b5a4407ef0f20d8efad
This commit is contained in:
Neil Fuller
2020-09-30 10:15:21 +00:00
committed by Automerger Merge Worker
parent 32f7c492fc 75ae324fb9
commit 7a3481c35c
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" <permission android:name="android.permission.SUGGEST_MANUAL_TIME_AND_ZONE"
android:protectionLevel="signature" /> 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 --> <!-- Permissions related to changing status bar -->
<!-- ==================================================== --> <!-- ==================================================== -->

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

@@ -433,6 +433,8 @@ applications that come with the platform
<permission name="android.permission.CAPTURE_AUDIO_OUTPUT" /> <permission name="android.permission.CAPTURE_AUDIO_OUTPUT" />
<!-- Permissions required for CTS test - AdbManagerTest --> <!-- Permissions required for CTS test - AdbManagerTest -->
<permission name="android.permission.MANAGE_DEBUGGING" /> <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>
<privapp-permissions package="com.android.statementservice"> <privapp-permissions package="com.android.statementservice">

3
packages/Shell/AndroidManifest.xml
View File

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