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

Merge "Changed comments to match real protection level" into qt-dev

Browse Source 
am: b23292da1d

Change-Id: I8bdd28453f82179714f89066fc15f880ece70d0e
This commit is contained in:
Nate Myren
2019-05-29 09:19:12 -07:00
committed by android-build-merger
parent 01d9108ebb b23292da1d
commit 905c22a18d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/AndroidManifest.xml
View File

@@ -2337,7 +2337,7 @@
The app can check whether it has this authorization by calling The app can check whether it has this authorization by calling
{@link android.provider.Settings#canDrawOverlays {@link android.provider.Settings#canDrawOverlays
Settings.canDrawOverlays()}. Settings.canDrawOverlays()}.
<p>Protection level: signature --> <p>Protection level: signature|preinstalled|appop|pre23|development -->
<permission android:name="android.permission.SYSTEM_ALERT_WINDOW" <permission android:name="android.permission.SYSTEM_ALERT_WINDOW"
android:label="@string/permlab_systemAlertWindow" android:label="@string/permlab_systemAlertWindow"
android:description="@string/permdesc_systemAlertWindow" android:description="@string/permdesc_systemAlertWindow"
@@ -2522,7 +2522,7 @@
can check whether it has this authorization by calling {@link can check whether it has this authorization by calling {@link
android.provider.Settings.System#canWrite Settings.System.canWrite()}. android.provider.Settings.System#canWrite Settings.System.canWrite()}.
<p>Protection level: signature <p>Protection level: signature|preinstalled|appop|pre23
--> -->
<permission android:name="android.permission.WRITE_SETTINGS" <permission android:name="android.permission.WRITE_SETTINGS"
android:label="@string/permlab_writeSettings" android:label="@string/permlab_writeSettings"