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

Merge "Remove the signature protection for sensor privacy permissions" into sc-dev

Browse Source
This commit is contained in:
Evan Severson
2021-04-20 18:01:40 +00:00
committed by Android (Google) Code Review
parent 6e6e6b5162 2f630c61f7
commit f55d0c0d27
5 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/system-current.txt
View File

@@ -380,6 +380,7 @@ package android {
field public static final int config_systemSpeechRecognizer;
field public static final int config_systemTelevisionNotificationHandler;
field public static final int config_systemTextIntelligence;
field public static final int config_systemUi;
field public static final int config_systemUiIntelligence;
field public static final int config_systemVisualIntelligence;
field public static final int config_systemWellbeing;

4
core/res/AndroidManifest.xml
View File

@@ -5578,12 +5578,12 @@
<!-- @SystemApi Allows sensor privacy to be modified.
@hide -->
<permission android:name="android.permission.MANAGE_SENSOR_PRIVACY"
android:protectionLevel="signature" />
android:protectionLevel="internal|role" />
<!-- @SystemApi Allows sensor privacy changes to be observed.
@hide -->
<permission android:name="android.permission.OBSERVE_SENSOR_PRIVACY"
android:protectionLevel="signature|installer" />
android:protectionLevel="internal|role|installer" />
<!-- @SystemApi Permission that protects the {@link Intent#ACTION_REVIEW_ACCESSIBILITY_SERVICES}
intent.

2
core/res/res/values/config.xml
View File

@@ -1951,6 +1951,8 @@
<string name="config_systemTelevisionNotificationHandler" translatable="false"></string>
<!-- The name of the package that will hold the system activity recognizer role. -->
<string name="config_systemActivityRecognizer" translatable="false"></string>
<!-- The name of the package that will hold the system ui role -->
<string name="config_systemUi" translatable="false">com.android.systemui</string>
<!-- The name of the package that will be allowed to change its components' label/icon. -->
<string name="config_overrideComponentUiPackage" translatable="false">com.android.stk</string>

2
core/res/res/values/public.xml
View File

@@ -3228,6 +3228,8 @@
<public name="config_systemActivityRecognizer" />
<!-- @hide @SystemApi -->
<public name="config_systemCompanionDeviceProvider"/>
<!-- @hide @SystemApi -->
<public name="config_systemUi" />
</staging-public-group>
<staging-public-group type="id" first-id="0x01020055">

15
services/java/com/android/server/SystemServer.java
View File

@@ -2731,13 +2731,6 @@ public final class SystemServer implements Dumpable {
t.traceEnd();
}
t.traceBegin("StartSystemUI");
try {
startSystemUi(context, windowManagerF);
} catch (Throwable e) {
reportWtf("starting System UI", e);
}
t.traceEnd();
// Enable airplane mode in safe mode. setAirplaneMode() cannot be called
// earlier as it sends broadcasts to other services.
// TODO: This may actually be too late if radio firmware already started leaking
@@ -2939,6 +2932,14 @@ public final class SystemServer implements Dumpable {
}
}, t);
t.traceBegin("StartSystemUI");
try {
startSystemUi(context, windowManagerF);
} catch (Throwable e) {
reportWtf("starting System UI", e);
}
t.traceEnd();
t.traceEnd(); // startOtherServices
}