Commit 8d88069d authored by Sky Malice's avatar Sky Malice Committed by Commit Bot

Add switch to force device ownership.

Bug: 1119674
Change-Id: I41c282796aed83d17565fd27349dcddcd6b0db72
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2366394Reviewed-by: default avatarWenyu Fu <wenyufu@chromium.org>
Reviewed-by: default avatarTheresa  <twellington@chromium.org>
Commit-Queue: Theresa  <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#800122}
parent 4ca3c99e
...@@ -13,6 +13,7 @@ import android.os.SystemClock; ...@@ -13,6 +13,7 @@ import android.os.SystemClock;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import org.chromium.base.Callback; import org.chromium.base.Callback;
import org.chromium.base.CommandLine;
import org.chromium.base.ContextUtils; import org.chromium.base.ContextUtils;
import org.chromium.base.Log; import org.chromium.base.Log;
import org.chromium.base.ThreadUtils; import org.chromium.base.ThreadUtils;
...@@ -21,6 +22,7 @@ import org.chromium.base.annotations.NativeMethods; ...@@ -21,6 +22,7 @@ import org.chromium.base.annotations.NativeMethods;
import org.chromium.base.metrics.RecordHistogram; import org.chromium.base.metrics.RecordHistogram;
import org.chromium.base.task.AsyncTask; import org.chromium.base.task.AsyncTask;
import org.chromium.base.task.TaskTraits; import org.chromium.base.task.TaskTraits;
import org.chromium.chrome.browser.flags.ChromeSwitches;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.Queue; import java.util.Queue;
...@@ -111,6 +113,11 @@ public class EnterpriseInfo { ...@@ -111,6 +113,11 @@ public class EnterpriseInfo {
(DevicePolicyManager) context.getSystemService( (DevicePolicyManager) context.getSystemService(
Context.DEVICE_POLICY_SERVICE); Context.DEVICE_POLICY_SERVICE);
if (CommandLine.getInstance().hasSwitch(
ChromeSwitches.FORCE_DEVICE_OWNERSHIP)) {
hasDeviceOwnerApp = true;
}
for (PackageInfo pkg : packageManager.getInstalledPackages(/* flags= */ 0)) { for (PackageInfo pkg : packageManager.getInstalledPackages(/* flags= */ 0)) {
assert devicePolicyManager != null; assert devicePolicyManager != null;
if (devicePolicyManager.isProfileOwnerApp(pkg.packageName)) { if (devicePolicyManager.isProfileOwnerApp(pkg.packageName)) {
......
...@@ -646,6 +646,10 @@ const char kEnableAccessibilityTabSwitcher[] = ...@@ -646,6 +646,10 @@ const char kEnableAccessibilityTabSwitcher[] =
// unresponsive web content. // unresponsive web content.
const char kEnableHungRendererInfoBar[] = "enable-hung-renderer-infobar"; const char kEnableHungRendererInfoBar[] = "enable-hung-renderer-infobar";
// Forces the device to report being owned by an enterprise. This mimics the
// presence of an app signaling device ownerhsip.
const char kForceDeviceOwnership[] = "force-device-ownership";
// Forces the night mode to be enabled. // Forces the night mode to be enabled.
const char kForceEnableNightMode[] = "force-enable-night-mode"; const char kForceEnableNightMode[] = "force-enable-night-mode";
......
...@@ -188,6 +188,7 @@ extern const char kWinJumplistAction[]; ...@@ -188,6 +188,7 @@ extern const char kWinJumplistAction[];
extern const char kAuthAndroidNegotiateAccountType[]; extern const char kAuthAndroidNegotiateAccountType[];
extern const char kEnableAccessibilityTabSwitcher[]; extern const char kEnableAccessibilityTabSwitcher[];
extern const char kEnableHungRendererInfoBar[]; extern const char kEnableHungRendererInfoBar[];
extern const char kForceDeviceOwnership[];
extern const char kForceEnableNightMode[]; extern const char kForceEnableNightMode[];
extern const char kForceShowUpdateMenuBadge[]; extern const char kForceShowUpdateMenuBadge[];
extern const char kForceShowUpdateMenuItemCustomSummary[]; extern const char kForceShowUpdateMenuItemCustomSummary[];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment