PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change references to old loadSafeLabel method

Browse Source 
... to prevent proliferation of the method via copy+paste.

Bug: 77964730
Test: Built
Change-Id: I663879dbdf94c4c5e7d1146028fd5ff7610a1e44
This commit is contained in:
Philip P. Moltmann
2018-04-23 11:06:37 -07:00
parent f0fce68a9b
commit 952004c072
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/bluetooth/RequestPermissionActivity.java
View File

@@ -27,6 +27,7 @@ import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageItemInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
@@ -327,7 +328,10 @@ public class RequestPermissionActivity extends Activity implements
try { try {
ApplicationInfo applicationInfo = getPackageManager().getApplicationInfo( ApplicationInfo applicationInfo = getPackageManager().getApplicationInfo(
packageName, 0); 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) { } catch (PackageManager.NameNotFoundException e) {
Log.e(TAG, "Couldn't find app with package name " + packageName); Log.e(TAG, "Couldn't find app with package name " + packageName);
setResult(RESULT_CANCELED); setResult(RESULT_CANCELED);

5
src/com/android/settings/wifi/RequestToggleWiFiActivity.java
View File

@@ -23,6 +23,7 @@ import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageItemInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.os.Bundle; import android.os.Bundle;
@@ -80,7 +81,9 @@ public class RequestToggleWiFiActivity extends AlertActivity
try { try {
ApplicationInfo applicationInfo = getPackageManager().getApplicationInfo( ApplicationInfo applicationInfo = getPackageManager().getApplicationInfo(
packageName, 0); 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) { } catch (PackageManager.NameNotFoundException e) {
Log.e(LOG_TAG, "Couldn't find app with package name " + packageName); Log.e(LOG_TAG, "Couldn't find app with package name " + packageName);
finish(); finish();