PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Provider Model] Fix the panel non responsive issue" into sc-dev

Browse Source
This commit is contained in:
Weng Su
2021-06-09 10:05:51 +00:00
committed by Android (Google) Code Review
parent 6a1ff49cb7 8c29ff0a27
commit 635e57bd4e
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/network/ProviderModelSlice.java
View File

@@ -46,6 +46,7 @@ import com.android.settings.network.telephony.MobileNetworkUtils;
import com.android.settings.network.telephony.NetworkProviderWorker;
import com.android.settings.slices.CustomSliceable;
import com.android.settings.slices.SliceBackgroundWorker;
import com.android.settings.slices.SliceBroadcastReceiver;
import com.android.settings.slices.SliceBuilderUtils;
import com.android.settings.wifi.WifiUtils;
import com.android.settings.wifi.slice.WifiSlice;
@@ -163,6 +164,18 @@ public class ProviderModelSlice extends WifiSlice {
return listBuilder.build();
}
@Override
public PendingIntent getBroadcastIntent(Context context) {
final Intent intent = new Intent(getUri().toString())
// The FLAG_RECEIVER_FOREGROUND flag is necessary to avoid the intent delay of
// the first sending after the device restarts
.addFlags(Intent.FLAG_RECEIVER_FOREGROUND)
.setData(getUri())
.setClass(context, SliceBroadcastReceiver.class);
return PendingIntent.getBroadcast(context, 0 /* requestCode */, intent,
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE);
}
/**
* Update the current carrier's mobile data status.
*/

10
tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java
View File

@@ -142,6 +142,16 @@ public class ProviderModelSliceTest {
mockBuilder();
}
@Test
@UiThreadTest
public void getBroadcastIntent_shouldHaveFlagReceiverForeground() {
final PendingIntent pendingIntent = mMockProviderModelSlice.getBroadcastIntent(mContext);
final int flags = pendingIntent.getIntent().getFlags();
assertThat(flags & Intent.FLAG_RECEIVER_FOREGROUND)
.isEqualTo(Intent.FLAG_RECEIVER_FOREGROUND);
}
@Test
@UiThreadTest
public void getSlice_noWifiAndHasCarrierNoData_oneCarrier() {