Settings: don't try to allow NLSes with too-long component names
* NotificationAccessConfirmationActivity (triggered through CompanionDeviceManager) -> Don't show the dialog, bail out early similarly to other invalid inputs. * NotificationAccessSettings (from Special App Access) -> No changes, but use the canonical constant now. * ApprovalPreferenceController (used in NotificationAccessDetails) -> Disable the toggle, unless the NLS was previously approved (in which case it can still be removed). Fixes: 260570119 Fixes: 286043036 Test: atest + manually (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:027f0a46aee333ba29b904cf366c9d81794cf088) Merged-In: Ifc048311746c027e3683cdcf65f1079d04cf7c56 Change-Id: Ifc048311746c027e3683cdcf65f1079d04cf7c56
This commit is contained in:
committed by
Android Build Coastguard Worker
parent
ab0b6f499f
commit
d55910971e
@@ -67,7 +67,9 @@ public class NotificationAccessConfirmationActivity extends Activity
|
||||
mUserId = getIntent().getIntExtra(EXTRA_USER_ID, UserHandle.USER_NULL);
|
||||
CharSequence mAppLabel;
|
||||
|
||||
if (mComponentName == null || mComponentName.getPackageName() == null) {
|
||||
if (mComponentName == null || mComponentName.getPackageName() == null
|
||||
|| mComponentName.flattenToString().length()
|
||||
> NotificationManager.MAX_SERVICE_COMPONENT_NAME_LENGTH) {
|
||||
finish();
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user