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

Commit b2e7b3a2 authored by Makoto Onuki's avatar Makoto Onuki Committed by Android (Google) Code Review
Browse files

Merge "Remove "import JobService" to remove build time dependency"

parents 0f8ad443 c8c7114c

telephony/java/android/provider/Telephony.java

+16 −11
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.annotation.SdkConstant.SdkConstantType; 
import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.annotation.UnsupportedAppUsage;

import android.app.job.JobService;

import android.content.ComponentName;

import android.content.ContentResolver;

import android.content.ContentValues;
@@ -4102,9 +4101,11 @@ public final class Telephony { 
         * ServiceState provider.

         * <p>

         * Use this {@link Uri} with a {@link ContentObserver} to be notified of changes to the

         * {@link ServiceState} while your app is running.  You can also use a {@link JobService} to

         * {@link ServiceState} while your app is running.

         * You can also use a {@link android.app.job.JobService} to

         * ensure your app is notified of changes to the {@link Uri} even when it is not running.

         * Note, however, that using a {@link JobService} does not guarantee timely delivery of

         * Note, however, that using a {@link android.app.job.JobService}

         * does not guarantee timely delivery of

         * updates to the {@link Uri}.

         *

         * @param subscriptionId the subscriptionId to receive updates on
@@ -4121,9 +4122,11 @@ public final class Telephony { 
         * ServiceState provider.

         * <p>

         * Use this {@link Uri} with a {@link ContentObserver} to be notified of changes to the

         * {@link ServiceState} while your app is running.  You can also use a {@link JobService} to

         * {@link ServiceState} while your app is running.  You can also use a

         * {@link android.app.job.JobService} to

         * ensure your app is notified of changes to the {@link Uri} even when it is not running.

         * Note, however, that using a {@link JobService} does not guarantee timely delivery of

         * Note, however, that using a {@link android.app.job.JobService}

         * does not guarantee timely delivery of

         * updates to the {@link Uri}.

         *

         * @param subscriptionId the subscriptionId to receive updates on
@@ -4378,10 +4381,11 @@ public final class Telephony { 
         * <p>

         * Use this {@link Uri} with a {@link ContentObserver} to be notified of changes to the

         * carrier identity {@link TelephonyManager#getSimCarrierId()}

         * while your app is running. You can also use a {@link JobService} to ensure your app

         * while your app is running. You can also use a {@link android.app.job.JobService}

         * to ensure your app

         * is notified of changes to the {@link Uri} even when it is not running.

         * Note, however, that using a {@link JobService} does not guarantee timely delivery of

         * updates to the {@link Uri}.

         * Note, however, that using a {@link android.app.job.JobService} does not guarantee

         * timely delivery of updates to the {@link Uri}.

         *

         * @param subscriptionId the subscriptionId to receive updates on

         * @return the Uri used to observe carrier identity changes
@@ -4399,10 +4403,11 @@ public final class Telephony { 
         * <p>

         * Use this {@link Uri} with a {@link ContentObserver} to be notified of changes to the

         * specific carrier identity {@link TelephonyManager#getSimSpecificCarrierId()}

         * while your app is running. You can also use a {@link JobService} to ensure your app

         * while your app is running. You can also use a {@link android.app.job.JobService}

         * to ensure your app

         * is notified of changes to the {@link Uri} even when it is not running.

         * Note, however, that using a {@link JobService} does not guarantee timely delivery of

         * updates to the {@link Uri}.

         * Note, however, that using a {@link android.app.job.JobService} does not guarantee timely

         * delivery of updates to the {@link Uri}.

         *

         * @param subscriptionId the subscriptionId to receive updates on

         * @return the Uri used to observe specific carrier identity changes

telephony/java/android/telephony/SubscriptionManager.java

+24 −24
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import android.annotation.SystemService; 
import android.annotation.UnsupportedAppUsage;

import android.app.BroadcastOptions;

import android.app.PendingIntent;

import android.app.job.JobService;

import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageInfo;
@@ -147,10 +146,11 @@ public class SubscriptionManager { 
     * <p>

     * Use this {@link Uri} with a {@link ContentObserver} to be notified of changes to the

     * subscription wfc enabled {@link ImsMmTelManager#isVoWiFiSettingEnabled()}

     * while your app is running. You can also use a {@link JobService} to ensure your app

     * while your app is running. You can also use a {@link android.app.job.JobService}

     * to ensure your app

     * is notified of changes to the {@link Uri} even when it is not running.

     * Note, however, that using a {@link JobService} does not guarantee timely delivery of

     * updates to the {@link Uri}.

     * Note, however, that using a {@link android.app.job.JobService} does not guarantee timely

     * delivery of updates to the {@link Uri}.

     * To be notified of changes to a specific subId, append subId to the URI

     * {@link Uri#withAppendedPath(Uri, String)}.

     * @hide
@@ -166,10 +166,10 @@ public class SubscriptionManager { 
     * Use this {@link Uri} with a {@link ContentObserver} to be notified of changes to the

     * subscription advanced calling enabled

     * {@link ImsMmTelManager#isAdvancedCallingSettingEnabled()} while your app is running.

     * You can also use a {@link JobService} to ensure your app is notified of changes to the

     * {@link Uri} even when it is not running.

     * Note, however, that using a {@link JobService} does not guarantee timely delivery of

     * updates to the {@link Uri}.

     * You can also use a {@link android.app.job.JobService} to ensure your app is notified of

     * changes to the {@link Uri} even when it is not running.

     * Note, however, that using a {@link android.app.job.JobService} does not guarantee timely

     * delivery of updates to the {@link Uri}.

     * To be notified of changes to a specific subId, append subId to the URI

     * {@link Uri#withAppendedPath(Uri, String)}.

     * @hide
@@ -184,10 +184,10 @@ public class SubscriptionManager { 
     * <p>

     * Use this {@link Uri} with a {@link ContentObserver} to be notified of changes to the

     * subscription wfc mode {@link ImsMmTelManager#getVoWiFiModeSetting()}

     * while your app is running. You can also use a {@link JobService} to ensure your app

     * is notified of changes to the {@link Uri} even when it is not running.

     * Note, however, that using a {@link JobService} does not guarantee timely delivery of

     * updates to the {@link Uri}.

     * while your app is running. You can also use a {@link android.app.job.JobService} to ensure

     * your app is notified of changes to the {@link Uri} even when it is not running.

     * Note, however, that using a {@link android.app.job.JobService} does not guarantee timely

     * delivery of updates to the {@link Uri}.

     * To be notified of changes to a specific subId, append subId to the URI

     * {@link Uri#withAppendedPath(Uri, String)}.

     * @hide
@@ -201,10 +201,10 @@ public class SubscriptionManager { 
     * <p>

     * Use this {@link Uri} with a {@link ContentObserver} to be notified of changes to the

     * subscription wfc roaming mode {@link ImsMmTelManager#getVoWiFiRoamingModeSetting()}

     * while your app is running. You can also use a {@link JobService} to ensure your app

     * is notified of changes to the {@link Uri} even when it is not running.

     * Note, however, that using a {@link JobService} does not guarantee timely delivery of

     * updates to the {@link Uri}.

     * while your app is running. You can also use a {@link android.app.job.JobService}

     * to ensure your app is notified of changes to the {@link Uri} even when it is not running.

     * Note, however, that using a {@link android.app.job.JobService} does not guarantee timely

     * delivery of updates to the {@link Uri}.

     * To be notified of changes to a specific subId, append subId to the URI

     * {@link Uri#withAppendedPath(Uri, String)}.

     * @hide
@@ -220,10 +220,10 @@ public class SubscriptionManager { 
     * <p>

     * Use this {@link Uri} with a {@link ContentObserver} to be notified of changes to the

     * subscription vt enabled {@link ImsMmTelManager#isVtSettingEnabled()}

     * while your app is running. You can also use a {@link JobService} to ensure your app

     * is notified of changes to the {@link Uri} even when it is not running.

     * Note, however, that using a {@link JobService} does not guarantee timely delivery of

     * updates to the {@link Uri}.

     * while your app is running. You can also use a {@link android.app.job.JobService} to ensure

     * your app is notified of changes to the {@link Uri} even when it is not running.

     * Note, however, that using a {@link android.app.job.JobService} does not guarantee timely

     * delivery of updates to the {@link Uri}.

     * To be notified of changes to a specific subId, append subId to the URI

     * {@link Uri#withAppendedPath(Uri, String)}.

     * @hide
@@ -238,10 +238,10 @@ public class SubscriptionManager { 
     * <p>

     * Use this {@link Uri} with a {@link ContentObserver} to be notified of changes to the

     * subscription wfc roaming enabled {@link ImsMmTelManager#isVoWiFiRoamingSettingEnabled()}

     * while your app is running. You can also use a {@link JobService} to ensure your app

     * is notified of changes to the {@link Uri} even when it is not running.

     * Note, however, that using a {@link JobService} does not guarantee timely delivery of

     * updates to the {@link Uri}.

     * while your app is running. You can also use a {@link android.app.job.JobService} to ensure

     * your app is notified of changes to the {@link Uri} even when it is not running.

     * Note, however, that using a {@link android.app.job.JobService} does not guarantee timely

     * delivery of updates to the {@link Uri}.

     * To be notified of changes to a specific subId, append subId to the URI

     * {@link Uri#withAppendedPath(Uri, String)}.

     * @hide