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

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

Merge "Use only public or SystemAPI PackageInfo APIs"

parents 7e35e2f0 03dda3d0

src/com/android/packageinstaller/permission/model/AppPermissions.java

+3 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.packageinstaller.permission.model;



import static com.android.packageinstaller.permission.utils.Utils.DEFAULT_MAX_LABEL_SIZE_PX;



import android.content.Context;

import android.content.pm.PackageInfo;

import android.content.pm.PackageItemInfo;
@@ -69,7 +71,7 @@ public final class AppPermissions { 
        mPackageInfo = packageInfo;

        mAppLabel = BidiFormatter.getInstance().unicodeWrap(

                packageInfo.applicationInfo.loadSafeLabel(context.getPackageManager(),

                        PackageItemInfo.DEFAULT_MAX_LABEL_SIZE_PX,

                        DEFAULT_MAX_LABEL_SIZE_PX,

                        PackageItemInfo.SAFE_LABEL_FLAG_TRIM

                                | PackageItemInfo.SAFE_LABEL_FLAG_FIRST_LINE)

                        .toString());

src/com/android/packageinstaller/permission/ui/handheld/PermissionPreference.java

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.packageinstaller.permission.ui.handheld;



import static com.android.packageinstaller.permission.utils.Utils.DEFAULT_MAX_LABEL_SIZE_PX;

import static com.android.packageinstaller.permission.utils.Utils.getRequestMessage;



import static java.lang.annotation.RetentionPolicy.SOURCE;
@@ -427,7 +428,7 @@ class PermissionPreference extends MultiTargetSwitchPreference { 
    private String getAppLabel() {

        return BidiFormatter.getInstance().unicodeWrap(

                mGroup.getApp().applicationInfo.loadSafeLabel(getContext().getPackageManager(),

                        PackageItemInfo.DEFAULT_MAX_LABEL_SIZE_PX,

                        DEFAULT_MAX_LABEL_SIZE_PX,

                        PackageItemInfo.SAFE_LABEL_FLAG_TRIM

                                | PackageItemInfo.SAFE_LABEL_FLAG_FIRST_LINE)

                        .toString());

src/com/android/packageinstaller/permission/utils/Utils.java

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ public final class Utils { 


    public static final String OS_PKG = "android";



    public static final float DEFAULT_MAX_LABEL_SIZE_PX = 500f;



    public static final String[] MODERN_PERMISSION_GROUPS = {

            Manifest.permission_group.CALENDAR,

            Manifest.permission_group.CALL_LOG,