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

Commit 3011f645 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #22912704: "android.process.acore has stopped" dialog keeps... 

Merge "Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping up" into mnc-dev
parents 7290d93d 28ec27cb

core/java/android/app/ApplicationPackageManager.java

+3 −1
Original line number Diff line number Diff line
@@ -777,7 +777,9 @@ final class ApplicationPackageManager extends PackageManager { 
    public List<ProviderInfo> queryContentProviders(String processName,

                                                    int uid, int flags) {

        try {

            return mPM.queryContentProviders(processName, uid, flags);

            ParceledListSlice<ProviderInfo> slice

                    = mPM.queryContentProviders(processName, uid, flags);

            return slice != null ? slice.getList() : null;

        } catch (RemoteException e) {

            throw new RuntimeException("Package manager has died", e);

        }

core/java/android/content/pm/IPackageManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ interface IPackageManager { 
    void querySyncProviders(inout List<String> outNames,

            inout List<ProviderInfo> outInfo);



    List<ProviderInfo> queryContentProviders(

    ParceledListSlice queryContentProviders(

            String processName, int uid, int flags);



    InstrumentationInfo getInstrumentationInfo(

services/core/java/com/android/server/am/ActivityManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -9154,9 +9154,10 @@ public final class ActivityManagerService extends ActivityManagerNative 
    private final List<ProviderInfo> generateApplicationProvidersLocked(ProcessRecord app) {

        List<ProviderInfo> providers = null;

        try {

            providers = AppGlobals.getPackageManager().

            ParceledListSlice<ProviderInfo> slice = AppGlobals.getPackageManager().

                queryContentProviders(app.processName, app.uid,

                        STOCK_PM_FLAGS | PackageManager.GET_URI_PERMISSION_PATTERNS);

            providers = slice != null ? slice.getList() : null;

        } catch (RemoteException ex) {

        }

        if (DEBUG_MU) Slog.v(TAG_MU,

services/core/java/com/android/server/pm/PackageManagerService.java

+3 −2
Original line number Diff line number Diff line
@@ -5435,7 +5435,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
    }















    @Override













    public List<ProviderInfo> queryContentProviders(String processName,













    public ParceledListSlice<ProviderInfo> queryContentProviders(String processName,















            int uid, int flags) {















        ArrayList<ProviderInfo> finalList = null;















        // reader










@@ -5467,9 +5467,10 @@ public class PackageManagerService extends IPackageManager.Stub {



























        if (finalList != null) {















            Collections.sort(finalList, mProviderInitOrderSorter);













            return new ParceledListSlice<ProviderInfo>(finalList);















        }



























        return finalList;













        return null;















    }





























    @Override