etc/VancedMicroG
0
0
Fork 0
mirror of https://github.com/YTVanced/VancedMicroG synced 2024-12-04 00:37:27 +00:00
Code Issues Projects Releases Wiki Activity

Wakeful receivers only handle non-null intents

Browse source
This commit is contained in:
Marvin W 2021-03-09 22:21:25 +01:00
parent 87465cd1dd
commit ecfe3da3f7
No known key found for this signature in database
GPG key ID: 072E9235DB996F2A
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
play-services-core/src/main/java/org/microg/gms/checkin/CheckinService.java
View file

@ -95,7 +95,9 @@ public class CheckinService extends IntentService {
} catch (Exception e) { } catch (Exception e) {
Log.w(TAG, e); Log.w(TAG, e);
} finally { } finally {
WakefulBroadcastReceiver.completeWakefulIntent(intent); if (intent != null) {
WakefulBroadcastReceiver.completeWakefulIntent(intent);
}
schedule(this); schedule(this);
stopSelf(); stopSelf();
} }

2
play-services-core/src/main/java/org/microg/gms/gcm/McsService.java
View file

@ -320,7 +320,7 @@ public class McsService extends Service implements Handler.Callback {
WakefulBroadcastReceiver.completeWakefulIntent(intent); WakefulBroadcastReceiver.completeWakefulIntent(intent);
} else if (connectIntent == null) { } else if (connectIntent == null) {
connectIntent = intent; connectIntent = intent;
} else { } else if (intent != null) {
WakefulBroadcastReceiver.completeWakefulIntent(intent); WakefulBroadcastReceiver.completeWakefulIntent(intent);
} }
} }

11
play-services-core/src/main/kotlin/org/microg/gms/gcm/PushRegisterService.kt
View file

@ -112,11 +112,12 @@ class PushRegisterService : LifecycleService() {
} }
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
WakefulBroadcastReceiver.completeWakefulIntent(intent) if (intent != null) {
Log.d(TAG, "onStartCommand: $intent") WakefulBroadcastReceiver.completeWakefulIntent(intent)
lifecycleScope.launchWhenStarted { Log.d(TAG, "onStartCommand: $intent")
if (intent == null) return@launchWhenStarted lifecycleScope.launchWhenStarted {
handleIntent(intent) handleIntent(intent)
}
} }
return super.onStartCommand(intent, flags, startId) return super.onStartCommand(intent, flags, startId)
} }