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

Merge "Hide CarrierMessagingServiceWrapper for now." into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-27 04:04:35 +00:00
committed by Android (Google) Code Review
parent 8a1c944d0d e75a35d3b3
commit 8e5e4e03a9
2 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
api/system-current.txt
View File

@@ -9959,28 +9959,6 @@ package android.service.carrier {
method @NonNull @WorkerThread public abstract java.util.List<android.content.ContentValues> onRestoreApns(int); method @NonNull @WorkerThread public abstract java.util.List<android.content.ContentValues> onRestoreApns(int);
} }
public abstract class CarrierMessagingServiceWrapper {
ctor public CarrierMessagingServiceWrapper();
method public boolean bindToCarrierMessagingService(@NonNull android.content.Context, @NonNull String);
method public void disposeConnection(@NonNull android.content.Context);
method public void downloadMms(@NonNull android.net.Uri, int, @NonNull android.net.Uri, @NonNull android.service.carrier.CarrierMessagingServiceWrapper.CarrierMessagingCallbackWrapper);
method public void filterSms(@NonNull android.service.carrier.MessagePdu, @NonNull String, int, int, @NonNull android.service.carrier.CarrierMessagingServiceWrapper.CarrierMessagingCallbackWrapper);
method public abstract void onServiceReady();
method public void sendDataSms(@NonNull byte[], int, @NonNull String, int, int, @NonNull android.service.carrier.CarrierMessagingServiceWrapper.CarrierMessagingCallbackWrapper);
method public void sendMms(@NonNull android.net.Uri, int, @NonNull android.net.Uri, @NonNull android.service.carrier.CarrierMessagingServiceWrapper.CarrierMessagingCallbackWrapper);
method public void sendMultipartTextSms(@NonNull java.util.List<java.lang.String>, int, @NonNull String, int, @NonNull android.service.carrier.CarrierMessagingServiceWrapper.CarrierMessagingCallbackWrapper);
method public void sendTextSms(@NonNull String, int, @NonNull String, int, @NonNull android.service.carrier.CarrierMessagingServiceWrapper.CarrierMessagingCallbackWrapper);
}
public abstract static class CarrierMessagingServiceWrapper.CarrierMessagingCallbackWrapper {
ctor public CarrierMessagingServiceWrapper.CarrierMessagingCallbackWrapper();
method public void onDownloadMmsComplete(int);
method public void onFilterComplete(int);
method public void onSendMmsComplete(int, @Nullable byte[]);
method public void onSendMultipartSmsComplete(int, @Nullable int[]);
method public void onSendSmsComplete(int, int);
}
} }
package android.service.contentcapture { package android.service.contentcapture {

17
core/java/android/service/carrier/CarrierMessagingServiceWrapper.java
View File

@@ -18,7 +18,6 @@ package android.service.carrier;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -47,7 +46,6 @@ import java.util.List;
* CarrierMessagingService. * CarrierMessagingService.
* @hide * @hide
*/ */
@SystemApi
public abstract class CarrierMessagingServiceWrapper { public abstract class CarrierMessagingServiceWrapper {
// Populated by bindToCarrierMessagingService. bindToCarrierMessagingService must complete // Populated by bindToCarrierMessagingService. bindToCarrierMessagingService must complete
// prior to calling disposeConnection so that mCarrierMessagingServiceConnection is initialized. // prior to calling disposeConnection so that mCarrierMessagingServiceConnection is initialized.
@@ -64,7 +62,6 @@ public abstract class CarrierMessagingServiceWrapper {
* @return true upon successfully binding to a carrier messaging service, false otherwise * @return true upon successfully binding to a carrier messaging service, false otherwise
* @hide * @hide
*/ */
@SystemApi
public boolean bindToCarrierMessagingService(@NonNull Context context, public boolean bindToCarrierMessagingService(@NonNull Context context,
@NonNull String carrierPackageName) { @NonNull String carrierPackageName) {
Preconditions.checkState(mCarrierMessagingServiceConnection == null); Preconditions.checkState(mCarrierMessagingServiceConnection == null);
@@ -82,7 +79,6 @@ public abstract class CarrierMessagingServiceWrapper {
* @param context the context * @param context the context
* @hide * @hide
*/ */
@SystemApi
public void disposeConnection(@NonNull Context context) { public void disposeConnection(@NonNull Context context) {
Preconditions.checkNotNull(mCarrierMessagingServiceConnection); Preconditions.checkNotNull(mCarrierMessagingServiceConnection);
context.unbindService(mCarrierMessagingServiceConnection); context.unbindService(mCarrierMessagingServiceConnection);
@@ -93,7 +89,6 @@ public abstract class CarrierMessagingServiceWrapper {
* Implemented by subclasses to use the carrier messaging service once it is ready. * Implemented by subclasses to use the carrier messaging service once it is ready.
* @hide * @hide
*/ */
@SystemApi
public abstract void onServiceReady(); public abstract void onServiceReady();
/** /**
@@ -117,7 +112,6 @@ public abstract class CarrierMessagingServiceWrapper {
* @param callback the callback to notify upon completion * @param callback the callback to notify upon completion
* @hide * @hide
*/ */
@SystemApi
public void filterSms(@NonNull MessagePdu pdu, @NonNull String format, int destPort, public void filterSms(@NonNull MessagePdu pdu, @NonNull String format, int destPort,
int subId, @NonNull final CarrierMessagingCallbackWrapper callback) { int subId, @NonNull final CarrierMessagingCallbackWrapper callback) {
if (mICarrierMessagingService != null) { if (mICarrierMessagingService != null) {
@@ -142,7 +136,6 @@ public abstract class CarrierMessagingServiceWrapper {
* @param callback the callback to notify upon completion * @param callback the callback to notify upon completion
* @hide * @hide
*/ */
@SystemApi
public void sendTextSms(@NonNull String text, int subId, @NonNull String destAddress, public void sendTextSms(@NonNull String text, int subId, @NonNull String destAddress,
int sendSmsFlag, @NonNull final CarrierMessagingCallbackWrapper callback) { int sendSmsFlag, @NonNull final CarrierMessagingCallbackWrapper callback) {
if (mICarrierMessagingService != null) { if (mICarrierMessagingService != null) {
@@ -168,7 +161,6 @@ public abstract class CarrierMessagingServiceWrapper {
* @param callback the callback to notify upon completion * @param callback the callback to notify upon completion
* @hide * @hide
*/ */
@SystemApi
public void sendDataSms(@NonNull byte[] data, int subId, @NonNull String destAddress, public void sendDataSms(@NonNull byte[] data, int subId, @NonNull String destAddress,
int destPort, int sendSmsFlag, int destPort, int sendSmsFlag,
@NonNull final CarrierMessagingCallbackWrapper callback) { @NonNull final CarrierMessagingCallbackWrapper callback) {
@@ -194,7 +186,6 @@ public abstract class CarrierMessagingServiceWrapper {
* @param callback the callback to notify upon completion * @param callback the callback to notify upon completion
* @hide * @hide
*/ */
@SystemApi
public void sendMultipartTextSms(@NonNull List<String> parts, int subId, public void sendMultipartTextSms(@NonNull List<String> parts, int subId,
@NonNull String destAddress, int sendSmsFlag, @NonNull String destAddress, int sendSmsFlag,
@NonNull final CarrierMessagingCallbackWrapper callback) { @NonNull final CarrierMessagingCallbackWrapper callback) {
@@ -220,7 +211,6 @@ public abstract class CarrierMessagingServiceWrapper {
* @param callback the callback to notify upon completion * @param callback the callback to notify upon completion
* @hide * @hide
*/ */
@SystemApi
public void sendMms(@NonNull Uri pduUri, int subId, @NonNull Uri location, public void sendMms(@NonNull Uri pduUri, int subId, @NonNull Uri location,
@NonNull final CarrierMessagingCallbackWrapper callback) { @NonNull final CarrierMessagingCallbackWrapper callback) {
if (mICarrierMessagingService != null) { if (mICarrierMessagingService != null) {
@@ -244,7 +234,6 @@ public abstract class CarrierMessagingServiceWrapper {
* @param callback the callback to notify upon completion * @param callback the callback to notify upon completion
* @hide * @hide
*/ */
@SystemApi
public void downloadMms(@NonNull Uri pduUri, int subId, @NonNull Uri location, public void downloadMms(@NonNull Uri pduUri, int subId, @NonNull Uri location,
@NonNull final CarrierMessagingCallbackWrapper callback) { @NonNull final CarrierMessagingCallbackWrapper callback) {
if (mICarrierMessagingService != null) { if (mICarrierMessagingService != null) {
@@ -276,7 +265,6 @@ public abstract class CarrierMessagingServiceWrapper {
* {@link CarrierMessagingServiceWrapper}. * {@link CarrierMessagingServiceWrapper}.
* @hide * @hide
*/ */
@SystemApi
public abstract static class CarrierMessagingCallbackWrapper { public abstract static class CarrierMessagingCallbackWrapper {
/** /**
@@ -289,7 +277,6 @@ public abstract class CarrierMessagingServiceWrapper {
* {@see CarrierMessagingService#onReceiveTextSms}. * {@see CarrierMessagingService#onReceiveTextSms}.
* @hide * @hide
*/ */
@SystemApi
public void onFilterComplete(int result) { public void onFilterComplete(int result) {
} }
@@ -304,7 +291,6 @@ public abstract class CarrierMessagingServiceWrapper {
* only if result is {@link CarrierMessagingService#SEND_STATUS_OK}. * only if result is {@link CarrierMessagingService#SEND_STATUS_OK}.
* @hide * @hide
*/ */
@SystemApi
public void onSendSmsComplete(int result, int messageRef) { public void onSendSmsComplete(int result, int messageRef) {
} }
@@ -319,7 +305,6 @@ public abstract class CarrierMessagingServiceWrapper {
* {@link CarrierMessagingService#SEND_STATUS_OK}. * {@link CarrierMessagingService#SEND_STATUS_OK}.
* @hide * @hide
*/ */
@SystemApi
public void onSendMultipartSmsComplete(int result, @Nullable int[] messageRefs) { public void onSendMultipartSmsComplete(int result, @Nullable int[] messageRefs) {
} }
@@ -334,7 +319,6 @@ public abstract class CarrierMessagingServiceWrapper {
* {@link CarrierMessagingService#SEND_STATUS_OK}. * {@link CarrierMessagingService#SEND_STATUS_OK}.
* @hide * @hide
*/ */
@SystemApi
public void onSendMmsComplete(int result, @Nullable byte[] sendConfPdu) { public void onSendMmsComplete(int result, @Nullable byte[] sendConfPdu) {
} }
@@ -346,7 +330,6 @@ public abstract class CarrierMessagingServiceWrapper {
* and {@link CarrierMessagingService#SEND_STATUS_ERROR}. * and {@link CarrierMessagingService#SEND_STATUS_ERROR}.
* @hide * @hide
*/ */
@SystemApi
public void onDownloadMmsComplete(int result) { public void onDownloadMmsComplete(int result) {
} }