Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add shadows for DevicePolicyManager#setGlobalSetting #8098

Open
wants to merge 1 commit into
base: google
Choose a base branch
from
Open

Add shadows for DevicePolicyManager#setGlobalSetting #8098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 23 additions & 0 deletions robolectric/src/test/java/org/robolectric/shadows/ShadowDevicePolicyManagerTest.java
View file
Open in desktop
Expand Up @@ -54,6 +54,7 @@
import android.os.PersistableBundle;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.common.collect.ImmutableSet;
Expand Down Expand Up @@ -2357,6 +2358,28 @@ public void getUserProvisioningState_returnsSetUserProvisioningState() {
assertThat(devicePolicyManager.getUserProvisioningState()).isEqualTo(STATE_USER_UNMANAGED);
}

@Config(minSdk = M)
@Test
public void setGlobalSetting_globalSettingSet() {
String enabled = "1";

devicePolicyManager.setGlobalSetting(testComponent, Settings.Global.ADB_ENABLED, enabled);

assertThat(Settings.Global.getString(context.getContentResolver(), Settings.Global.ADB_ENABLED))
.isEqualTo(enabled);
}

@Config(minSdk = M)
@Test
public void setGlobalSetting_settingCanBeReturnedAsInteger() throws Exception {
String enabled = "1";

devicePolicyManager.setGlobalSetting(testComponent, Settings.Global.ADB_ENABLED, enabled);

assertThat(Settings.Global.getInt(context.getContentResolver(), Settings.Global.ADB_ENABLED))
.isEqualTo(1);
}

private ServiceConnection buildServiceConnection() {
return new ServiceConnection() {
@Override
Expand Down
6 changes: 6 additions & 0 deletions shadows/framework/src/main/java/org/robolectric/shadows/ShadowDevicePolicyManager.java
View file
Open in desktop
Expand Up @@ -51,6 +51,7 @@
import android.os.PersistableBundle;
import android.os.Process;
import android.os.UserHandle;
import android.provider.Settings;
import android.text.TextUtils;
import com.android.internal.util.Preconditions;
import com.google.common.collect.ImmutableList;
Expand Down Expand Up @@ -1321,6 +1322,11 @@ protected int getPermissionPolicy(ComponentName admin) {
return permissionPolicy;
}

@Implementation(minSdk = M)
protected void setGlobalSetting(@NonNull ComponentName admin, String setting, String value) {
Settings.Global.putString(context.getContentResolver(), setting, value);
}

/**
* Grants a particular device policy for an active ComponentName.
*
Expand Down