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

Commit b27f59f6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove PackageManager.getResourcesForApplicationAsUser API"

parents cdc4627e c2d86618

packages/SettingsLib/src/com/android/settingslib/location/SettingsInjector.java

+6 −3
Original line number Diff line number Diff line
@@ -129,10 +129,14 @@ public class SettingsInjector { 
        if (Log.isLoggable(TAG, Log.DEBUG)) {

            Log.d(TAG, "Found services for profile id " + profileId + ": " + resolveInfos);

        }



        final PackageManager userPackageManager = mContext.createContextAsUser(

                userHandle, /* flags */ 0).getPackageManager();

        List<InjectedSetting> settings = new ArrayList<InjectedSetting>(resolveInfos.size());

        for (ResolveInfo resolveInfo : resolveInfos) {

            try {

                InjectedSetting setting = parseServiceInfo(resolveInfo, userHandle, pm);

                InjectedSetting setting = parseServiceInfo(resolveInfo, userHandle,

                        userPackageManager);

                if (setting == null) {

                    Log.w(TAG, "Unable to load service info " + resolveInfo);

                } else {
@@ -248,8 +252,7 @@ public class SettingsInjector { 
                        + SettingInjectorService.ATTRIBUTES_NAME + " tag");

            }



            Resources res = pm.getResourcesForApplicationAsUser(si.packageName,

                    userHandle.getIdentifier());

            Resources res = pm.getResourcesForApplication(si.packageName);

            return parseAttributes(si.packageName, si.name, userHandle, res, attrs);

        } catch (PackageManager.NameNotFoundException e) {

            throw new XmlPullParserException(