summaryrefslogtreecommitdiff
path: root/packages/DynamicSystemInstallationService
diff options
context:
space:
mode:
authorPo-Chien Hsueh <pchsueh@google.com>2019-05-14 16:57:18 +0800
committerPO HUNG CHEN <howardsoc@google.com>2019-05-21 01:16:33 +0000
commit7687aaac1d60de95c55a2bc62f3e23a56e2f16bd (patch)
tree5579300f9fae4aa0b34aa562284f30fd434a0479 /packages/DynamicSystemInstallationService
parent7ad66d5e14e4f1985c2caf6bf8c35d809036914a (diff)
Check if DSU is in use before feature flag
We are using a feature flag to protect DSU and the device. But when a Dynamic System is in use, feature flag is set as false by default. This CL makes DSU bypass feature flag and start GSI service on boot completed, check if the device is currently running a Dynamic System, then, stop GSI service if the device isn't. Bug: 132575851 Test: restart into DSU, check if the "In Use" notification is shown. Change-Id: I9dabf9bc1716ef18d513278415c6544a5467d510
Diffstat (limited to 'packages/DynamicSystemInstallationService')
-rw-r--r--packages/DynamicSystemInstallationService/src/com/android/dynsystem/BootCompletedReceiver.java25
1 files changed, 15 insertions, 10 deletions
diff --git a/packages/DynamicSystemInstallationService/src/com/android/dynsystem/BootCompletedReceiver.java b/packages/DynamicSystemInstallationService/src/com/android/dynsystem/BootCompletedReceiver.java
index ea7b378eb607..06c52942e671 100644
--- a/packages/DynamicSystemInstallationService/src/com/android/dynsystem/BootCompletedReceiver.java
+++ b/packages/DynamicSystemInstallationService/src/com/android/dynsystem/BootCompletedReceiver.java
@@ -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();
-
- Log.d(TAG, "Broadcast received: " + action);
+ DynamicSystemManager dynSystem =
+ (DynamicSystemManager) context.getSystemService(Context.DYNAMIC_SYSTEM_SERVICE);
- if (Intent.ACTION_BOOT_COMPLETED.equals(action)) {
- Intent startServiceIntent = new Intent(
- context, DynamicSystemInstallationService.class);
+ boolean isInUse = (dynSystem != null) && dynSystem.isInUse();
- 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() {