Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: ac335868bf

Change-Id: I9aa2595a7c8024f4c5d34bc63a5d70ebce41ce15
This commit is contained in:
Makoto Onuki
2019-12-13 16:02:34 -08:00
committed by android-build-merger
parent 4643b919cd ac335868bf
commit 848155a0fb
2 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/java/android/provider/Telephony.java
View File

@@ -25,7 +25,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;
@@ -4380,9 +4379,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
@@ -4399,9 +4400,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
@@ -4655,10 +4658,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
@@ -4676,10 +4680,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

48
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -35,7 +35,6 @@ import android.annotation.TestApi;
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;
@@ -148,10 +147,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
@@ -168,10 +168,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
@@ -187,10 +187,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
@@ -205,10 +205,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
@@ -225,10 +225,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
@@ -244,10 +244,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