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

Handling exception when per-use prompt cannot be generated

Browse Source 
Add handling corner cases when the system fails to generate per-use prompt for
device log access. This change addresses when the passed package name is
null or the application info cannot be found.

Bug: 228053177
Test: CtsVerifier
Ignore-AOSP-First: pending fix for logcat privacy issue
Change-Id: I03058599332108821d461bbe38072a23bae2ed3c
This commit is contained in:
eunjeongshin
2022-04-12 20:38:39 +00:00
parent d405fc4491
commit 4ae1ea9fba
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);
if (mPackageName == null || mPackageName.length() == 0) {
throw new NullPointerException("Package Name is null");
}
mUid = intent.getIntExtra("com.android.server.logcat.uid", 0);
mGid = intent.getIntExtra("com.android.server.logcat.gid", 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,
PackageManager.MATCH_DIRECT_BOOT_AUTO,
UserHandle.getUserId(uid)).loadLabel(pm);
if (appLabel == null) {
if (appLabel == null || appLabel.length() == 0) {
throw new NameNotFoundException("Application Label is null");
}
return context.getString(com.android.internal.R.string.log_access_confirmation_title,
appLabel);
String titleString = context.getString(
com.android.internal.R.string.log_access_confirmation_title, appLabel);
if (titleString == null || titleString.length() == 0) {
throw new NullPointerException("Title is null");
}
return titleString;
}
/**