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

Commit d7e633f8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Add hidden API getDataSaverViaCmFlag() for CTS"" into main am:... 

Merge "Revert "Add hidden API getDataSaverViaCmFlag() for CTS"" into main am: 0a4ba7bf am: aac334a3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2836418



Change-Id: Ib65429b0b15c7881ef4a1ac81d82a3510c185901
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d263bab6 aac334a3

core/java/android/net/NetworkStack.java

+0 −13
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.content.Context; 
import android.os.IBinder;

import android.os.ServiceManager;



import com.android.net.flags.Flags;

import com.android.net.module.util.PermissionUtils;

/**

 * Constants and utilities for client code communicating with the network stack service.
@@ -104,16 +103,4 @@ public class NetworkStack { 
            final @NonNull String... otherPermissions) {

        PermissionUtils.enforceNetworkStackPermissionOr(context, otherPermissions);

    }



    /**

     * Get setting of the "set_data_saver_via_cm" flag.

     *

     * @hide

     */

    // A workaround for aconfig. Currently, aconfig value read from platform and mainline code can

    // be inconsistent. To avoid the problem, CTS for mainline code can get the flag value by this

    // method.

    public static boolean getDataSaverViaCmFlag() {

        return Flags.setDataSaverViaCm();

    }

}