Merge "Fix NNFE when starting PersistentDataBlock" into sc-dev (48be161c) · Commits · e / os / android_frameworks_base

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;
		}