diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-08-03 15:28:28 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2015-08-03 15:28:28 -0700 |
| commit | 28ec27cbfa157c242fd9330a10c7c2b8ea838694 (patch) | |
| tree | 65afe7f7b65a00faf24b6063314b40e94c3dc1ce /core/java/android | |
| parent | 0ca1e98fdf300ddbbccbfce26bba5947109597f1 (diff) | |
| download | frameworks_base-28ec27cbfa157c242fd9330a10c7c2b8ea838694.zip frameworks_base-28ec27cbfa157c242fd9330a10c7c2b8ea838694.tar.gz frameworks_base-28ec27cbfa157c242fd9330a10c7c2b8ea838694.tar.bz2 | |
Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping up
Slice 'em up!
Change-Id: Ibba3af7ec5b7f92e6d5e55a57aa838a7f7f936e1
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/ApplicationPackageManager.java | 4 | ||||
| -rw-r--r-- | core/java/android/content/pm/IPackageManager.aidl | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index dbe91f9..0adce5d 100644 --- a/core/java/android/app/ApplicationPackageManager.java +++ b/core/java/android/app/ApplicationPackageManager.java @@ -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); } diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl index 0336645..a5e9faf 100644 --- a/core/java/android/content/pm/IPackageManager.aidl +++ b/core/java/android/content/pm/IPackageManager.aidl @@ -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( |