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

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
}