Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 074eb698 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Don't process broadcasts until really ready." into pi-dev 

am: fcc07b53

Change-Id: I898d5c2d351951a7c016cbc70cb81210a9e18b26
parents ca1d74ba fcc07b53

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -414,6 +414,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
    final Object mNetworkPoliciesSecondLock = new Object();

    final Object mNetworkPoliciesSecondLock = new Object();





    @GuardedBy("allLocks") volatile boolean mSystemReady;

    @GuardedBy("allLocks") volatile boolean mSystemReady;

    volatile boolean mSystemReallyReady;





    @GuardedBy("mUidRulesFirstLock") volatile boolean mRestrictBackground;

    @GuardedBy("mUidRulesFirstLock") volatile boolean mRestrictBackground;

    @GuardedBy("mUidRulesFirstLock") volatile boolean mRestrictPower;

    @GuardedBy("mUidRulesFirstLock") volatile boolean mRestrictPower;
@@ -866,6 +867,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
            Thread.currentThread().interrupt();

            Thread.currentThread().interrupt();

            throw new IllegalStateException("Service " + TAG + " init interrupted", e);

            throw new IllegalStateException("Service " + TAG + " init interrupted", e);

        }

        }

        mSystemReallyReady = true;

    }

    }





    final private IUidObserver mUidObserver = new IUidObserver.Stub() {

    final private IUidObserver mUidObserver = new IUidObserver.Stub() {
@@ -1402,6 +1404,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
            // on background handler thread, and verified CONNECTIVITY_INTERNAL

            // on background handler thread, and verified CONNECTIVITY_INTERNAL

            // permission above.

            // permission above.





            if (!mSystemReallyReady) return;

            synchronized (mUidRulesFirstLock) {

            synchronized (mUidRulesFirstLock) {

                synchronized (mNetworkPoliciesSecondLock) {

                synchronized (mNetworkPoliciesSecondLock) {

                    ensureActiveMobilePolicyAL();

                    ensureActiveMobilePolicyAL();

services/core/java/com/android/server/net/NetworkStatsService.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -281,7 +281,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub { 
    private Handler mHandler;

    private Handler mHandler;

    private Handler.Callback mHandlerCallback;

    private Handler.Callback mHandlerCallback;





    private boolean mSystemReady;

    private volatile boolean mSystemReady;

    private long mPersistThreshold = 2 * MB_IN_BYTES;

    private long mPersistThreshold = 2 * MB_IN_BYTES;

    private long mGlobalAlertBytes;

    private long mGlobalAlertBytes;