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

Merge "Don't log on each call when hibernation not enabled" into sc-mainline-prod

Browse Source
This commit is contained in:
Martyna Mikoda
2022-03-22 07:43:20 +00:00
committed by Android (Google) Code Review
parent 15e1b29e32 9eba2b4095
commit e11730100c
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/core/java/com/android/server/apphibernation/AppHibernationService.java
View File

@@ -208,7 +208,7 @@ public final class AppHibernationService extends SystemService {
*/ */
boolean isHibernatingForUser(String packageName, int userId) { boolean isHibernatingForUser(String packageName, int userId) {
String methodName = "isHibernatingForUser"; String methodName = "isHibernatingForUser";
if (!checkHibernationEnabled(methodName)) { if (!sIsServiceEnabled) {
return false; return false;
} }
getContext().enforceCallingOrSelfPermission( getContext().enforceCallingOrSelfPermission(
@@ -237,7 +237,7 @@ public final class AppHibernationService extends SystemService {
* @param packageName package to check * @param packageName package to check
*/ */
boolean isHibernatingGlobally(String packageName) { boolean isHibernatingGlobally(String packageName) {
if (!checkHibernationEnabled("isHibernatingGlobally")) { if (!sIsServiceEnabled) {
return false; return false;
} }
getContext().enforceCallingOrSelfPermission( getContext().enforceCallingOrSelfPermission(
@@ -263,7 +263,7 @@ public final class AppHibernationService extends SystemService {
*/ */
void setHibernatingForUser(String packageName, int userId, boolean isHibernating) { void setHibernatingForUser(String packageName, int userId, boolean isHibernating) {
String methodName = "setHibernatingForUser"; String methodName = "setHibernatingForUser";
if (!checkHibernationEnabled(methodName)) { if (!sIsServiceEnabled) {
return; return;
} }
getContext().enforceCallingOrSelfPermission( getContext().enforceCallingOrSelfPermission(
@@ -313,7 +313,7 @@ public final class AppHibernationService extends SystemService {
* @param isHibernating new hibernation state * @param isHibernating new hibernation state
*/ */
void setHibernatingGlobally(String packageName, boolean isHibernating) { void setHibernatingGlobally(String packageName, boolean isHibernating) {
if (!checkHibernationEnabled("setHibernatingGlobally")) { if (!sIsServiceEnabled) {
return; return;
} }
getContext().enforceCallingOrSelfPermission( getContext().enforceCallingOrSelfPermission(
@@ -344,7 +344,7 @@ public final class AppHibernationService extends SystemService {
@NonNull List<String> getHibernatingPackagesForUser(int userId) { @NonNull List<String> getHibernatingPackagesForUser(int userId) {
ArrayList<String> hibernatingPackages = new ArrayList<>(); ArrayList<String> hibernatingPackages = new ArrayList<>();
String methodName = "getHibernatingPackagesForUser"; String methodName = "getHibernatingPackagesForUser";
if (!checkHibernationEnabled(methodName)) { if (!sIsServiceEnabled) {
return hibernatingPackages; return hibernatingPackages;
} }
getContext().enforceCallingOrSelfPermission( getContext().enforceCallingOrSelfPermission(
@@ -640,6 +640,7 @@ public final class AppHibernationService extends SystemService {
for (String key : properties.getKeyset()) { for (String key : properties.getKeyset()) {
if (TextUtils.equals(KEY_APP_HIBERNATION_ENABLED, key)) { if (TextUtils.equals(KEY_APP_HIBERNATION_ENABLED, key)) {
sIsServiceEnabled = isDeviceConfigAppHibernationEnabled(); sIsServiceEnabled = isDeviceConfigAppHibernationEnabled();
Slog.d(TAG, "App hibernation changed to enabled=" + sIsServiceEnabled);
break; break;
} }
} }
@@ -676,13 +677,6 @@ public final class AppHibernationService extends SystemService {
return true; return true;
} }
private boolean checkHibernationEnabled(String methodName) {
if (!sIsServiceEnabled) {
Slog.w(TAG, String.format("Attempted to call %s on unsupported device.", methodName));
}
return sIsServiceEnabled;
}
private void dump(PrintWriter pw) { private void dump(PrintWriter pw) {
// Check usage stats permission since hibernation indirectly informs usage. // Check usage stats permission since hibernation indirectly informs usage.
if (!DumpUtils.checkDumpAndUsageStatsPermission(getContext(), TAG, pw)) return; if (!DumpUtils.checkDumpAndUsageStatsPermission(getContext(), TAG, pw)) return;