Skip to content

Commit f5912ff

Browse files
Merge pull request #657 from TakayukiHoshi1984/modify_demolib_readme
dConnectDemoLib 関連の更新
2 parents eadf01a + 6cc2e52 commit f5912ff

12 files changed

Lines changed: 435 additions & 8 deletions

File tree

dConnectManager/dConnectManager/dconnect-manager-core/src/main/java/org/deviceconnect/android/manager/core/plugin/DevicePluginManager.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ private List<DevicePlugin> getInstalledPluginsForPackage(final PackageManager pk
338338
*/
339339
private List<DevicePlugin> getInstalledServices(final PackageManager pkgMgr) {
340340
List<DevicePlugin> result = new ArrayList<>();
341-
List<PackageInfo> pkgList = pkgMgr.getInstalledPackages(PackageManager.GET_SERVICES);
341+
List<PackageInfo> pkgList = pkgMgr.getInstalledPackages(PackageManager.GET_SERVICES | PackageManager.GET_PROVIDERS);
342342
for (PackageInfo pkg : pkgList) {
343343
result.addAll(getInstalledServicesForPackage(pkgMgr, pkg));
344344
}
@@ -380,7 +380,7 @@ private List<DevicePlugin> getInstalledServicesForPackage(final PackageManager p
380380
*/
381381
private List<DevicePlugin> getInstalledReceivers(final PackageManager pkgMgr) {
382382
List<DevicePlugin> result = new ArrayList<>();
383-
List<PackageInfo> pkgList = pkgMgr.getInstalledPackages(PackageManager.GET_RECEIVERS);
383+
List<PackageInfo> pkgList = pkgMgr.getInstalledPackages(PackageManager.GET_RECEIVERS | PackageManager.GET_PROVIDERS);
384384
for (PackageInfo pkg : pkgList) {
385385
result.addAll(getInstalledReceiversForPackage(pkgMgr, pkg));
386386
}
@@ -423,7 +423,7 @@ private void checkAndAddDevicePlugin(final String packageName) {
423423
}
424424
PackageManager pkgMgr = mContext.getPackageManager();
425425
try {
426-
int flag = PackageManager.GET_SERVICES | PackageManager.GET_RECEIVERS;
426+
int flag = PackageManager.GET_SERVICES | PackageManager.GET_RECEIVERS | PackageManager.GET_PROVIDERS;
427427
PackageInfo pkg = pkgMgr.getPackageInfo(packageName, flag);
428428
mLogger.info("PluginManager: get package info: " + pkg);
429429
if (pkg != null) {

0 commit comments

Comments
 (0)