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

Commit 1a2e6b60 authored by Song Chun Fan's avatar Song Chun Fan Committed by Automerger Merge Worker
Browse files

Merge "[pm] get userId from context for getInstallSourceInfo" into udc-dev am:... 

Merge "[pm] get userId from context for getInstallSourceInfo" into udc-dev am: 680542de am: 8fe4e04c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22085489



Change-Id: Ib1928cbe99d83d945b9f511eb55e9fd1b52460b4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 173c7a9f 8fe4e04c

apex/jobscheduler/service/java/com/android/server/tare/InstalledPackageInfo.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.server.tare; 
import android.Manifest;

import android.Manifest;

import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.UserIdInt;

import android.app.AppGlobals;

import android.app.AppGlobals;

import android.content.Context;

import android.content.Context;

import android.content.PermissionChecker;

import android.content.PermissionChecker;
@@ -41,7 +42,8 @@ class InstalledPackageInfo { 
    @Nullable

    @Nullable

    public final String installerPackageName;

    public final String installerPackageName;





    InstalledPackageInfo(@NonNull Context context, @NonNull PackageInfo packageInfo) {

    InstalledPackageInfo(@NonNull Context context, @UserIdInt int userId,

            @NonNull PackageInfo packageInfo) {

        final ApplicationInfo applicationInfo = packageInfo.applicationInfo;

        final ApplicationInfo applicationInfo = packageInfo.applicationInfo;

        uid = applicationInfo == null ? NO_UID : applicationInfo.uid;

        uid = applicationInfo == null ? NO_UID : applicationInfo.uid;

        packageName = packageInfo.packageName;

        packageName = packageInfo.packageName;
@@ -55,7 +57,8 @@ class InstalledPackageInfo { 
                applicationInfo.uid, packageName);

                applicationInfo.uid, packageName);

        InstallSourceInfo installSourceInfo = null;

        InstallSourceInfo installSourceInfo = null;

        try {

        try {

            installSourceInfo = AppGlobals.getPackageManager().getInstallSourceInfo(packageName);

            installSourceInfo = AppGlobals.getPackageManager().getInstallSourceInfo(packageName,

                    userId);

        } catch (RemoteException e) {

        } catch (RemoteException e) {

            // Shouldn't happen.

            // Shouldn't happen.

        }

        }

apex/jobscheduler/service/java/com/android/server/tare/InternalResourceService.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -625,7 +625,8 @@ public class InternalResourceService extends SystemService { 
            mPackageToUidCache.add(userId, pkgName, uid);

            mPackageToUidCache.add(userId, pkgName, uid);

        }

        }

        synchronized (mLock) {

        synchronized (mLock) {

            final InstalledPackageInfo ipo = new InstalledPackageInfo(getContext(), packageInfo);

            final InstalledPackageInfo ipo = new InstalledPackageInfo(getContext(), userId,

                    packageInfo);

            final InstalledPackageInfo oldIpo = mPkgCache.add(userId, pkgName, ipo);

            final InstalledPackageInfo oldIpo = mPkgCache.add(userId, pkgName, ipo);

            maybeUpdateInstallerStatusLocked(oldIpo, ipo);

            maybeUpdateInstallerStatusLocked(oldIpo, ipo);

            mUidToPackageCache.add(uid, pkgName);

            mUidToPackageCache.add(uid, pkgName);
@@ -683,7 +684,7 @@ public class InternalResourceService extends SystemService { 
                    mPackageManager.getInstalledPackagesAsUser(PACKAGE_QUERY_FLAGS, userId);

                    mPackageManager.getInstalledPackagesAsUser(PACKAGE_QUERY_FLAGS, userId);

            for (int i = pkgs.size() - 1; i >= 0; --i) {

            for (int i = pkgs.size() - 1; i >= 0; --i) {

                final InstalledPackageInfo ipo =

                final InstalledPackageInfo ipo =

                        new InstalledPackageInfo(getContext(), pkgs.get(i));

                        new InstalledPackageInfo(getContext(), userId, pkgs.get(i));

                final InstalledPackageInfo oldIpo = mPkgCache.add(userId, ipo.packageName, ipo);

                final InstalledPackageInfo oldIpo = mPkgCache.add(userId, ipo.packageName, ipo);

                maybeUpdateInstallerStatusLocked(oldIpo, ipo);

                maybeUpdateInstallerStatusLocked(oldIpo, ipo);

            }

            }
@@ -963,7 +964,7 @@ public class InternalResourceService extends SystemService { 
                    mPackageManager.getInstalledPackagesAsUser(PACKAGE_QUERY_FLAGS, userId);

                    mPackageManager.getInstalledPackagesAsUser(PACKAGE_QUERY_FLAGS, userId);

            for (int i = pkgs.size() - 1; i >= 0; --i) {

            for (int i = pkgs.size() - 1; i >= 0; --i) {

                final InstalledPackageInfo ipo =

                final InstalledPackageInfo ipo =

                        new InstalledPackageInfo(getContext(), pkgs.get(i));

                        new InstalledPackageInfo(getContext(), userId, pkgs.get(i));

                final InstalledPackageInfo oldIpo = mPkgCache.add(userId, ipo.packageName, ipo);

                final InstalledPackageInfo oldIpo = mPkgCache.add(userId, ipo.packageName, ipo);

                maybeUpdateInstallerStatusLocked(oldIpo, ipo);

                maybeUpdateInstallerStatusLocked(oldIpo, ipo);

            }

            }

core/java/android/app/ApplicationPackageManager.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -2561,7 +2561,7 @@ public class ApplicationPackageManager extends PackageManager { 
    public InstallSourceInfo getInstallSourceInfo(String packageName) throws NameNotFoundException {

    public InstallSourceInfo getInstallSourceInfo(String packageName) throws NameNotFoundException {

        final InstallSourceInfo installSourceInfo;

        final InstallSourceInfo installSourceInfo;

        try {

        try {

            installSourceInfo = mPM.getInstallSourceInfo(packageName);

            installSourceInfo = mPM.getInstallSourceInfo(packageName, getUserId());

        } catch (RemoteException e) {

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

            throw e.rethrowFromSystemServer();

        }

        }

core/java/android/content/pm/IPackageManager.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -247,7 +247,7 @@ interface IPackageManager { 
    @UnsupportedAppUsage

    @UnsupportedAppUsage

    String getInstallerPackageName(in String packageName);

    String getInstallerPackageName(in String packageName);





    InstallSourceInfo getInstallSourceInfo(in String packageName);

    InstallSourceInfo getInstallSourceInfo(in String packageName, int userId);





    void resetApplicationPreferences(int userId);

    void resetApplicationPreferences(int userId);

core/java/android/content/pm/PackageManager.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -8666,7 +8666,7 @@ public abstract class PackageManager { 
     * requesting its own install information and is not an instant app.

     * requesting its own install information and is not an instant app.

     *

     *

     * @param packageName The name of the package to query

     * @param packageName The name of the package to query

     * @throws NameNotFoundException if the given package name is not installed

     * @throws NameNotFoundException if the given package name is not available to the caller.

     */

     */

    @NonNull

    @NonNull

    public InstallSourceInfo getInstallSourceInfo(@NonNull String packageName)

    public InstallSourceInfo getInstallSourceInfo(@NonNull String packageName)