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

Commit 2fd55e29 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by android-build-merger
Browse files

Merge "Update default max time of waiting for network state to get updated." into oc-dev

am: f2cd4371

Change-Id: I8e11ab25744c48faa5831a0974bf6fb711482acf
parents a3cd3633 f2cd4371
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -574,10 +574,11 @@ public class ActivityManagerService extends IActivityManager.Stub
    // Determines whether to take full screen screenshots
    static final boolean TAKE_FULLSCREEN_SCREENSHOTS = true;
    // STOPSHIP: Update default to a smaller value.
    /**
     * Default value for {@link Settings.Global#NETWORK_ACCESS_TIMEOUT_MS}.
     */
    private static final long NETWORK_ACCESS_TIMEOUT_DEFAULT_MS = 0; // 0 sec
    private static final long NETWORK_ACCESS_TIMEOUT_DEFAULT_MS = 2000; // 2 sec
    /**
     * State indicating that there is no need for any blocking for network.