Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9075bd8b authored by Hai Zhang's avatar Hai Zhang Committed by android-build-merger
Browse files

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

am: eb90b66c

Change-Id: I729f70641a3143a31967bf8e5c425299a5608df2
parents 520ffb3f eb90b66c

services/core/java/com/android/server/role/RoleManagerService.java

+1 −3
Original line number Diff line number Diff line
@@ -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);

    }