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

Commit 25a1181f authored by Zoltan Szatmary-Ban's avatar Zoltan Szatmary-Ban Committed by Android (Google) Code Review
Browse files

Merge "Bring up correct app for Recent location list items" into lmp-mr1-dev

parents 209c9465 d80e1278
Loading
Loading
Loading
Loading
+6 −4
Original line number Diff line number Diff line
@@ -61,9 +61,11 @@ public class RecentLocationApps {
    private class PackageEntryClickedListener
            implements Preference.OnPreferenceClickListener {
        private String mPackage;
        private UserHandle mUserHandle;

        public PackageEntryClickedListener(String packageName) {
        public PackageEntryClickedListener(String packageName, UserHandle userHandle) {
            mPackage = packageName;
            mUserHandle = userHandle;
        }

        @Override
@@ -71,8 +73,8 @@ public class RecentLocationApps {
            // start new fragment to display extended information
            Bundle args = new Bundle();
            args.putString(InstalledAppDetails.ARG_PACKAGE_NAME, mPackage);
            mActivity.startPreferencePanel(InstalledAppDetails.class.getName(), args,
                    R.string.application_info_label, null, null, 0);
            mActivity.startPreferencePanelAsUser(InstalledAppDetails.class.getName(), args,
                    R.string.application_info_label, null, mUserHandle);
            return true;
        }
    }
@@ -200,7 +202,7 @@ public class RecentLocationApps {
            }
            preference = createRecentLocationEntry(icon,
                    appLabel, highBattery, badgedAppLabel,
                    new PackageEntryClickedListener(packageName));
                    new PackageEntryClickedListener(packageName, userHandle));
        } catch (RemoteException e) {
            Log.w(TAG, "Error while retrieving application info for package " + packageName
                    + ", userId " + userId, e);