Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cc0a77c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use a boolean Consumer instead of RoleManagerCallback."

parents ece6d94b 93cfd2e2
Loading
Loading
Loading
Loading
+7 −15
Original line number Diff line number Diff line
@@ -17,9 +17,7 @@
package com.android.settings.applications.defaultapps;

import android.app.role.RoleManager;
import android.app.role.RoleManagerCallback;
import android.app.settings.SettingsEnums;
import android.content.ContentResolver;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
@@ -27,7 +25,6 @@ import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.os.AsyncTask;
import android.os.Process;
import android.provider.Settings;
import android.text.TextUtils;
import android.util.Log;

@@ -100,15 +97,10 @@ public class DefaultEmergencyPicker extends DefaultAppPickerFragment {
        final String previousValue = getDefaultKey();

        if (!TextUtils.isEmpty(key) && !TextUtils.equals(key, previousValue)) {
            getContext().getSystemService(RoleManager.class)
                      .addRoleHolderAsUser(
            getContext().getSystemService(RoleManager.class).addRoleHolderAsUser(
                    RoleManager.ROLE_EMERGENCY, key, 0, Process.myUserHandle(),
                              AsyncTask.THREAD_POOL_EXECUTOR, new RoleManagerCallback() {
                                  @Override
                                  public void onSuccess() {}

                                  @Override
                                  public void onFailure() {
                    AsyncTask.THREAD_POOL_EXECUTOR, successful -> {
                        if (!successful) {
                            Log.e(TAG, "Failed to set emergency default app.");
                        }
                    });
+2 −7
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.settings.applications.defaultapps;
import static com.google.common.truth.Truth.assertThat;

import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -27,15 +26,10 @@ import static org.mockito.Mockito.when;

import android.app.Activity;
import android.app.role.RoleManager;
import android.app.role.RoleManagerCallback;
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.AsyncTask;
import android.os.Process;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
import android.util.Log;

import org.junit.Before;
import org.junit.Test;
@@ -50,6 +44,7 @@ import org.robolectric.util.ReflectionHelpers;

import java.util.Arrays;
import java.util.concurrent.Executor;
import java.util.function.Consumer;

@RunWith(RobolectricTestRunner.class)
public class DefaultEmergencyPickerTest {
@@ -90,7 +85,7 @@ public class DefaultEmergencyPickerTest {
            eq(0),
            any(UserHandle.class),
            any(Executor.class),
            any(RoleManagerCallback.class));
            any(Consumer.class));
    }

    @Test