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

Commit 816c6637 authored by Nate Myren's avatar Nate Myren Committed by Android (Google) Code Review
Browse files

Merge "Add "contains otp" sms column" into main

parents 01ddad6a 077abbde
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -281,6 +281,7 @@ package android {
    field public static final String REBOOT = "android.permission.REBOOT";
    field public static final String RECEIVE_BOOT_COMPLETED = "android.permission.RECEIVE_BOOT_COMPLETED";
    field public static final String RECEIVE_MMS = "android.permission.RECEIVE_MMS";
    field @FlaggedApi("com.android.internal.telephony.flags.redact_otp_sms_api") public static final String RECEIVE_SENSITIVE_NOTIFICATIONS = "android.permission.RECEIVE_SENSITIVE_NOTIFICATIONS";
    field public static final String RECEIVE_SMS = "android.permission.RECEIVE_SMS";
    field public static final String RECEIVE_WAP_PUSH = "android.permission.RECEIVE_WAP_PUSH";
    field public static final String RECORD_AUDIO = "android.permission.RECORD_AUDIO";
+0 −1
Original line number Diff line number Diff line
@@ -352,7 +352,6 @@ package android {
    field public static final String RECEIVE_DEVICE_CUSTOMIZATION_READY = "android.permission.RECEIVE_DEVICE_CUSTOMIZATION_READY";
    field public static final String RECEIVE_EMERGENCY_BROADCAST = "android.permission.RECEIVE_EMERGENCY_BROADCAST";
    field @FlaggedApi("android.permission.flags.voice_activation_permission_apis") public static final String RECEIVE_SANDBOX_TRIGGER_AUDIO = "android.permission.RECEIVE_SANDBOX_TRIGGER_AUDIO";
    field @FlaggedApi("android.view.flags.sensitive_content_app_protection_api") public static final String RECEIVE_SENSITIVE_NOTIFICATIONS = "android.permission.RECEIVE_SENSITIVE_NOTIFICATIONS";
    field public static final String RECEIVE_WIFI_CREDENTIAL_CHANGE = "android.permission.RECEIVE_WIFI_CREDENTIAL_CHANGE";
    field public static final String RECORD_BACKGROUND_AUDIO = "android.permission.RECORD_BACKGROUND_AUDIO";
    field public static final String RECOVERY = "android.permission.RECOVERY";
+7 −0
Original line number Diff line number Diff line
@@ -3093,6 +3093,13 @@ package android.provider {
    field public static final String SMS_CARRIER_PROVISION_ACTION = "android.provider.Telephony.SMS_CARRIER_PROVISION";
  }

  public static interface Telephony.TextBasedSmsColumns {
    field @FlaggedApi("com.android.internal.telephony.flags.redact_otp_sms_api") public static final String CONTAINS_OTP = "contains_otp";
    field @FlaggedApi("com.android.internal.telephony.flags.redact_otp_sms_api") public static final int OTP_TYPE_CONTAINS_OTP = 1; // 0x1
    field @FlaggedApi("com.android.internal.telephony.flags.redact_otp_sms_api") public static final int OTP_TYPE_NONE = 0; // 0x0
    field @FlaggedApi("com.android.internal.telephony.flags.redact_otp_sms_api") public static final int OTP_TYPE_PENDING = 2; // 0x2
  }

  public static final class VoicemailContract.Voicemails implements android.provider.BaseColumns android.provider.OpenableColumns {
    field public static final String _DATA = "_data";
  }
+23 −2
Original line number Diff line number Diff line
@@ -1571,12 +1571,19 @@ class ContextImpl extends Context {
        sendOrderedBroadcastAsUserMultiplePermissions(intent, user, receiverPermissions, appOp,
                options, resultReceiver, scheduler, initialCode, initialData, initialExtras);
    }

    @Override
    public void sendOrderedBroadcastAsUserMultiplePermissions(Intent intent, UserHandle user,
            String[] receiverPermissions, int appOp, Bundle options,
            BroadcastReceiver resultReceiver, Handler scheduler, int initialCode,
            String initialData, Bundle initialExtras) {
        sendOrderedBroadcastAsUserMultiplePermissions(intent, user, receiverPermissions, null,
                appOp, options, resultReceiver, scheduler, initialCode, initialData, initialExtras);
    }

    private void sendOrderedBroadcastAsUserMultiplePermissions(Intent intent, UserHandle user,
            String[] receiverPermissions, String[] excludedPermissions, int appOp, Bundle options,
            BroadcastReceiver resultReceiver, Handler scheduler, int initialCode,
            String initialData, Bundle initialExtras) {
        IIntentReceiver rd = null;
        if (resultReceiver != null) {
            if (mPackageInfo != null) {
@@ -1601,7 +1608,7 @@ class ContextImpl extends Context {
            ActivityManager.getService().broadcastIntentWithFeature(
                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,
                    rd, initialCode, initialData, initialExtras, receiverPermissions,
                    null /*excludedPermissions=*/, null, appOp, options, true, false,
                    excludedPermissions, null, appOp, options, true, false,
                    user.getIdentifier());
        } catch (RemoteException e) {
            throw e.rethrowFromSystemServer();
@@ -1635,6 +1642,20 @@ class ContextImpl extends Context {
                initialExtras);
    }

    @Override
    public void sendOrderedBroadcastMultiplePermissions(Intent intent, String[] receiverPermissions,
            String[] excludedPermissions, String receiverAppOp, BroadcastReceiver resultReceiver,
            Handler scheduler, int initialCode, String initialData, @Nullable Bundle initialExtras,
            @Nullable Bundle options) {
        int intAppOp = AppOpsManager.OP_NONE;
        if (!TextUtils.isEmpty(receiverAppOp)) {
            intAppOp = AppOpsManager.strOpToOp(receiverAppOp);
        }
        sendOrderedBroadcastAsUserMultiplePermissions(intent, getUser(), receiverPermissions,
                excludedPermissions, intAppOp, options, resultReceiver, scheduler, initialCode,
                initialData, initialExtras);
    }

    @Override
    public void sendOrderedBroadcast(Intent intent, int initialCode, String receiverPermission,
            String receiverAppOp, BroadcastReceiver resultReceiver, Handler scheduler,
+15 −0
Original line number Diff line number Diff line
@@ -3161,6 +3161,21 @@ public abstract class Context {
        throw new RuntimeException("Not implemented. Must override in a subclass.");
    }

    /**
     * Like {@link #sendOrderedBroadcastMultiplePermissions(Intent, String[], String,
     * BroadcastReceiver, Handler, int, String, Bundle, Bundle)}, but also allows specification of a
     * list of multiple permissions that the receiver should NOT hold.
     * @hide
     */
    public void sendOrderedBroadcastMultiplePermissions(
            @NonNull Intent intent, @NonNull String[] receiverPermissions,
            @NonNull String[] excludedPermissions, @Nullable String receiverAppOp,
            @Nullable BroadcastReceiver resultReceiver, @Nullable Handler scheduler,
            int initialCode, @Nullable String initialData, @Nullable Bundle initialExtras,
            @Nullable Bundle options) {
        throw new RuntimeException("Not implemented. Must override in a subclass.");
    }

    /**
     * <p>Perform a {@link #sendBroadcast(Intent)} that is "sticky," meaning the
     * Intent you are sending stays around after the broadcast is complete,
Loading