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

Commit 083022a7 authored by Holly Jiuyu Sun's avatar Holly Jiuyu Sun Committed by android-build-merger
Browse files

Merge "Make getIEuiccContronller() protected and non-static for CTS." am: 2378a2ca 

am: 24ba89da

Change-Id: Ia5313c8daab24242ae4a00bfdc23eb4f23634558
parents c240b8c2 24ba89da

telephony/java/android/telephony/euicc/EuiccManager.java

+6 −1
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ import android.annotation.IntDef; 
import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.SdkConstant;

import android.annotation.SdkConstant;

import android.annotation.SystemApi;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.app.Activity;

import android.app.Activity;

import android.app.PendingIntent;

import android.app.PendingIntent;

import android.content.Context;

import android.content.Context;
@@ -598,7 +599,11 @@ public class EuiccManager { 
        }

        }

    }

    }





    private static IEuiccController getIEuiccController() {

    /**

     * @hide

     */

    @TestApi

    protected IEuiccController getIEuiccController() {

        return IEuiccController.Stub.asInterface(ServiceManager.getService("econtroller"));

        return IEuiccController.Stub.asInterface(ServiceManager.getService("econtroller"));

    }

    }

}
 
}