diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-12-02 20:59:43 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-12-02 20:59:54 +0000 |
| commit | 5fdceab488b6d2d9cb7928a1d3a226506ff266f5 (patch) | |
| tree | d1e9076670c56f2a667686997b64111a3c08bd49 | |
| parent | 98eaab2f2b7964fa03cdd5fb891d346a06bf4aed (diff) | |
| parent | 11e5bf5f854bc778f71ac6ea36770643c8737f63 (diff) | |
| download | Permission-5fdceab488b6d2d9cb7928a1d3a226506ff266f5.tar.gz | |
Make change and version bump to aml_per_331411000 for mainline module file: PermissionController/AndroidManifest.xmlaml_per_331411000
Change-Id: Ie4aa904515e9e455dacd3259e95c3e4dec9f6636
| -rw-r--r-- | PermissionController/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | PermissionController/src/com/android/permissioncontroller/privacysources/SafetyCenterReceiver.kt | 35 | ||||
| -rw-r--r-- | apex_manifest.json | 2 |
3 files changed, 21 insertions, 20 deletions
diff --git a/PermissionController/AndroidManifest.xml b/PermissionController/AndroidManifest.xml index 678907707..d13b796fb 100644 --- a/PermissionController/AndroidManifest.xml +++ b/PermissionController/AndroidManifest.xml @@ -4,8 +4,8 @@ xmlns:tools="http://schemas.android.com/tools" package="com.android.permissioncontroller" coreApp="true" - android:versionCode="331410000" - android:versionName="aml_per_331410000" + android:versionCode="331411000" + android:versionName="aml_per_331411000" > <original-package android:name="com.android.permissioncontroller" /> diff --git a/PermissionController/src/com/android/permissioncontroller/privacysources/SafetyCenterReceiver.kt b/PermissionController/src/com/android/permissioncontroller/privacysources/SafetyCenterReceiver.kt index 9254aabd9..89f197a05 100644 --- a/PermissionController/src/com/android/permissioncontroller/privacysources/SafetyCenterReceiver.kt +++ b/PermissionController/src/com/android/permissioncontroller/privacysources/SafetyCenterReceiver.kt @@ -76,11 +76,6 @@ class SafetyCenterReceiver( PermissionControllerApplication.get().applicationContext, SafetyCenterManager::class.java) - if (!safetyCenterManager.isSafetyCenterEnabled && - intent.action != ACTION_SAFETY_CENTER_ENABLED_CHANGED) { - return - } - val mapOfSourceIdsToSources = getMapOfSourceIdsToSources(context) when (intent.action) { @@ -91,24 +86,30 @@ class SafetyCenterReceiver( mapOfSourceIdsToSources.values) } ACTION_REFRESH_SAFETY_SOURCES -> { - val sourceIdsExtra = intent.getStringArrayExtra(EXTRA_REFRESH_SAFETY_SOURCE_IDS) - if (sourceIdsExtra != null && sourceIdsExtra.isNotEmpty()) { + if (safetyCenterManager.isSafetyCenterEnabled) { + val sourceIdsExtra = intent.getStringArrayExtra(EXTRA_REFRESH_SAFETY_SOURCE_IDS) + if (sourceIdsExtra != null && sourceIdsExtra.isNotEmpty()) { + refreshSafetySources( + context, + intent, + RefreshEvent.EVENT_REFRESH_REQUESTED, + mapOfSourceIdsToSources, + sourceIdsExtra.toList()) + } + } + } + + ACTION_BOOT_COMPLETED -> { + updateTileVisibility(context, safetyCenterManager.isSafetyCenterEnabled) + if (safetyCenterManager.isSafetyCenterEnabled) { refreshSafetySources( context, intent, - RefreshEvent.EVENT_REFRESH_REQUESTED, + RefreshEvent.EVENT_DEVICE_REBOOTED, mapOfSourceIdsToSources, - sourceIdsExtra.toList()) + mapOfSourceIdsToSources.keys.toList()) } } - ACTION_BOOT_COMPLETED -> { - refreshSafetySources( - context, - intent, - RefreshEvent.EVENT_DEVICE_REBOOTED, - mapOfSourceIdsToSources, - mapOfSourceIdsToSources.keys.toList()) - } } } diff --git a/apex_manifest.json b/apex_manifest.json index 337b14596..2332763a8 100644 --- a/apex_manifest.json +++ b/apex_manifest.json @@ -3,5 +3,5 @@ // Placeholder module version to be replaced during build. // Do not change! - "version": 331410000 + "version": 331411000 } |