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

Commit a0f06dd3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix NNFE when starting PersistentDataBlock" into sc-dev am: 48be161c 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iced8af9ca13e748727b7014568db83c248067209
parents 1a84caf2 48be161c

services/core/java/com/android/server/PersistentDataBlockService.java

+9 −7
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.os.UserHandle; 
import android.os.UserManager;

import android.service.persistentdata.IPersistentDataBlockService;

import android.service.persistentdata.PersistentDataBlockManager;

import android.text.TextUtils;

import android.util.Slog;



import com.android.internal.R;
@@ -147,15 +148,16 @@ public class PersistentDataBlockService extends SystemService { 
    private int getAllowedUid(int userHandle) {

        String allowedPackage = mContext.getResources()

                .getString(R.string.config_persistentDataPackageName);

        PackageManager pm = mContext.getPackageManager();

        int allowedUid = -1;

        if (!TextUtils.isEmpty(allowedPackage)) {

            try {

            allowedUid = pm.getPackageUidAsUser(allowedPackage,

                    PackageManager.MATCH_SYSTEM_ONLY, userHandle);

                allowedUid = mContext.getPackageManager().getPackageUidAsUser(

                        allowedPackage, PackageManager.MATCH_SYSTEM_ONLY, userHandle);

            } catch (PackageManager.NameNotFoundException e) {

                // not expected

                Slog.e(TAG, "not able to find package " + allowedPackage, e);

            }

        }

        return allowedUid;

    }