Snap for 6833135 from 7905bce6ca7f576a4feb8b3c01986a3b55667f6e to ub-testdpc-rvc-release

Change-Id: I1ffc878b9028a1e368fff590685f700bffd4a00f

Author: android-build-team Robot

app/build.gradle

@@ -9,7 +9,7 @@ ext {
     // exactly 1 digit
     versionMinor = 0
     // exactly 2 digits
-    versionBuild = 01
+    versionBuild = 02
 }
 
 android {

app/src/main/AndroidManifest.xml

@@ -31,10 +31,12 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.REQUEST_PASSWORD_COMPLEXITY"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
 
     <application
             android:allowBackup="true"
             android:icon="@drawable/ic_launcher"
+            android:banner="@drawable/ic_launcher"
             android:theme="@style/AppTheme"
             android:label="@string/app_name">
 
@@ -47,6 +49,10 @@
             <action android:name="android.intent.action.MAIN"/>
             <category android:name="android.intent.category.LAUNCHER"/>
         </intent-filter>
+        <intent-filter>
+          <action android:name="android.intent.action.MAIN"/>
+          <category android:name="android.intent.category.LEANBACK_LAUNCHER"/>
+        </intent-filter>
         <intent-filter>
             <action android:name="android.app.action.CHECK_POLICY_COMPLIANCE"/>
             <category android:name="android.intent.category.DEFAULT"/>

app/src/main/java/com/afwsamples/testdpc/CrossProfileAppsWhitelistFragment.java

@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.afwsamples.testdpc;
+
+import android.annotation.TargetApi;
+import android.app.Fragment;
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.os.Build.VERSION_CODES;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+import java.util.Collections;
+import java.util.Set;
+
+/**
+ * This fragment provides the ability to whitelist cross profile packages
+ *
+ * <p>APIs exercised:
+ * <ul>
+ * <li> {@link DevicePolicyManager#setCrossProfilePackages(ComponentName, Set)} </li>
+ * <li> {@link DevicePolicyManager#getCrossProfilePackages(ComponentName)} </li>
+ * </ul>
+ */
+@TargetApi(VERSION_CODES.R)
+public class CrossProfileAppsWhitelistFragment extends Fragment {
+    private static final String DELIMITER = "\n";
+
+    private View mInflatedView;
+    private EditText mAppNameEditText;
+    private Button mResetButton;
+    private Button mAddButton;
+    private Button mRemoveButton;
+    private TextView mAppsList;
+
+    private DevicePolicyManager mDevicePolicyManager;
+    private ComponentName mAdminComponent;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        mDevicePolicyManager = getActivity().getSystemService(DevicePolicyManager.class);
+        mAdminComponent = DeviceAdminReceiver.getComponentName(getActivity());
+        mInflatedView = inflater.inflate(
+            R.layout.cross_profile_apps_whitelist, container, false);
+
+        mAppNameEditText = mInflatedView.findViewById(R.id.cross_profile_app_whitelist_input);
+        mResetButton = mInflatedView.findViewById(R.id.cross_profile_app_whitelist_reset_button);
+        mAddButton = mInflatedView.findViewById(R.id.cross_profile_app_whitelist_add_button);
+        mRemoveButton = mInflatedView.findViewById(R.id.cross_profile_app_whitelist_remove_button);
+        mAppsList = mInflatedView.findViewById(R.id.cross_profile_app_list);
+
+        setOnClickListeners();
+        updateCrossProfileAppsList();
+
+        return mInflatedView;
+    }
+
+    private void setOnClickListeners() {
+        mResetButton.setOnClickListener(view -> resetApps());
+        mAddButton.setOnClickListener(
+            view -> addApp(mAppNameEditText.getText().toString().toLowerCase().trim()));
+        mRemoveButton.setOnClickListener(
+            view -> removeApp(mAppNameEditText.getText().toString().toLowerCase().trim()));
+    }
+
+    private void resetApps() {
+        mDevicePolicyManager.setCrossProfilePackages(mAdminComponent, Collections.emptySet());
+        updateCrossProfileAppsList();
+    }
+
+    private void addApp(String app) {
+        Set<String> currentApps = mDevicePolicyManager.getCrossProfilePackages(mAdminComponent);
+        currentApps.add(app);
+        mDevicePolicyManager.setCrossProfilePackages(mAdminComponent, currentApps);
+        updateCrossProfileAppsList();
+    }
+
+    private void removeApp(String app) {
+        Set<String> currentApps = mDevicePolicyManager.getCrossProfilePackages(mAdminComponent);
+        currentApps.remove(app);
+        mDevicePolicyManager.setCrossProfilePackages(mAdminComponent, currentApps);
+        updateCrossProfileAppsList();
+    }
+
+    private void updateCrossProfileAppsList(){
+        Set<String> currentApps = mDevicePolicyManager.getCrossProfilePackages(mAdminComponent);
+        if (currentApps.isEmpty()) {
+            mAppsList.setText(R.string.cross_profile_apps_no_whitelisted_apps);
+        } else {
+            mAppsList.setText(String.join(DELIMITER, currentApps));
+        }
+    }
+}

