LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix entitlement recheck fail in U" am: 65a73dbf78

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2584338

Change-Id: I19bbc4278d15977ecb589b79591a7811e1e97f29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mark Chien
2023-05-17 06:44:46 +00:00
committed by Automerger Merge Worker
parent e278d07bea 65a73dbf78
commit 3f0db9d4cb
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Tethering/src/com/android/networkstack/tethering/EntitlementManager.java
View File

@@ -459,8 +459,9 @@ public class EntitlementManager {
}
@VisibleForTesting
PendingIntent createRecheckAlarmIntent() {
PendingIntent createRecheckAlarmIntent(final String pkgName) {
final Intent intent = new Intent(ACTION_PROVISIONING_ALARM);
intent.setPackage(pkgName);
return PendingIntent.getBroadcast(mContext, 0, intent, PendingIntent.FLAG_IMMUTABLE);
}
@@ -470,7 +471,7 @@ public class EntitlementManager {
final int period = config.provisioningCheckPeriod;
if (period <= 0) return;
mProvisioningRecheckAlarm = createRecheckAlarmIntent();
mProvisioningRecheckAlarm = createRecheckAlarmIntent(mContext.getPackageName());
AlarmManager alarmManager = (AlarmManager) mContext.getSystemService(
Context.ALARM_SERVICE);
long triggerAtMillis = SystemClock.elapsedRealtime() + (period * MS_PER_HOUR);

3
Tethering/tests/unit/src/com/android/networkstack/tethering/EntitlementManagerTest.java
View File

@@ -213,7 +213,8 @@ public final class EntitlementManagerTest {
}
@Override
PendingIntent createRecheckAlarmIntent() {
PendingIntent createRecheckAlarmIntent(final String pkgName) {
assertEquals(TEST_PACKAGE_NAME, pkgName);
return mAlarmIntent;
}
}