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

Merge "Specify temp-allowlist reasonCode while calling addPowerSaveTempWhitelistApp()." into sc-dev am: 69d8c25518

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie12d9985bb105394a54eba287be4fc7f41e9cf10
This commit is contained in:
Hui Yu
2021-03-01 18:48:13 +00:00
committed by Automerger Merge Worker
parent 1adc7fc8c4 69d8c25518
commit e6b09f0064
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -22,6 +22,7 @@ import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED;
import static android.net.RouteInfo.RTN_THROW;
import static android.net.RouteInfo.RTN_UNREACHABLE;
import static android.net.VpnManager.NOTIFICATION_CHANNEL_VPN;
import static android.os.PowerWhitelistManager.REASON_VPN;
import static com.android.internal.util.Preconditions.checkArgument;
import static com.android.internal.util.Preconditions.checkNotNull;
@@ -825,7 +826,8 @@ public class Vpn {
// a short time, so we can bootstrap the VPN service.
DeviceIdleInternal idleController = mDeps.getDeviceIdleInternal();
idleController.addPowerSaveTempWhitelistApp(Process.myUid(), alwaysOnPackage,
VPN_LAUNCH_IDLE_ALLOWLIST_DURATION_MS, mUserId, false, "vpn");
VPN_LAUNCH_IDLE_ALLOWLIST_DURATION_MS, mUserId, false, REASON_VPN,
"vpn");
// Start the VPN service declared in the app's manifest.
Intent serviceIntent = new Intent(VpnConfig.SERVICE_INTERFACE);

4
services/core/java/com/android/server/content/SyncManager.java
View File

@@ -16,6 +16,8 @@
package com.android.server.content;
import static android.os.PowerWhitelistManager.REASON_SYNC_MANAGER;
import static com.android.server.content.SyncLogger.logSafe;
import android.accounts.Account;
@@ -1671,7 +1673,7 @@ public class SyncManager {
syncOperation.owningPackage,
mConstants.getKeyExemptionTempWhitelistDurationInSeconds() * 1000,
UserHandle.getUserId(syncOperation.owningUid),
/* sync=*/ false, "sync by top app");
/* sync=*/ false, REASON_SYNC_MANAGER, "sync by top app");
}
}

5
services/core/java/com/android/server/security/KeyChainSystemService.java
View File

@@ -16,6 +16,8 @@
package com.android.server.security;
import static android.os.PowerWhitelistManager.REASON_KEY_CHAIN;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.Context;
@@ -102,7 +104,8 @@ public class KeyChainSystemService extends SystemService {
final DeviceIdleInternal idleController =
LocalServices.getService(DeviceIdleInternal.class);
idleController.addPowerSaveTempWhitelistApp(Process.myUid(), packageName,
KEYCHAIN_IDLE_WHITELIST_DURATION_MS, user.getIdentifier(), false, "keychain");
KEYCHAIN_IDLE_WHITELIST_DURATION_MS, user.getIdentifier(), false,
REASON_KEY_CHAIN, "keychain");
getContext().startServiceAsUser(intent, user);
}

4
services/core/java/com/android/server/telecom/InternalServiceRepository.java
View File

@@ -16,6 +16,8 @@
package com.android.server.telecom;
import static android.os.PowerWhitelistManager.REASON_UNKNOWN;
import android.content.Context;
import android.os.Binder;
import android.os.Process;
@@ -38,7 +40,7 @@ public class InternalServiceRepository extends IInternalServiceRetriever.Stub {
public void exemptAppTemporarilyForEvent(String packageName, long duration, int userHandle,
String reason) {
mDeviceIdleController.addPowerSaveTempWhitelistApp(Process.myUid(), packageName,
duration, userHandle, true /*sync*/, reason);
duration, userHandle, true /*sync*/, REASON_UNKNOWN, reason);
}
};