app/src/main/java/com/afwsamples/testdpc/common/ProfileOrParentFragment.java

@@ -61,7 +61,7 @@ public void onCreate(Bundle savedInstanceState) {
         public View onCreateView(
                 LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
             FragmentTabHost tabHost = new FragmentTabHost(getActivity());
-            tabHost.setup(getActivity(), getChildFragmentManager(), View.generateViewId());
+            tabHost.setup(getActivity(), getChildFragmentManager(), container.getId());
 
             final boolean showDualTabs =
                 Util.isManagedProfileOwner(getActivity())

app/src/main/java/com/afwsamples/testdpc/common/Util.java

@@ -18,17 +18,18 @@
 
 import android.annotation.TargetApi;
 import android.app.Service;
+import android.app.UiModeManager;
 import android.app.admin.DevicePolicyManager;
 import android.content.ActivityNotFoundException;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.res.Configuration;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
-import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
 import androidx.preference.PreferenceFragment;
@@ -52,11 +53,6 @@ public class Util {
     private static final String TAG = "Util";
     private static final int DEFAULT_BUFFER_SIZE = 4096;
 
-    private static final String BROADCAST_ACTION_FRP_CONFIG_CHANGED =
-        "com.google.android.gms.auth.FRP_CONFIG_CHANGED";
-    private static final String GMSCORE_PACKAGE = "com.google.android.gms";
-    private static final String PERSISTENT_DEVICE_OWNER_STATE = "persistentDeviceOwnerState";
-
     // TODO: Update to S when VERSION_CODES.R becomes available.
     public static final int R_VERSION_CODE = 30;
 
@@ -203,42 +199,6 @@ public static boolean installCaCertificate(InputStream certificateInputStream,
         return false;
     }
 
-    /**
-     * Returns the persistent device owner state which has been set by the device owner as an app
-     * restriction on GmsCore or null if there is no such restriction set.
-     */
-    @TargetApi(VERSION_CODES.O)
-    public static String getPersistentDoStateFromApplicationRestriction(
-            DevicePolicyManager dpm, ComponentName admin) {
-        Bundle restrictions = dpm.getApplicationRestrictions(admin, GMSCORE_PACKAGE);
-        return restrictions.getString(PERSISTENT_DEVICE_OWNER_STATE);
-    }
-
-    /**
-     * Sets the persistent device owner state by setting a special app restriction on GmsCore and
-     * notifies GmsCore about the change by sending a broadcast.
-     *
-     * @param state The device owner state to be preserved across factory resets. If null, the
-     * persistent device owner state and the corresponding restiction are cleared.
-     */
-    @TargetApi(VERSION_CODES.O)
-    public static void setPersistentDoStateWithApplicationRestriction(
-            Context context, DevicePolicyManager dpm, ComponentName admin, String state) {
-        Bundle restrictions = dpm.getApplicationRestrictions(admin, GMSCORE_PACKAGE);
-        if (state == null) {
-            // Clear the restriction
-            restrictions.remove(PERSISTENT_DEVICE_OWNER_STATE);
-        } else {
-            // Set the restriction
-            restrictions.putString(PERSISTENT_DEVICE_OWNER_STATE, state);
-        }
-        dpm.setApplicationRestrictions(admin, GMSCORE_PACKAGE, restrictions);
-        Intent broadcastIntent = new Intent(BROADCAST_ACTION_FRP_CONFIG_CHANGED);
-        broadcastIntent.setPackage(GMSCORE_PACKAGE);
-        broadcastIntent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
-        context.sendBroadcast(broadcastIntent);
-    }
-
     /** @return Intent for the default home activity */
     public static Intent getHomeIntent() {
         final Intent intent = new Intent(Intent.ACTION_MAIN);
@@ -255,6 +215,17 @@ public static IntentFilter getHomeIntentFilter() {
         return filter;
     }
 
+    /** @return Intent for a launcher activity */
+    public static Intent getLauncherIntent(Context context) {
+        Intent launcherIntent = new Intent(Intent.ACTION_MAIN);
+        if (Util.isRunningOnTvDevice(context)) {
+            launcherIntent.addCategory(Intent.CATEGORY_LEANBACK_LAUNCHER);
+        } else {
+            launcherIntent.addCategory(Intent.CATEGORY_LAUNCHER);
+        }
+        return launcherIntent;
+    }
+
     private static DevicePolicyManager getDevicePolicyManager(Context context) {
         return (DevicePolicyManager)context.getSystemService(Service.DEVICE_POLICY_SERVICE);
     }
@@ -266,4 +237,9 @@ public static boolean hasDelegation(Context context, String delegation) {
         DevicePolicyManager dpm = context.getSystemService(DevicePolicyManager.class);
         return dpm.getDelegatedScopes(null, context.getPackageName()).contains(delegation);
     }
+
+    public static boolean isRunningOnTvDevice(Context context) {
+        UiModeManager uiModeManager = (UiModeManager) context.getSystemService(Context.UI_MODE_SERVICE);
+        return uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION;
+    }
 }

app/src/main/java/com/afwsamples/testdpc/common/keyvaluepair/KeyValueBundleArrayFragment.java

@@ -33,6 +33,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
 
 import static com.afwsamples.testdpc.common.EditDeleteArrayAdapter.OnDeleteButtonClickListener;
 import static com.afwsamples.testdpc.common.EditDeleteArrayAdapter.OnEditButtonClickListener;
@@ -130,10 +131,32 @@ protected void saveConfig() {
     @Override
     protected void addNewRow() {
         Bundle bundle = new Bundle();
+
+        if (mBundleList != null && mBundleList.size() > 0) {
+            bundle = clearBundleValues((Bundle) mBundleList.get(0).clone());
+        }
+
         mAdapter.add(bundle);
         showEditDialog(bundle);
     }
 
+    private Bundle clearBundleValues(Bundle bundle) {
+        Set<String> keySet = bundle.keySet();
+        for(String key : keySet) {
+            Object valueObject = bundle.get(key);
+            if(valueObject instanceof String) {
+                bundle.putString(key, "");
+            } else if(valueObject instanceof Integer) {
+                bundle.putInt(key, 0);
+            } else if(valueObject instanceof Boolean) {
+                bundle.putBoolean(key, false);
+            } else if(valueObject instanceof Bundle) {
+                bundle.putBundle(key, clearBundleValues((Bundle) valueObject));
+            }
+        }
+        return bundle;
+    }
+
     @Override
     protected void loadDefault() {}