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

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

Browse Source
This commit is contained in:
Dianne Hackborn
2015-08-03 23:10:07 +00:00
committed by Android (Google) Code Review
parent 7290d93df9 28ec27cbfa
commit 3011f645ab
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/ApplicationPackageManager.java
View File

@@ -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);
}

2
core/java/android/content/pm/IPackageManager.aidl
View File

@@ -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(

3
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -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,

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

@@ -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