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

Merge "Add unaudited exported flag to exposed runtime receivers"

Browse Source
This commit is contained in:
Michael Groover
2022-01-10 21:01:08 +00:00
committed by Android (Google) Code Review
parent e9c5945466 0a46c2f78c
commit ca87e082ba
8 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractConnectivityPreferenceController.java
View File

@@ -73,7 +73,8 @@ public abstract class AbstractConnectivityPreferenceController
}
mContext.registerReceiver(mConnectivityReceiver, connectivityIntentFilter,
android.Manifest.permission.CHANGE_NETWORK_STATE, null);
android.Manifest.permission.CHANGE_NETWORK_STATE, null,
Context.RECEIVER_EXPORTED_UNAUDITED);
}
protected abstract String[] getConnectivityIntents();

3
services/core/java/com/android/server/notification/CountdownConditionProvider.java
View File

@@ -94,7 +94,8 @@ public class CountdownConditionProvider extends SystemConditionProviderService {
@Override
public void onConnected() {
if (DEBUG) Slog.d(TAG, "onConnected");
mContext.registerReceiver(mReceiver, new IntentFilter(ACTION));
mContext.registerReceiver(mReceiver, new IntentFilter(ACTION),
Context.RECEIVER_EXPORTED_UNAUDITED);
mConnected = true;
}

3
services/core/java/com/android/server/notification/EventConditionProvider.java
View File

@@ -306,7 +306,8 @@ public class EventConditionProvider extends SystemConditionProviderService {
filter.addAction(Intent.ACTION_TIME_CHANGED);
filter.addAction(Intent.ACTION_TIMEZONE_CHANGED);
filter.addAction(ACTION_EVALUATE);
registerReceiver(mReceiver, filter);
registerReceiver(mReceiver, filter,
Context.RECEIVER_EXPORTED_UNAUDITED);
} else {
unregisterReceiver(mReceiver);
}

3
services/core/java/com/android/server/notification/NotificationHistoryDatabase.java
View File

@@ -100,7 +100,8 @@ public class NotificationHistoryDatabase {
IntentFilter deletionFilter = new IntentFilter(ACTION_HISTORY_DELETION);
deletionFilter.addDataScheme(SCHEME_DELETION);
mContext.registerReceiver(mFileCleanupReceiver, deletionFilter);
mContext.registerReceiver(mFileCleanupReceiver, deletionFilter,
Context.RECEIVER_EXPORTED_UNAUDITED);
}
public void init() {

3
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -2334,7 +2334,8 @@ public class NotificationManagerService extends SystemService {
IntentFilter timeoutFilter = new IntentFilter(ACTION_NOTIFICATION_TIMEOUT);
timeoutFilter.addDataScheme(SCHEME_TIMEOUT);
getContext().registerReceiver(mNotificationTimeoutReceiver, timeoutFilter);
getContext().registerReceiver(mNotificationTimeoutReceiver, timeoutFilter,
Context.RECEIVER_EXPORTED_UNAUDITED);
IntentFilter settingsRestoredFilter = new IntentFilter(Intent.ACTION_SETTING_RESTORED);
getContext().registerReceiver(mRestoreReceiver, settingsRestoredFilter);

3
services/core/java/com/android/server/notification/ScheduleConditionProvider.java
View File

@@ -261,7 +261,8 @@ public class ScheduleConditionProvider extends SystemConditionProviderService {
filter.addAction(Intent.ACTION_TIMEZONE_CHANGED);
filter.addAction(ACTION_EVALUATE);
filter.addAction(AlarmManager.ACTION_NEXT_ALARM_CLOCK_CHANGED);
registerReceiver(mReceiver, filter);
registerReceiver(mReceiver, filter,
Context.RECEIVER_EXPORTED_UNAUDITED);
} else {
unregisterReceiver(mReceiver);
}

3
services/core/java/com/android/server/notification/SnoozeHelper.java
View File

@@ -116,7 +116,8 @@ public class SnoozeHelper {
mContext = context;
IntentFilter filter = new IntentFilter(REPOST_ACTION);
filter.addDataScheme(REPOST_SCHEME);
mContext.registerReceiver(mBroadcastReceiver, filter);
mContext.registerReceiver(mBroadcastReceiver, filter,
Context.RECEIVER_EXPORTED_UNAUDITED);
mAm = (AlarmManager) mContext.getSystemService(Context.ALARM_SERVICE);
mCallback = callback;
mUserProfiles = userProfiles;

2
services/tests/uiservicestests/src/com/android/server/notification/NotificationHistoryDatabaseTest.java
View File

@@ -108,7 +108,7 @@ public class NotificationHistoryDatabaseTest extends UiServiceTestCase {
@Test
public void testDeletionReceiver() {
verify(mContext, times(1)).registerReceiver(any(), any());
verify(mContext, times(1)).registerReceiver(any(), any(), anyInt());
}
@Test