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

Commit a1bad780 authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Implement getAssets to fix crashing test" 

am: eb571153

Change-Id: I5b33a7c91c00906e4ec0b8f450d40a0630d7e269
parents c27dfca1 eb571153

tests/telephonytests/src/com/android/internal/telephony/ContextFixture.java

+7 −0
Original line number Original line Diff line number Diff line
@@ -43,6 +43,7 @@ import android.content.SharedPreferences; 
import android.content.pm.PackageManager;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.content.pm.ResolveInfo;

import android.content.pm.ServiceInfo;

import android.content.pm.ServiceInfo;

import android.content.res.AssetManager;

import android.content.res.Configuration;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.content.res.Resources;

import android.database.Cursor;

import android.database.Cursor;
@@ -266,6 +267,11 @@ public class ContextFixture implements TestFixture<Context> { 
            return 0;

            return 0;

        }

        }





        @Override

        public AssetManager getAssets() {

            return mAssetManager;

        }



        @Override

        @Override

        public Resources getResources() {

        public Resources getResources() {

            return mResources;

            return mResources;
@@ -524,6 +530,7 @@ public class ContextFixture implements TestFixture<Context> { 
    private final CarrierConfigManager mCarrierConfigManager = mock(CarrierConfigManager.class);

    private final CarrierConfigManager mCarrierConfigManager = mock(CarrierConfigManager.class);

    private final SubscriptionManager mSubscriptionManager = mock(SubscriptionManager.class);

    private final SubscriptionManager mSubscriptionManager = mock(SubscriptionManager.class);

    private final AlarmManager mAlarmManager = mock(AlarmManager.class);

    private final AlarmManager mAlarmManager = mock(AlarmManager.class);

    private final AssetManager mAssetManager = new AssetManager();

    private final ConnectivityManager mConnectivityManager = mock(ConnectivityManager.class);

    private final ConnectivityManager mConnectivityManager = mock(ConnectivityManager.class);

    private final UsageStatsManager mUsageStatManager = null;

    private final UsageStatsManager mUsageStatManager = null;

    private final WifiManager mWifiManager = mock(WifiManager.class);

    private final WifiManager mWifiManager = mock(WifiManager.class);