diff options
| author | 2020-07-17 12:22:30 -0700 | |
|---|---|---|
| committer | 2020-07-17 12:22:30 -0700 | |
| commit | 77e1a9e8517ad46b5b251eb867ce9e2046bff1e3 (patch) | |
| tree | be6497c1bdd346d4f2a202d3d8efb55832199357 | |
| parent | a13d349172477b3fea180b80384be105e2ff62b4 (diff) | |
Don't try to handle callbacks until mSystemReady is set.
Bug: 160855861
Bug: 161547406
Test: atest ./hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Change-Id: Icf570122cae0d9b03319d16df913904bab8ca18d
| -rw-r--r-- | services/core/java/com/android/server/net/NetworkPolicyManagerService.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java index ea047888caff..d6557f6410ec 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java @@ -5288,6 +5288,9 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { @Override public void onTempPowerSaveWhitelistChange(int appId, boolean added) { synchronized (mUidRulesFirstLock) { + if (!mSystemReady) { + return; + } mLogger.tempPowerSaveWlChanged(appId, added); if (added) { mPowerSaveTempWhitelistAppIds.put(appId, true); |