Merge "Run performInitialGrantsIfNecessaryAsync() on main thread." into qt-dev

am: eb90b66cb5 Change-Id: I729f70641a3143a31967bf8e5c425299a5608df2
2019-04-23 23:45:05 -07:00
parent 520ffb3f45 eb90b66cb5
commit 9075bd8b1f
1 changed files with 1 additions and 3 deletions
--- a/services/core/java/com/android/server/role/RoleManagerService.java
+++ b/services/core/java/com/android/server/role/RoleManagerService.java
@@ -39,7 +39,6 @@ import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.PackageManagerInternal;
 import android.content.pm.Signature;
 import android.database.CursorWindow;
-import android.os.AsyncTask;
 import android.os.Binder;
 import android.os.Bundle;
 import android.os.Handler;
@@ -201,8 +200,7 @@ public class RoleManagerService extends SystemService implements RoleUserState.C
                    // Package is being upgraded - we're about to get ACTION_PACKAGE_ADDED
                    return;
                }
-                AsyncTask.THREAD_POOL_EXECUTOR.execute(
-                        () -> performInitialGrantsIfNecessaryAsync(userId));
+                performInitialGrantsIfNecessaryAsync(userId);
            }
        }, UserHandle.ALL, intentFilter, null, null);
    }