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

Commit bebb70e5 authored by Hakjun Choi's avatar Hakjun Choi Committed by Android (Google) Code Review
Browse files

Merge "Edited to correct incorrect decription"

parents dff3337f 8ef04327

telephony/java/android/telephony/ims/ImsMmTelManager.java

+0 −8
Original line number Diff line number Diff line
@@ -539,7 +539,6 @@ public class ImsMmTelManager implements RegistrationManager { 
     *     <li>The caller has carrier privileges (see

     *     {@link android.telephony.TelephonyManager#hasCarrierPrivileges}) on any

     *     active subscription.</li>

     *     <li>The caller is the default SMS app for the device.</li>

     * </ul>

     * <p>The profile owner is an app that owns a managed profile on the device; for more details

     * see <a href="https://developer.android.com/work/managed-profiles">Work profiles</a>.
@@ -601,7 +600,6 @@ public class ImsMmTelManager implements RegistrationManager { 
     *     <li>The caller has carrier privileges (see

     *     {@link android.telephony.TelephonyManager#hasCarrierPrivileges}) on any

     *     active subscription.</li>

     *     <li>The caller is the default SMS app for the device.</li>

     * </ul>

     * <p>The profile owner is an app that owns a managed profile on the device; for more details

     * see <a href="https://developer.android.com/work/managed-profiles">Work profiles</a>.
@@ -649,7 +647,6 @@ public class ImsMmTelManager implements RegistrationManager { 
     *     <li>The caller has carrier privileges (see

     *     {@link android.telephony.TelephonyManager#hasCarrierPrivileges}) on any

     *     active subscription.</li>

     *     <li>The caller is the default SMS app for the device.</li>

     * </ul>

     * <p>The profile owner is an app that owns a managed profile on the device; for more details

     * see <a href="https://developer.android.com/work/managed-profiles">Work profiles</a>.
@@ -862,7 +859,6 @@ public class ImsMmTelManager implements RegistrationManager { 
     *     <li>The caller has carrier privileges (see

     *     {@link android.telephony.TelephonyManager#hasCarrierPrivileges}) on any

     *     active subscription.</li>

     *     <li>The caller is the default SMS app for the device.</li>

     * </ul>

     * <p>The profile owner is an app that owns a managed profile on the device; for more details

     * see <a href="https://developer.android.com/work/managed-profiles">Work profiles</a>.
@@ -937,7 +933,6 @@ public class ImsMmTelManager implements RegistrationManager { 
     *     <li>The caller has carrier privileges (see

     *     {@link android.telephony.TelephonyManager#hasCarrierPrivileges}) on any

     *     active subscription.</li>

     *     <li>The caller is the default SMS app for the device.</li>

     * </ul>

     * <p>The profile owner is an app that owns a managed profile on the device; for more details

     * see <a href="https://developer.android.com/work/managed-profiles">Work profiles</a>.
@@ -1111,7 +1106,6 @@ public class ImsMmTelManager implements RegistrationManager { 
     *     <li>The caller has carrier privileges (see

     *     {@link android.telephony.TelephonyManager#hasCarrierPrivileges}) on any

     *     active subscription.</li>

     *     <li>The caller is the default SMS app for the device.</li>

     * </ul>

     * <p>The profile owner is an app that owns a managed profile on the device; for more details

     * see <a href="https://developer.android.com/work/managed-profiles">Work profiles</a>.
@@ -1226,7 +1220,6 @@ public class ImsMmTelManager implements RegistrationManager { 
     *     <li>The caller has carrier privileges (see

     *     {@link android.telephony.TelephonyManager#hasCarrierPrivileges}) on any

     *     active subscription.</li>

     *     <li>The caller is the default SMS app for the device.</li>

     * </ul>

     * <p>The profile owner is an app that owns a managed profile on the device; for more details

     * see <a href="https://developer.android.com/work/managed-profiles">Work profiles</a>.
@@ -1415,7 +1408,6 @@ public class ImsMmTelManager implements RegistrationManager { 
     *     <li>The caller has carrier privileges (see

     *     {@link android.telephony.TelephonyManager#hasCarrierPrivileges}) on any

     *     active subscription.</li>

     *     <li>The caller is the default SMS app for the device.</li>

     * </ul>

     * <p>The profile owner is an app that owns a managed profile on the device; for more details

     * see <a href="https://developer.android.com/work/managed-profiles">Work profiles</a>.

telephony/java/android/telephony/ims/ProvisioningManager.java

+3 −0
Original line number Diff line number Diff line
@@ -55,6 +55,9 @@ import java.util.concurrent.Executor; 
 * IMS provisioning keys are defined per carrier or OEM using OMA-DM or other provisioning

 * applications and may vary. It is up to the carrier and OEM applications to ensure that the

 * correct provisioning keys are being used when integrating with a vendor's ImsService.

 *

 * Use {@link android.telephony.ims.ImsManager#getProvisioningManager(int)} to get an instance of

 * this manager.

 */

@RequiresFeature(PackageManager.FEATURE_TELEPHONY_IMS)

public class ProvisioningManager {