commit 82ffaf2ac24ee19abe82e30fe8ef5e2cf6a0a14e
author Junyu Lai <junyulai@google.com> Wed Jan 13 07:44:27 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 13 07:44:27 2021 +0000
tree 3948570b74a49483480e30aaaa08ec6d39d148bb
parent c095d6058201e950bd2d0533dd7a229ae0a97ecd
parent 85e0ad79865771170a298f69f0d71a8c19b27ccc

Merge "[VCN01] Add NOT_VCN_MANAGED capability"

core/java/android/net/NetworkPolicyManager.java

diff --git a/core/java/android/net/NetworkPolicyManager.java b/core/java/android/net/NetworkPolicyManager.java
index 8bfbad6..c029dea 100644
--- a/core/java/android/net/NetworkPolicyManager.java
+++ b/core/java/android/net/NetworkPolicyManager.java
@@ -32,8 +32,8 @@
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiInfo;
 import android.os.Build;
+import android.os.Process;
 import android.os.RemoteException;
-import android.os.UserHandle;
 import android.telephony.SubscriptionPlan;
 import android.util.DebugUtils;
 import android.util.Pair;
@@ -500,7 +500,7 @@
     @Deprecated
     public static boolean isUidValidForPolicy(Context context, int uid) {
         // first, quick-reject non-applications
-        if (!UserHandle.isApp(uid)) {
+        if (!Process.isApplicationUid(uid)) {
             return false;
         }
 

core/java/android/os/image/DynamicSystemClient.java

diff --git a/core/java/android/os/image/DynamicSystemClient.java b/core/java/android/os/image/DynamicSystemClient.java
index 0fe8894..5aa4e27 100644
--- a/core/java/android/os/image/DynamicSystemClient.java
+++ b/core/java/android/os/image/DynamicSystemClient.java
@@ -35,8 +35,6 @@
 import android.os.Messenger;
 import android.os.ParcelableException;
 import android.os.RemoteException;
-import android.os.SystemProperties;
-import android.util.FeatureFlagUtils;
 import android.util.Slog;
 
 import java.lang.annotation.Retention;
@@ -251,13 +249,7 @@
                 mService.send(msg);
             } catch (RemoteException e) {
                 Slog.e(TAG, "Unable to get status from installation service");
-                if (mExecutor != null) {
-                    mExecutor.execute(() -> {
-                        mListener.onStatusChanged(STATUS_UNKNOWN, CAUSE_ERROR_IPC, 0, e);
-                    });
-                } else {
-                    mListener.onStatusChanged(STATUS_UNKNOWN, CAUSE_ERROR_IPC, 0, e);
-                }
+                notifyOnStatusChangedListener(STATUS_UNKNOWN, CAUSE_ERROR_IPC, 0, e);
             }
         }
 
@@ -311,6 +303,20 @@
         mExecutor = null;
     }
 
+    private void notifyOnStatusChangedListener(
+            int status, int cause, long progress, Throwable detail) {
+        if (mListener != null) {
+            if (mExecutor != null) {
+                mExecutor.execute(
+                        () -> {
+                            mListener.onStatusChanged(status, cause, progress, detail);
+                        });
+            } else {
+                mListener.onStatusChanged(status, cause, progress, detail);
+            }
+        }
+    }
+
     /**
      * Bind to {@code DynamicSystem} installation service. Binding to the installation service
      * allows it to send status updates to {@link #OnStatusChangedListener}. It is recommanded
@@ -320,11 +326,6 @@
     @RequiresPermission(android.Manifest.permission.INSTALL_DYNAMIC_SYSTEM)
     @SystemApi
     public void bind() {
-        if (!featureFlagEnabled()) {
-            Slog.w(TAG, FeatureFlagUtils.DYNAMIC_SYSTEM + " not enabled; bind() aborted.");
-            return;
-        }
-
         Intent intent = new Intent();
         intent.setClassName("com.android.dynsystem",
                 "com.android.dynsystem.DynamicSystemInstallationService");
@@ -395,11 +396,6 @@
     @RequiresPermission(android.Manifest.permission.INSTALL_DYNAMIC_SYSTEM)
     public void start(@NonNull Uri systemUrl, @BytesLong long systemSize,
             @BytesLong long userdataSize) {
-        if (!featureFlagEnabled()) {
-            Slog.w(TAG, FeatureFlagUtils.DYNAMIC_SYSTEM + " not enabled; start() aborted.");
-            return;
-        }
-
         Intent intent = new Intent();
 
         intent.setClassName("com.android.dynsystem",
@@ -407,6 +403,7 @@
 
         intent.setData(systemUrl);
         intent.setAction(ACTION_START_INSTALL);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
         intent.putExtra(KEY_SYSTEM_SIZE, systemSize);
         intent.putExtra(KEY_USERDATA_SIZE, userdataSize);
@@ -414,11 +411,6 @@
         mContext.startActivity(intent);
     }
 
-    private boolean featureFlagEnabled() {
-        return SystemProperties.getBoolean(
-                FeatureFlagUtils.PERSIST_PREFIX + FeatureFlagUtils.DYNAMIC_SYSTEM, false);
-    }
-
     private void handleMessage(Message msg) {
         switch (msg.what) {
             case MSG_POST_STATUS:
@@ -432,13 +424,7 @@
 
                 Throwable detail = t == null ? null : t.getCause();
 
-                if (mExecutor != null) {
-                    mExecutor.execute(() -> {
-                        mListener.onStatusChanged(status, cause, progress, detail);
-                    });
-                } else {
-                    mListener.onStatusChanged(status, cause, progress, detail);
-                }
+                notifyOnStatusChangedListener(status, cause, progress, detail);
                 break;
             default:
                 // do nothing