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

Merge "Do not call setQuietModeEnabled from the main thread"

Browse Source
This commit is contained in:
Fyodor Kupolov
2018-02-02 01:50:54 +00:00
committed by Android (Google) Code Review
parent df07d10609 a68a28640f
commit bfbf02f8dd
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/pm/UserManagerService.java
View File

@@ -88,6 +88,7 @@ import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.app.IAppOpsService;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.os.BackgroundThread;
import com.android.internal.util.DumpUtils;
import com.android.internal.util.FastXmlSerializer;
import com.android.internal.util.Preconditions;
@@ -387,7 +388,9 @@ public class UserManagerService extends IUserManager.Stub {
}
final IntentSender target = intent.getParcelableExtra(Intent.EXTRA_INTENT);
final int userHandle = intent.getIntExtra(Intent.EXTRA_USER_ID, UserHandle.USER_NULL);
setQuietModeEnabled(userHandle, false, target);
// Call setQuietModeEnabled on bg thread to avoid ANR
BackgroundThread.getHandler()
.post(() -> setQuietModeEnabled(userHandle, false, target));
}
};