Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "@EnforcePermission migrations - services.core"

Browse Source
This commit is contained in:
Matt Gilbride
2022-07-27 15:46:03 +00:00
committed by Android (Google) Code Review
parent 52b56ba05b 95c4dc01cd
commit bf5d6f3e9c
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/os/INetworkManagementService.aidl
View File

@@ -117,6 +117,7 @@ interface INetworkManagementService
/**
* Shuts down the service
*/
@EnforcePermission("SHUTDOWN")
void shutdown();
/**
@@ -277,6 +278,7 @@ interface INetworkManagementService
*/
void setUidOnMeteredNetworkDenylist(int uid, boolean enable);
void setUidOnMeteredNetworkAllowlist(int uid, boolean enable);
@EnforcePermission("NETWORK_SETTINGS")
boolean setDataSaverModeEnabled(boolean enable);
void setUidCleartextNetworkPolicy(int uid, int policy);
@@ -308,5 +310,6 @@ interface INetworkManagementService
void removeInterfaceFromLocalNetwork(String iface);
int removeRoutesFromLocalNetwork(in List<RouteInfo> routes);
@EnforcePermission("OBSERVE_NETWORK_POLICY")
boolean isNetworkRestricted(int uid);
}

3
core/java/com/android/internal/app/procstats/IProcessStats.aidl
View File

@@ -21,7 +21,9 @@ import android.os.ParcelFileDescriptor;
import com.android.internal.app.procstats.ProcessStats;
interface IProcessStats {
@EnforcePermission("PACKAGE_USAGE_STATS")
byte[] getCurrentStats(out List<ParcelFileDescriptor> historic);
@EnforcePermission("PACKAGE_USAGE_STATS")
ParcelFileDescriptor getStatsOverTime(long minTime);
int getCurrentMemoryState();
@@ -43,6 +45,7 @@ interface IProcessStats {
* @param List of Files of individual commits in protobuf binary or one that is merged from them.
* @param ProcessStats object that will be used to return the full set of merged stats.
*/
@EnforcePermission("PACKAGE_USAGE_STATS")
long getCommittedStatsMerged(long highWaterMarkMs, int section, boolean doAggregate,
out List<ParcelFileDescriptor> committedStats, out ProcessStats mergedStats);

6
services/core/java/com/android/server/NetworkManagementService.java
View File

@@ -862,10 +862,10 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
return list;
}
@android.annotation.EnforcePermission(android.Manifest.permission.SHUTDOWN)
@Override
public void shutdown() {
// TODO: remove from aidl if nobody calls externally
mContext.enforceCallingOrSelfPermission(SHUTDOWN, TAG);
Slog.i(TAG, "Shutting down");
}
@@ -1203,9 +1203,9 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
setUidOnMeteredNetworkList(uid, true, enable);
}
@android.annotation.EnforcePermission(android.Manifest.permission.NETWORK_SETTINGS)
@Override
public boolean setDataSaverModeEnabled(boolean enable) {
mContext.enforceCallingOrSelfPermission(NETWORK_SETTINGS, TAG);
if (DBG) Log.d(TAG, "setDataSaverMode: " + enable);
synchronized (mQuotaLock) {
@@ -1741,9 +1741,9 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
return NetdUtils.removeRoutesFromLocalNetwork(mNetdService, routes);
}
@android.annotation.EnforcePermission(android.Manifest.permission.OBSERVE_NETWORK_POLICY)
@Override
public boolean isNetworkRestricted(int uid) {
mContext.enforceCallingOrSelfPermission(OBSERVE_NETWORK_POLICY, TAG);
return isNetworkRestrictedInternal(uid);
}

9
services/core/java/com/android/server/am/ProcessStatsService.java
View File

@@ -564,10 +564,9 @@ public final class ProcessStatsService extends IProcessStats.Stub {
return res;
}
@android.annotation.EnforcePermission(android.Manifest.permission.PACKAGE_USAGE_STATS)
@Override
public byte[] getCurrentStats(List<ParcelFileDescriptor> historic) {
mAm.mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.PACKAGE_USAGE_STATS, null);
Parcel current = Parcel.obtain();
synchronized (mLock) {
long now = SystemClock.uptimeMillis();
@@ -619,11 +618,10 @@ public final class ProcessStatsService extends IProcessStats.Stub {
* @return List of proto binary of individual commit files or one that is merged from them;
* the merged, final ProcessStats object.
*/
@android.annotation.EnforcePermission(android.Manifest.permission.PACKAGE_USAGE_STATS)
@Override
public long getCommittedStatsMerged(long highWaterMarkMs, int section, boolean doAggregate,
List<ParcelFileDescriptor> committedStats, ProcessStats mergedStats) {
mAm.mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.PACKAGE_USAGE_STATS, null);
long newHighWaterMark = highWaterMarkMs;
mFileLock.lock();
@@ -708,10 +706,9 @@ public final class ProcessStatsService extends IProcessStats.Stub {
return fds[0];
}
@android.annotation.EnforcePermission(android.Manifest.permission.PACKAGE_USAGE_STATS)
@Override
public ParcelFileDescriptor getStatsOverTime(long minTime) {
mAm.mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.PACKAGE_USAGE_STATS, null);
Parcel current = Parcel.obtain();
long curTime;
synchronized (mLock) {