LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Rename setUidForeground to noteUidForeground" am: 8d52f75d38

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

Change-Id: Iacdcfd8549d652ef56fd7d0c63dd88cc890b12b3
This commit is contained in:
Lorenzo Colitti
2022-03-15 23:57:31 +00:00
committed by Automerger Merge Worker
parent b4c83efde2 8d52f75d38
commit 112efa8a5a
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework-t/src/android/app/usage/NetworkStatsManager.java
View File

@@ -1061,9 +1061,9 @@ public class NetworkStatsManager {
@RequiresPermission(anyOf = { @RequiresPermission(anyOf = {
NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK,
android.Manifest.permission.NETWORK_STACK}) android.Manifest.permission.NETWORK_STACK})
public void setUidForeground(int uid, boolean uidForeground) { public void noteUidForeground(int uid, boolean uidForeground) {
try { try {
mService.setUidForeground(uid, uidForeground); mService.noteUidForeground(uid, uidForeground);
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
} }

2
framework-t/src/android/net/INetworkStatsService.aidl
View File

@@ -91,7 +91,7 @@ interface INetworkStatsService {
in INetworkStatsProvider provider); in INetworkStatsProvider provider);
/** Mark given UID as being in foreground for stats purposes. */ /** Mark given UID as being in foreground for stats purposes. */
void setUidForeground(int uid, boolean uidForeground); void noteUidForeground(int uid, boolean uidForeground);
/** Advise persistence threshold; may be overridden internally. */ /** Advise persistence threshold; may be overridden internally. */
void advisePersistThreshold(long thresholdBytes); void advisePersistThreshold(long thresholdBytes);

2
service-t/src/com/android/server/net/NetworkStatsService.java
View File

@@ -1194,7 +1194,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
} }
@VisibleForTesting @VisibleForTesting
public void setUidForeground(int uid, boolean uidForeground) { public void noteUidForeground(int uid, boolean uidForeground) {
PermissionUtils.enforceNetworkStackPermission(mContext); PermissionUtils.enforceNetworkStackPermission(mContext);
synchronized (mStatsLock) { synchronized (mStatsLock) {
final int set = uidForeground ? SET_FOREGROUND : SET_DEFAULT; final int set = uidForeground ? SET_FOREGROUND : SET_DEFAULT;