diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-02-05 02:01:14 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-02-05 02:01:14 +0000 |
commit | eb94ad1664989e022b344a62a81a816e34232dc7 (patch) | |
tree | c0ec2aaae0a580adacbb292ec010eb914f378cd9 | |
parent | 981c683d92f985145b6e79cfcc8082e31c4c8cf1 (diff) | |
parent | e6b224e6dd113d0d2deaaeb08b6c7f9e418899cc (diff) | |
download | connectivity-eb94ad1664989e022b344a62a81a816e34232dc7.tar.gz |
Merge "Add unaudited exported flag to exposed runtime receivers"
-rw-r--r-- | PMC/src/com/android/pmc/BleScanReceiver.java | 3 | ||||
-rw-r--r-- | PMC/src/com/android/pmc/GattPMCReceiver.java | 3 | ||||
-rw-r--r-- | PMC/src/com/android/pmc/PMCMainActivity.java | 24 |
3 files changed, 20 insertions, 10 deletions
diff --git a/PMC/src/com/android/pmc/BleScanReceiver.java b/PMC/src/com/android/pmc/BleScanReceiver.java index cb33a68..815f520 100644 --- a/PMC/src/com/android/pmc/BleScanReceiver.java +++ b/PMC/src/com/android/pmc/BleScanReceiver.java @@ -238,7 +238,8 @@ public class BleScanReceiver extends BroadcastReceiver { // RegisterAlarmReceiver for BleScanListener mContext.registerReceiver(mAlarmScanListener, - new IntentFilter(BleScanListener.BLESCAN)); + new IntentFilter(BleScanListener.BLESCAN), + Context.RECEIVER_EXPORTED_UNAUDITED); } diff --git a/PMC/src/com/android/pmc/GattPMCReceiver.java b/PMC/src/com/android/pmc/GattPMCReceiver.java index 4a29dbb..28676f2 100644 --- a/PMC/src/com/android/pmc/GattPMCReceiver.java +++ b/PMC/src/com/android/pmc/GattPMCReceiver.java @@ -48,7 +48,8 @@ public class GattPMCReceiver extends BroadcastReceiver { // RegisterAlarmReceiver for GattListener context.registerReceiver(mGattClientListener, - new IntentFilter(GattClientListener.GATTCLIENT_ALARM)); + new IntentFilter(GattClientListener.GATTCLIENT_ALARM), + Context.RECEIVER_EXPORTED_UNAUDITED); Log.d(TAG, "Start GattPMCReceiver()"); } diff --git a/PMC/src/com/android/pmc/PMCMainActivity.java b/PMC/src/com/android/pmc/PMCMainActivity.java index 8f59ef2..25ecb91 100644 --- a/PMC/src/com/android/pmc/PMCMainActivity.java +++ b/PMC/src/com/android/pmc/PMCMainActivity.java @@ -109,11 +109,16 @@ public class PMCMainActivity extends Activity { mBtnStart = (Button) findViewById(R.id.btnstart); mBtnStop = (Button) findViewById(R.id.btnstop); addListenerOnButton(); - registerReceiver(mPMCReceiver, new IntentFilter(AUTOPOWER_INTENT_STRING)); - registerReceiver(mPMCReceiver, new IntentFilter(SETPARAMS_INTENT_STRING)); - registerReceiver(mBleScanReceiver, new IntentFilter(BleScanReceiver.BLE_SCAN_INTENT)); - registerReceiver(mGattPMCReceiver, new IntentFilter(GattPMCReceiver.GATTPMC_INTENT)); - registerReceiver(mA2dpReceiver, new IntentFilter(A2dpReceiver.A2DP_INTENT)); + registerReceiver(mPMCReceiver, new IntentFilter(AUTOPOWER_INTENT_STRING), + Context.RECEIVER_EXPORTED_UNAUDITED); + registerReceiver(mPMCReceiver, new IntentFilter(SETPARAMS_INTENT_STRING), + Context.RECEIVER_EXPORTED_UNAUDITED); + registerReceiver(mBleScanReceiver, new IntentFilter(BleScanReceiver.BLE_SCAN_INTENT), + Context.RECEIVER_EXPORTED_UNAUDITED); + registerReceiver(mGattPMCReceiver, new IntentFilter(GattPMCReceiver.GATTPMC_INTENT), + Context.RECEIVER_EXPORTED_UNAUDITED); + registerReceiver(mA2dpReceiver, new IntentFilter(A2dpReceiver.A2DP_INTENT), + Context.RECEIVER_EXPORTED_UNAUDITED); } @Override @@ -201,7 +206,8 @@ public class PMCMainActivity extends Activity { mDR = new WifiDownloadReceiver(PMCMainActivity.this, "http://" + mServerIP + ":" + mServerPort + "/" + filename, mIntervalMillis, mAlarmManager, mPIDownload); - registerReceiver(mDR, new IntentFilter(sDownloadAction)); + registerReceiver(mDR, new IntentFilter(sDownloadAction), + Context.RECEIVER_EXPORTED_UNAUDITED); Log.d(TAG, "Setting download data alarm. Interval: " + mIntervalMillis); mDR.scheduleDownload(); mBtnStart.setEnabled(false); @@ -225,7 +231,8 @@ public class PMCMainActivity extends Activity { // Stop any ongoing scans before starting a new instance. stopConnectivityScan(); mConnSR = new WifiConnScanReceiver(this, mIntervalMillis, mAlarmManager, mPIConnScan); - registerReceiver(mConnSR, new IntentFilter(sConnScanAction)); + registerReceiver(mConnSR, new IntentFilter(sConnScanAction), + Context.RECEIVER_EXPORTED_UNAUDITED); Log.d(TAG, "Setting connectivity scan alarm. Interval: " + mIntervalMillis); mConnSR.scheduleConnScan(); mBtnStart.setEnabled(false); @@ -262,7 +269,8 @@ public class PMCMainActivity extends Activity { } mGScanR = new WifiGScanReceiver( this, scanSettings, mIntervalMillis, mAlarmManager, mPIGScan); - registerReceiver(mGScanR, new IntentFilter(sGScanAction)); + registerReceiver(mGScanR, new IntentFilter(sGScanAction), + Context.RECEIVER_EXPORTED_UNAUDITED); Log.d(TAG, "Setting Gscan alarm. Interval: " + mIntervalMillis); mGScanR.scheduleGscan(); mBtnStart.setEnabled(false); |