Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Handling exception when per-use prompt cannot be generated" into tm-dev

Browse Source
This commit is contained in:
Eun-Jeong Shin
2022-04-13 04:42:14 +00:00
committed by Android (Google) Code Review
parent e5ee7aa25f 4ae1ea9fba
commit 246ecfd412
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/logcat/LogAccessDialogActivity.java
View File

@@ -116,6 +116,10 @@ public class LogAccessDialogActivity extends Activity implements
} }
mPackageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME); mPackageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);
if (mPackageName == null || mPackageName.length() == 0) {
throw new NullPointerException("Package Name is null");
}
mUid = intent.getIntExtra("com.android.server.logcat.uid", 0); mUid = intent.getIntExtra("com.android.server.logcat.uid", 0);
mGid = intent.getIntExtra("com.android.server.logcat.gid", 0); mGid = intent.getIntExtra("com.android.server.logcat.gid", 0);
mPid = intent.getIntExtra("com.android.server.logcat.pid", 0); mPid = intent.getIntExtra("com.android.server.logcat.pid", 0);
@@ -154,12 +158,17 @@ public class LogAccessDialogActivity extends Activity implements
CharSequence appLabel = pm.getApplicationInfoAsUser(callingPackage, CharSequence appLabel = pm.getApplicationInfoAsUser(callingPackage,
PackageManager.MATCH_DIRECT_BOOT_AUTO, PackageManager.MATCH_DIRECT_BOOT_AUTO,
UserHandle.getUserId(uid)).loadLabel(pm); UserHandle.getUserId(uid)).loadLabel(pm);
if (appLabel == null) { if (appLabel == null || appLabel.length() == 0) {
throw new NameNotFoundException("Application Label is null"); throw new NameNotFoundException("Application Label is null");
} }
return context.getString(com.android.internal.R.string.log_access_confirmation_title, String titleString = context.getString(
appLabel); com.android.internal.R.string.log_access_confirmation_title, appLabel);
if (titleString == null || titleString.length() == 0) {
throw new NullPointerException("Title is null");
}
return titleString;
} }
/** /**