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

Commit 7ce6ba52 authored by android-build-team Robot's avatar android-build-team Robot Committed by Android (Google) Code Review
Browse files

Merge "Change references to old loadSafeLabel method"

parents 0e79a3a7 952004c0

src/com/android/settings/bluetooth/RequestPermissionActivity.java

+5 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.content.DialogInterface; 
import android.content.Intent;

import android.content.IntentFilter;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageItemInfo;

import android.content.pm.PackageManager;

import android.os.Bundle;

import android.text.TextUtils;
@@ -327,7 +328,10 @@ public class RequestPermissionActivity extends Activity implements 
            try {

                ApplicationInfo applicationInfo = getPackageManager().getApplicationInfo(

                        packageName, 0);

                mAppLabel = applicationInfo.loadSafeLabel(getPackageManager());

                mAppLabel = applicationInfo.loadSafeLabel(getPackageManager(),

                        PackageItemInfo.DEFAULT_MAX_LABEL_SIZE_PX,

                        PackageItemInfo.SAFE_LABEL_FLAG_TRIM

                                | PackageItemInfo.SAFE_LABEL_FLAG_FIRST_LINE);

            } catch (PackageManager.NameNotFoundException e) {

                Log.e(TAG, "Couldn't find app with package name " + packageName);

                setResult(RESULT_CANCELED);

src/com/android/settings/wifi/RequestToggleWiFiActivity.java

+4 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.DialogInterface; 
import android.content.Intent;

import android.content.IntentFilter;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageItemInfo;

import android.content.pm.PackageManager;

import android.net.wifi.WifiManager;

import android.os.Bundle;
@@ -80,7 +81,9 @@ public class RequestToggleWiFiActivity extends AlertActivity 
        try {

            ApplicationInfo applicationInfo = getPackageManager().getApplicationInfo(

                    packageName, 0);

            mAppLabel = applicationInfo.loadSafeLabel(getPackageManager());

            mAppLabel = applicationInfo.loadSafeLabel(getPackageManager(),

                    PackageItemInfo.DEFAULT_MAX_LABEL_SIZE_PX, PackageItemInfo.SAFE_LABEL_FLAG_TRIM

                            | PackageItemInfo.SAFE_LABEL_FLAG_FIRST_LINE);

        } catch (PackageManager.NameNotFoundException e) {

            Log.e(LOG_TAG, "Couldn't find app with package name " + packageName);

            finish();