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

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

Merge "Use PackageManagerInternal instead of PackageManager in PlatformCompat."

parents abeb2932 331fd66f

services/core/java/com/android/server/compat/PlatformCompat.java

+9 −12
Original line number Original line Diff line number Diff line
@@ -20,7 +20,7 @@ import android.app.ActivityManager; 
import android.app.IActivityManager;

import android.app.IActivityManager;

import android.content.Context;

import android.content.Context;

import android.content.pm.ApplicationInfo;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.content.pm.PackageManagerInternal;

import android.os.Binder;

import android.os.Binder;

import android.os.RemoteException;

import android.os.RemoteException;

import android.os.UserHandle;

import android.os.UserHandle;
@@ -32,6 +32,7 @@ import com.android.internal.compat.CompatibilityChangeConfig; 
import com.android.internal.compat.CompatibilityChangeInfo;

import com.android.internal.compat.CompatibilityChangeInfo;

import com.android.internal.compat.IPlatformCompat;

import com.android.internal.compat.IPlatformCompat;

import com.android.internal.util.DumpUtils;

import com.android.internal.util.DumpUtils;

import com.android.server.LocalServices;





import java.io.FileDescriptor;

import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.io.PrintWriter;
@@ -197,12 +198,8 @@ public class PlatformCompat extends IPlatformCompat.Stub { 
    }

    }





    private ApplicationInfo getApplicationInfo(String packageName, int userId) {

    private ApplicationInfo getApplicationInfo(String packageName, int userId) {

        try {

        return LocalServices.getService(PackageManagerInternal.class).getApplicationInfo(

            return mContext.getPackageManager().getApplicationInfoAsUser(packageName, 0, userId);

                packageName, 0, userId, userId);

        } catch (PackageManager.NameNotFoundException e) {

            Slog.e(TAG, "No installed package " + packageName);

        }

        return null;

    }

    }





    private void reportChange(long changeId, int uid, int state) {

    private void reportChange(long changeId, int uid, int state) {
@@ -210,11 +207,11 @@ public class PlatformCompat extends IPlatformCompat.Stub { 
    }

    }





    private void killPackage(String packageName) {

    private void killPackage(String packageName) {

        int uid = -1;

        int uid = LocalServices.getService(PackageManagerInternal.class).getPackageUid(packageName,

        try {

                    0, UserHandle.myUserId());

            uid = mContext.getPackageManager().getPackageUid(packageName, 0);



        } catch (PackageManager.NameNotFoundException e) {

        if (uid < 0) {

            Slog.w(TAG, "Didn't find package " + packageName + " on device.", e);

            Slog.w(TAG, "Didn't find package " + packageName + " on device.");

            return;

            return;

        }

        }