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

Check if DSU is in use before feature flag

Browse Source 
am: 7687aaac1d

Change-Id: Ia62234d7f1ab96803ad90fed51ae0e6b168af50c
This commit is contained in:
Po-Chien Hsueh
2019-05-21 10:01:58 -07:00
committed by android-build-merger
parent 38c5f1fd7c 7687aaac1d
commit bba71b8a0b
2 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
packages/DynamicSystemInstallationService/src/com/android/dynsystem/BootCompletedReceiver.java
View File

@@ -22,8 +22,8 @@ import android.content.Intent;
import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.image.DynamicSystemClient;
import android.os.image.DynamicSystemManager;
import android.util.FeatureFlagUtils;
import android.util.Log;
/**
@@ -37,21 +37,26 @@ public class BootCompletedReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
if (!featureFlagEnabled()) {
String action = intent.getAction();
if (!Intent.ACTION_BOOT_COMPLETED.equals(action)) {
return;
}
String action = intent.getAction();
DynamicSystemManager dynSystem =
(DynamicSystemManager) context.getSystemService(Context.DYNAMIC_SYSTEM_SERVICE);
Log.d(TAG, "Broadcast received: " + action);
boolean isInUse = (dynSystem != null) && dynSystem.isInUse();
if (Intent.ACTION_BOOT_COMPLETED.equals(action)) {
Intent startServiceIntent = new Intent(
context, DynamicSystemInstallationService.class);
startServiceIntent.setAction(DynamicSystemClient.ACTION_NOTIFY_IF_IN_USE);
context.startServiceAsUser(startServiceIntent, UserHandle.SYSTEM);
if (!isInUse && !featureFlagEnabled()) {
return;
}
Intent startServiceIntent = new Intent(
context, DynamicSystemInstallationService.class);
startServiceIntent.setAction(DynamicSystemClient.ACTION_NOTIFY_IF_IN_USE);
context.startServiceAsUser(startServiceIntent, UserHandle.SYSTEM);
}
private boolean featureFlagEnabled() {

13
services/core/java/com/android/server/DynamicSystemService.java
View File

@@ -152,7 +152,18 @@ public class DynamicSystemService extends IDynamicSystemService.Stub implements
@Override
public boolean isInUse() throws RemoteException {
return getGsiService().isGsiRunning();
boolean gsidWasRunning = "running".equals(SystemProperties.get("init.svc.gsid"));
boolean isInUse = false;
try {
isInUse = getGsiService().isGsiRunning();
} finally {
if (!gsidWasRunning && !isInUse) {
SystemProperties.set("ctl.stop", "gsid");
}
}
return isInUse;
}
@Override