summaryrefslogtreecommitdiff
path: root/services/java
diff options
context:
space:
mode:
authorEvan Severson <evanseverson@google.com>2021-04-01 16:35:58 -0700
committerEvan Severson <evanseverson@google.com>2021-04-14 09:00:20 -0700
commit2f630c61f79d9767df6bab1d038205778a6b212e (patch)
tree5584cee588bb5778dc89b06d8d4f0b92dadef6e8 /services/java
parentbf4fe976d02d99e07210473167e2e58d6ef75a0f (diff)
Remove the signature protection for sensor privacy permissions
Only a couple distinguished packages will need to hold these permissions. We can grant via role for these cases. Previously system ui was started assuming the system server was initialized enough but the problem was that the role service may not have finished granting all permissions. If we start sys ui after system services have finished onUserStarting then we can _probably_ safely assume the state of user 0 is initiallized. Test: Wipe & reboot; dumpsys package com.android.systemui Test: atest SystemUiTests Bug: 184303952 Change-Id: I160ac8e0f2fbc36a76e8f2ee99d73e613ddc3c11
Diffstat (limited to 'services/java')
-rw-r--r--services/java/com/android/server/SystemServer.java15
1 files changed, 8 insertions, 7 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 912b8cad952c..75996b8e099b 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -2724,13 +2724,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
@@ -2932,6 +2925,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
}