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

Commit ced4c86b 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."...

Merge "Update default max time of waiting for network state to get updated." into oc-dev am: f2cd4371
am: 2fd55e29

Change-Id: I1556eace21bd73be9f057f699527afa25a2b8856
parents 55359c13 2fd55e29
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.