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

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

Merge "Fix permission check for system service" into udc-dev am: 04463d67 am: 4ada4023 

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



Change-Id: Ia4d04405689cb7a81993add0185b77b6a5454f06
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4c8d9914 4ada4023

core/java/android/service/credentials/CredentialProviderInfoFactory.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -166,8 +166,7 @@ public final class CredentialProviderInfoFactory { 
            Slog.w(TAG, "Context is null in isSystemProviderWithValidPermission");

            Slog.w(TAG, "Context is null in isSystemProviderWithValidPermission");

            return false;

            return false;

        }

        }

        return PermissionUtils.isSystemApp(context, serviceInfo.packageName)

        return PermissionUtils.hasPermission(context, serviceInfo.packageName,

                && PermissionUtils.hasPermission(context, serviceInfo.packageName,

                Manifest.permission.PROVIDE_DEFAULT_ENABLED_CREDENTIAL_SERVICE);

                Manifest.permission.PROVIDE_DEFAULT_ENABLED_CREDENTIAL_SERVICE);

    }

    }

core/java/android/service/credentials/PermissionUtils.java

+0 −17
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ 
package android.service.credentials;

package android.service.credentials;





import android.content.Context;

import android.content.Context;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager;





/**

/**
@@ -33,21 +32,5 @@ public class PermissionUtils { 
        return context.getPackageManager().checkPermission(permission, packageName)

        return context.getPackageManager().checkPermission(permission, packageName)

                == PackageManager.PERMISSION_GRANTED;

                == PackageManager.PERMISSION_GRANTED;

    }

    }



    /** Checks whether the given package name is a system app on the device **/

    public static boolean isSystemApp(Context context, String packageName) {

        try {

            ApplicationInfo appInfo =

                    context.getPackageManager()

                            .getApplicationInfo(packageName,

                                    PackageManager.ApplicationInfoFlags.of(

                                            PackageManager.MATCH_SYSTEM_ONLY));

            if (appInfo != null) {

                return true;

            }

        } catch (PackageManager.NameNotFoundException e) {

        }

        return false;

    }

}

}