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

Commit 785514fe authored by Hugo Benichi's avatar Hugo Benichi Committed by android-build-merger
Browse files

Merge "Merge "ConnectivityManager: fix style issue" am: e74f3adb am:... 

Merge "Merge "ConnectivityManager: fix style issue" am: e74f3adb am: ec54a403 am: ec7447b2" into oc-dr1-dev-plus-aosp
am: 83ae6653

Change-Id: I959b2aa411868bdc4c3256dc5a2025bc84692726
parents 4ae5aef9 83ae6653

core/java/android/net/ConnectivityManager.java

+2 −2
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ public class ConnectivityManager { 
    /**

     * @hide

     */

    public final static int REQUEST_ID_UNSET = 0;

    public static final int REQUEST_ID_UNSET = 0;



    /**

     * Static unique request used as a tombstone for NetworkCallbacks that have been unregistered.
@@ -607,7 +607,7 @@ public class ConnectivityManager { 
     * registered and those that were already unregistered.

     * @hide

     */

    private final static NetworkRequest ALREADY_UNREGISTERED =

    private static final NetworkRequest ALREADY_UNREGISTERED =

            new NetworkRequest.Builder().clearCapabilities().build();



    /**