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

Skip to content
Unverified Commit 4ae2322c authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-security-14.0.0_r12' of...

Merge tag 'android-security-14.0.0_r12' of https://android.googlesource.com/platform/packages/apps/Settings into HEAD

Android security 14.0.0 release 12

* tag 'android-security-14.0.0_r12' of https://android.googlesource.com/platform/packages/apps/Settings:
  RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning
  Ignore fragment attr from ext authenticator resource
  Limit wifi item edit content's max length to 500
  [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity
  Replace getCallingActivity() with getLaunchedFromPackage()
  [RESTRICT AUTOMERGE] Restrict WifiDialogActivity
  Validate ringtone URIs before setting
  Make sure work profile app cant enable notification listener services

 Conflicts:
	src/com/android/settings/homepage/SettingsHomepageActivity.java
	src/com/android/settings/notification/NotificationAccessConfirmationActivity.java
	src/com/android/settings/search/SearchResultTrampoline.java

Change-Id: I1c4b82ffedb7db1669549c1669cbac2c00b9e0e4
parents 5b700295 ae9ac44a
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment