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

Merge "Un-expose LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH for R." into rvc-dev am: d200e5deb6 am: 789d146481 am: e3bdab61e0

Browse Source 
Change-Id: I82ef28916b22a3d97848dce42b5f730d87e768d6
This commit is contained in:
TreeHugger Robot
2020-03-20 00:02:26 +00:00
committed by Automerger Merge Worker
parent 2e2cc3def2 e3bdab61e0
commit 1deec5d491
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -104,7 +104,6 @@ package android {
field public static final String INTERNAL_SYSTEM_WINDOW = "android.permission.INTERNAL_SYSTEM_WINDOW"; field public static final String INTERNAL_SYSTEM_WINDOW = "android.permission.INTERNAL_SYSTEM_WINDOW";
field public static final String INVOKE_CARRIER_SETUP = "android.permission.INVOKE_CARRIER_SETUP"; field public static final String INVOKE_CARRIER_SETUP = "android.permission.INVOKE_CARRIER_SETUP";
field public static final String KILL_UID = "android.permission.KILL_UID"; field public static final String KILL_UID = "android.permission.KILL_UID";
field public static final String LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH = "android.permission.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH";
field public static final String LOCAL_MAC_ADDRESS = "android.permission.LOCAL_MAC_ADDRESS"; field public static final String LOCAL_MAC_ADDRESS = "android.permission.LOCAL_MAC_ADDRESS";
field public static final String LOCK_DEVICE = "android.permission.LOCK_DEVICE"; field public static final String LOCK_DEVICE = "android.permission.LOCK_DEVICE";
field public static final String LOOP_RADIO = "android.permission.LOOP_RADIO"; field public static final String LOOP_RADIO = "android.permission.LOOP_RADIO";

2
core/res/AndroidManifest.xml
View File

@@ -2164,7 +2164,7 @@
<permission android:name="android.permission.READ_ACTIVE_EMERGENCY_SESSION" <permission android:name="android.permission.READ_ACTIVE_EMERGENCY_SESSION"
android:protectionLevel="signature" /> android:protectionLevel="signature" />
<!-- @SystemApi Allows listen permission to always reported signal strength. <!-- Allows listen permission to always reported signal strength.
@hide Used internally. --> @hide Used internally. -->
<permission android:name="android.permission.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH" <permission android:name="android.permission.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH"
android:protectionLevel="signature" /> android:protectionLevel="signature" />