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

Merge "Revert "Explicitly mark receivers as RECEIVER_NOT_EXPORTED""

Browse Source
This commit is contained in:
Michael Groover
2022-03-25 23:13:28 +00:00
committed by Gerrit Code Review
parent d1233a6941 62c6955c2f
commit 068b9f4372
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/am/DataConnectionStats.java
View File

@@ -73,8 +73,7 @@ public class DataConnectionStats extends BroadcastReceiver {
IntentFilter filter = new IntentFilter(); IntentFilter filter = new IntentFilter();
filter.addAction(Intent.ACTION_SIM_STATE_CHANGED); filter.addAction(Intent.ACTION_SIM_STATE_CHANGED);
mContext.registerReceiver(this, filter, null /* broadcastPermission */, mListenerHandler, mContext.registerReceiver(this, filter, null /* broadcastPermission */, mListenerHandler);
Context.RECEIVER_NOT_EXPORTED);
} }
@Override @Override

2
services/core/java/com/android/server/vcn/TelephonySubscriptionTracker.java
View File

@@ -145,7 +145,7 @@ public class TelephonySubscriptionTracker extends BroadcastReceiver {
filter.addAction(ACTION_CARRIER_CONFIG_CHANGED); filter.addAction(ACTION_CARRIER_CONFIG_CHANGED);
filter.addAction(ACTION_MULTI_SIM_CONFIG_CHANGED); filter.addAction(ACTION_MULTI_SIM_CONFIG_CHANGED);
mContext.registerReceiver(this, filter, null, mHandler, Context.RECEIVER_NOT_EXPORTED); mContext.registerReceiver(this, filter, null, mHandler);
mSubscriptionManager.addOnSubscriptionsChangedListener( mSubscriptionManager.addOnSubscriptionsChangedListener(
executor, mSubscriptionChangedListener); executor, mSubscriptionChangedListener);
mTelephonyManager.registerTelephonyCallback(executor, mActiveDataSubIdListener); mTelephonyManager.registerTelephonyCallback(executor, mActiveDataSubIdListener);

5
tests/vcn/java/com/android/server/vcn/TelephonySubscriptionTrackerTest.java
View File

@@ -174,7 +174,7 @@ public class TelephonySubscriptionTrackerTest {
private IntentFilter getIntentFilter() { private IntentFilter getIntentFilter() {
final ArgumentCaptor<IntentFilter> captor = ArgumentCaptor.forClass(IntentFilter.class); final ArgumentCaptor<IntentFilter> captor = ArgumentCaptor.forClass(IntentFilter.class);
verify(mContext).registerReceiver(any(), captor.capture(), any(), any(), anyInt()); verify(mContext).registerReceiver(any(), captor.capture(), any(), any());
return captor.getValue(); return captor.getValue();
} }
@@ -258,8 +258,7 @@ public class TelephonySubscriptionTrackerTest {
eq(mTelephonySubscriptionTracker), eq(mTelephonySubscriptionTracker),
any(IntentFilter.class), any(IntentFilter.class),
any(), any(),
eq(mHandler), eq(mHandler));
eq(Context.RECEIVER_NOT_EXPORTED));
final IntentFilter filter = getIntentFilter(); final IntentFilter filter = getIntentFilter();
assertEquals(2, filter.countActions()); assertEquals(2, filter.countActions());
assertTrue(filter.hasAction(ACTION_CARRIER_CONFIG_CHANGED)); assertTrue(filter.hasAction(ACTION_CARRIER_CONFIG_CHANGED));