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

Commit 1feecdd7 authored by Sudheer Shanka's avatar Sudheer Shanka
Browse files

Update default max time of waiting for network state to get updated. 

It is updated to a non-zero value, so an activity will wait for the
network rules to get updated before starting.

Bug: 27803922
Test: runtest -c com.android.server.net.ConnOnActivityStartTest frameworks-services
Change-Id: Ie491dac08dd257232a3f87d9a1013d6593424752
parent 3ab5c017

services/core/java/com/android/server/am/ActivityManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -573,10 +573,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.