PawletOS/app_Settings
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-03 17:35:02 +00:00
committed by Android (Google) Code Review
parent 4b906d564d 911f7e7aa9
commit d1f76eea72
25 changed files with 52 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/accounts/WorkModePreferenceController.java
View File

@@ -58,7 +58,8 @@ public class WorkModePreferenceController extends BasePreferenceController imple
@Override
public void onStart() {
mContext.registerReceiver(mReceiver, mIntentFilter);
mContext.registerReceiver(mReceiver, mIntentFilter,
Context.RECEIVER_EXPORTED_UNAUDITED);
}
@Override

3
src/com/android/settings/bluetooth/AlwaysDiscoverable.java
View File

@@ -52,7 +52,8 @@ public class AlwaysDiscoverable extends BroadcastReceiver {
if (mStarted) {
return;
}
mContext.registerReceiver(this, mIntentFilter);
mContext.registerReceiver(this, mIntentFilter,
Context.RECEIVER_EXPORTED_UNAUDITED);
mStarted = true;
if (mBluetoothAdapter.getScanMode()
!= BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE) {

3
src/com/android/settings/bluetooth/BluetoothEnabler.java
View File

@@ -115,7 +115,8 @@ public final class BluetoothEnabler implements SwitchWidgetController.OnSwitchCh
}
mSwitchController.startListening();
mContext.registerReceiver(mReceiver, mIntentFilter);
mContext.registerReceiver(mReceiver, mIntentFilter,
Context.RECEIVER_EXPORTED_UNAUDITED);
mValidListener = true;
}

3
src/com/android/settings/connecteddevice/AddDevicePreferenceController.java
View File

@@ -57,7 +57,8 @@ public class AddDevicePreferenceController extends BasePreferenceController
@Override
public void onStart() {
mContext.registerReceiver(mReceiver, mIntentFilter);
mContext.registerReceiver(mReceiver, mIntentFilter,
Context.RECEIVER_EXPORTED_UNAUDITED);
}
@Override

3
src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java
View File

@@ -111,7 +111,8 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc
public void onStart() {
mBluetoothDeviceUpdater.registerCallback();
mSavedDockUpdater.registerCallback();
mContext.registerReceiver(mReceiver, mIntentFilter);
mContext.registerReceiver(mReceiver, mIntentFilter,
Context.RECEIVER_EXPORTED_UNAUDITED);
mBluetoothDeviceUpdater.refreshPreference();
}

3
src/com/android/settings/development/AdbQrcodeScannerFragment.java
View File

@@ -189,7 +189,8 @@ public class AdbQrcodeScannerFragment extends WifiDppQrCodeBaseFragment implemen
restartCamera();
mAdbManager = IAdbManager.Stub.asInterface(ServiceManager.getService(Context.ADB_SERVICE));
getActivity().registerReceiver(mReceiver, mIntentFilter);
getActivity().registerReceiver(mReceiver, mIntentFilter,
Context.RECEIVER_EXPORTED_UNAUDITED);
}
@Override

3
src/com/android/settings/development/WirelessDebuggingFragment.java
View File

@@ -227,7 +227,8 @@ public class WirelessDebuggingFragment extends DashboardFragment
public void onResume() {
super.onResume();
getActivity().registerReceiver(mReceiver, mIntentFilter);
getActivity().registerReceiver(mReceiver, mIntentFilter,
Context.RECEIVER_EXPORTED_UNAUDITED);
}
@Override

3
src/com/android/settings/location/LocationInjectedServiceBasePreferenceController.java
View File

@@ -99,7 +99,8 @@ public abstract class LocationInjectedServiceBasePreferenceController
};
}
mContext.registerReceiver(
mInjectedSettingsReceiver, INTENT_FILTER_INJECTED_SETTING_CHANGED);
mInjectedSettingsReceiver, INTENT_FILTER_INJECTED_SETTING_CHANGED,
Context.RECEIVER_EXPORTED_UNAUDITED);
}
/** @OnLifecycleEvent(ON_PAUSE) */

3
src/com/android/settings/network/ActiveSubscriptionsListener.java
View File

