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

Commit 03d8cdd3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Ensuring valid packageName when granting slice permission" into tm-dev am: bf2d6e02 

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



Change-Id: I7cdf3e67aeaed780dd36f4a32127aba288c9958a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 484cc5d3 bf2d6e02

services/core/java/com/android/server/slice/SlicePermissionManager.java

+14 −0
Original line number Diff line number Diff line
@@ -16,11 +16,13 @@ package com.android.server.slice; 


import android.content.ContentProvider;

import android.content.Context;

import android.content.pm.parsing.FrameworkParsingPackageUtils;

import android.net.Uri;

import android.os.Environment;

import android.os.Handler;

import android.os.Looper;

import android.os.Message;

import android.text.TextUtils;

import android.text.format.DateUtils;

import android.util.ArrayMap;

import android.util.ArraySet;
@@ -410,6 +412,7 @@ public class SlicePermissionManager implements DirtyTracker { 
        public PkgUser(String pkg, int userId) {

            mPkg = pkg;

            mUserId = userId;

            enforceValidPackage();

        }



        public PkgUser(String pkgUserStr) throws IllegalArgumentException {
@@ -420,6 +423,17 @@ public class SlicePermissionManager implements DirtyTracker { 
            } catch (Exception e) {

                throw new IllegalArgumentException(e);

            }

            enforceValidPackage();

        }



        private void enforceValidPackage() {

            String error = FrameworkParsingPackageUtils.validateName(

                    mPkg,

                    false /* requireSeparator */,

                    true /* requireFilename */);

            if (!TextUtils.isEmpty(error)) {

                throw new IllegalArgumentException((error));

            }

        }



        public String getPkg() {