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

Commit b287a05c authored by zachh's avatar zachh Committed by Copybara-Service
Browse files

Removed static configProvider field in ConfigProviderBindings. 

Also removed setForTesting method as it was only used to reset static state which no longer exists.

Bug: 80441695
Test: tap
PiperOrigin-RevId: 198789280
Change-Id: If56aa3942bcb12c950c9250309b51e72f59c5bdc
parent 3fe4d2bd

java/com/android/dialer/configprovider/ConfigProviderBindings.java

+1 −13
Original line number Original line Diff line number Diff line
@@ -18,35 +18,23 @@ package com.android.dialer.configprovider; 




import android.content.Context;

import android.content.Context;

import android.support.annotation.NonNull;

import android.support.annotation.NonNull;

import android.support.annotation.Nullable;

import android.support.annotation.VisibleForTesting;

import android.support.v4.os.UserManagerCompat;

import android.support.v4.os.UserManagerCompat;

import com.android.dialer.common.Assert;

import com.android.dialer.common.Assert;





/** Accessor for getting a {@link ConfigProvider}. */

/** Accessor for getting a {@link ConfigProvider}. */

public class ConfigProviderBindings {

public class ConfigProviderBindings {





  private static ConfigProvider configProvider;

  private static ConfigProvider configProviderStub;

  private static ConfigProvider configProviderStub;





  public static ConfigProvider get(@NonNull Context context) {

  public static ConfigProvider get(@NonNull Context context) {

    Assert.isNotNull(context);

    Assert.isNotNull(context);

    if (configProvider != null) {

      return configProvider;

    }

    if (!UserManagerCompat.isUserUnlocked(context)) {

    if (!UserManagerCompat.isUserUnlocked(context)) {

      if (configProviderStub == null) {

      if (configProviderStub == null) {

        configProviderStub = new ConfigProviderStub();

        configProviderStub = new ConfigProviderStub();

      }

      }

      return configProviderStub;

      return configProviderStub;

    }

    }

    configProvider = ConfigProviderComponent.get(context).getConfigProvider();

    return ConfigProviderComponent.get(context).getConfigProvider();

    return configProvider;

  }



  @VisibleForTesting

  public static void setForTesting(@Nullable ConfigProvider configProviderForTesting) {

    configProvider = configProviderForTesting;

  }

  }





  private static class ConfigProviderStub implements ConfigProvider {

  private static class ConfigProviderStub implements ConfigProvider {