@@ -302,7 +302,8 @@ public abstract class ActiveSubscriptionsListener
mSubscriptionChangeReceiver = getSubscriptionChangeReceiver();
}
mContext.registerReceiver(mSubscriptionChangeReceiver,
mSubscriptionChangeIntentFilter, null, new Handler(mLooper));
mSubscriptionChangeIntentFilter, null, new Handler(mLooper),
Context.RECEIVER_EXPORTED_UNAUDITED);
registerForSubscriptionsChange();
mCacheState.compareAndSet(STATE_PREPARING, STATE_LISTENING);
return;

3
src/com/android/settings/network/InternetResetHelper.java
View File

@@ -105,7 +105,8 @@ public class InternetResetHelper implements LifecycleObserver,
/** @OnLifecycleEvent(Lifecycle.Event.ON_RESUME) */
@OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
public void onResume() {
mContext.registerReceiver(mWifiStateReceiver, mWifiStateFilter);
mContext.registerReceiver(mWifiStateReceiver, mWifiStateFilter,
Context.RECEIVER_EXPORTED_UNAUDITED);
}
/** @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE) */

3
src/com/android/settings/network/InternetUpdater.java
View File

@@ -182,7 +182,8 @@ public class InternetUpdater implements AirplaneModeEnabler.OnAirplaneModeChange
public void onResume() {
mAirplaneModeEnabler.start();
mConnectivityManager.registerDefaultNetworkCallback(mNetworkCallback);
mContext.registerReceiver(mWifiStateReceiver, mWifiStateFilter);
mContext.registerReceiver(mWifiStateReceiver, mWifiStateFilter,
Context.RECEIVER_EXPORTED_UNAUDITED);
}
/** @OnLifecycleEvent(ON_PAUSE) */

3
src/com/android/settings/network/apn/ApnSettings.java
View File

@@ -267,7 +267,8 @@ public class ApnSettings extends RestrictedSettingsFragment
return;
}
getActivity().registerReceiver(mReceiver, mIntentFilter);
getActivity().registerReceiver(mReceiver, mIntentFilter,
Context.RECEIVER_EXPORTED_UNAUDITED);
restartPhoneStateListener(mSubId);

3
src/com/android/settings/nfc/BaseNfcEnabler.java
View File

@@ -59,7 +59,8 @@ public abstract class BaseNfcEnabler {
return;
}
handleNfcStateChanged(mNfcAdapter.getAdapterState());
mContext.registerReceiver(mReceiver, mIntentFilter);
mContext.registerReceiver(mReceiver, mIntentFilter,
Context.RECEIVER_EXPORTED_UNAUDITED);
}
public void pause() {

3
src/com/android/settings/panel/VolumePanel.java
View File

@@ -74,7 +74,8 @@ public class VolumePanel implements PanelContent, LifecycleObserver {
public void onResume() {
final IntentFilter filter = new IntentFilter();
filter.addAction(MediaOutputConstants.ACTION_CLOSE_PANEL);
mContext.registerReceiver(mReceiver, filter);
mContext.registerReceiver(mReceiver, filter,
Context.RECEIVER_EXPORTED_UNAUDITED);
}
/** Invoked when the panel is paused. */

3
src/com/android/settings/security/CryptKeeperSettings.java
View File

@@ -131,7 +131,8 @@ public class CryptKeeperSettings extends InstrumentedPreferenceFragment {
@Override
public void onResume() {
super.onResume();
getActivity().registerReceiver(mIntentReceiver, mIntentFilter);
getActivity().registerReceiver(mIntentReceiver, mIntentFilter,
Context.RECEIVER_EXPORTED_UNAUDITED);
}
@Override

3
src/com/android/settings/users/UserSettings.java
View File

@@ -309,7 +309,8 @@ public class UserSettings extends SettingsPreferenceFragment
mAddSupervisedUser.setOnPreferenceClickListener(this);
activity.registerReceiverAsUser(
mUserChangeReceiver, UserHandle.ALL, USER_REMOVED_INTENT_FILTER, null, mHandler);
mUserChangeReceiver, UserHandle.ALL, USER_REMOVED_INTENT_FILTER, null, mHandler,
Context.RECEIVER_EXPORTED_UNAUDITED);
updateUI();
mShouldUpdateUserList = false;

3
src/com/android/settings/wifi/WifiEnabler.java
View File

@@ -118,7 +118,8 @@ public class WifiEnabler implements SwitchWidgetController.OnSwitchChangeListene
public void resume(Context context) {
mContext = context;
// Wi-Fi state is sticky, so just let the receiver update UI
mContext.registerReceiver(mReceiver, mIntentFilter);
mContext.registerReceiver(mReceiver, mIntentFilter,
Context.RECEIVER_EXPORTED_UNAUDITED);
if (!mListeningToOnSwitchChange) {
mSwitchWidget.startListening();
mListeningToOnSwitchChange = true;

6
src/com/android/settings/wifi/WifiStatusTest.java
View File

@@ -125,7 +125,8 @@ public class WifiStatusTest extends Activity {
mWifiStateFilter.addAction(WifiManager.RSSI_CHANGED_ACTION);
mWifiStateFilter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
registerReceiver(mWifiStateReceiver, mWifiStateFilter);
registerReceiver(mWifiStateReceiver, mWifiStateFilter,
Context.RECEIVER_EXPORTED_UNAUDITED);
setContentView(R.layout.wifi_status_test);
@@ -157,7 +158,8 @@ public class WifiStatusTest extends Activity {
@Override
protected void onResume() {
super.onResume();
registerReceiver(mWifiStateReceiver, mWifiStateFilter);
registerReceiver(mWifiStateReceiver, mWifiStateFilter,
Context.RECEIVER_EXPORTED_UNAUDITED);
}
@Override

3
src/com/android/settings/wifi/WifiSummaryUpdater.java
View File

@@ -76,7 +76,8 @@ public final class WifiSummaryUpdater extends SummaryUpdater {
if (register) {
mWifiTracker.fetchInitialState();
notifyChangeIfNeeded();
mContext.registerReceiver(mReceiver, INTENT_FILTER);
mContext.registerReceiver(mReceiver, INTENT_FILTER,
Context.RECEIVER_EXPORTED_UNAUDITED);
} else {
mContext.unregisterReceiver(mReceiver);
}

3
src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
View File

@@ -429,7 +429,8 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
mValidListener = true;
}
context.registerReceiver(mIntentReceiver, mIntentFilter);
context.registerReceiver(mIntentReceiver, mIntentFilter,
Context.RECEIVER_EXPORTED_UNAUDITED);
final Intent intent = getActivity().getIntent();
if (intent.getBooleanExtra(Phone.EXTRA_KEY_ALERT_SHOW, false)) {

3
src/com/android/settings/wifi/tether/WifiTetherSettings.java
View File

@@ -147,7 +147,8 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
}
final Context context = getContext();
if (context != null) {
context.registerReceiver(mTetherChangeReceiver, TETHER_STATE_CHANGE_FILTER);
context.registerReceiver(mTetherChangeReceiver, TETHER_STATE_CHANGE_FILTER,
Context.RECEIVER_EXPORTED_UNAUDITED);
}
}

3
src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
View File

@@ -83,7 +83,8 @@ public class WifiTetherSwitchBarController implements
public void onStart() {
mDataSaverBackend.addListener(this);
mSwitch.setOnClickListener(this);
mContext.registerReceiver(mReceiver, WIFI_INTENT_FILTER);
mContext.registerReceiver(mReceiver, WIFI_INTENT_FILTER,
Context.RECEIVER_EXPORTED_UNAUDITED);
}
@Override

3
tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java
View File

@@ -101,7 +101,8 @@ public class InternetPreferenceControllerTest {
public void onResume_shouldRegisterCallback() {
mController.onResume();
verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class));
verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class),
any(int.class));
verify(mConnectivityManager).registerNetworkCallback(
any(NetworkRequest.class),
any(ConnectivityManager.NetworkCallback.class),

3
tests/unit/src/com/android/settings/network/InternetResetHelperTest.java
View File

@@ -121,7 +121,8 @@ public class InternetResetHelperTest {
public void onResume_registerReceiver() {
mInternetResetHelper.onResume();
verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class));
verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class),
any(int.class));
}
@Test

3
tests/unit/src/com/android/settings/network/InternetUpdaterTest.java
View File

@@ -88,7 +88,8 @@ public class InternetUpdaterTest {
mInternetUpdater.onResume();
verify(mAirplaneModeEnabler).start();
verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class));
verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class),
any(int.class));
verify(mConnectivityManager).registerDefaultNetworkCallback(
any(ConnectivityManager.NetworkCallback.class));
// Unregister callbacks