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

Commit 13051b79 authored by Steve Kondik's avatar Steve Kondik
Browse files

Revert "Framework: Generic Blacklist support (4 of 5)"

 * Kanged

This reverts commit 39057cbd.

Change-Id: I139f29de3f76790fa5394bd17896cdf28615439d
parent 5bd8096b
Loading
Loading
Loading
Loading
+0 −4
Original line number Diff line number Diff line
@@ -203,10 +203,6 @@ public class CallLog {
         * @hide
         */
        public static final int ANSWERED_EXTERNALLY_TYPE = 7;
        /** Call log type for blacklisted calls
         * @hide
         */
        public static final int BLACKLIST_TYPE = 8;

        /** Call log type for outgoing IMS calls. */
        private static final int OUTGOING_IMS_TYPE = 9;
+1 −55
Original line number Diff line number Diff line
@@ -2997,55 +2997,6 @@ public final class Settings {

        private static final Validator NOTIFICATIONS_USE_RING_VOLUME_VALIDATOR = sBooleanValidator;

        /**
         * Whether the blacklisting feature for phone calls is enabled
         * @hide
         */
        public static final String PHONE_BLACKLIST_ENABLED = "phone_blacklist_enabled";

        /**
         * Whether a notification should be shown when a call/message is blocked
         * @hide
         */
        public static final String PHONE_BLACKLIST_NOTIFY_ENABLED = "phone_blacklist_notify_enabled";

        /**
         * Whether the blacklisting feature for phone calls from private numbers is enabled
         * @hide
         */
        public static final String PHONE_BLACKLIST_PRIVATE_NUMBER_MODE = "phone_blacklist_private_number_enabled";

        /**
         * Whether the blacklisting feature for phone calls from unknown numbers is enabled
         * @hide
         */
        public static final String PHONE_BLACKLIST_UNKNOWN_NUMBER_MODE = "phone_blacklist_unknown_number_enabled";

        /**
         * Constants to be used for {@link PHONE_BLACKLIST_PRIVATE_NUMBER_MODE} and
         * {@link PHONE_BLACKLIST_UNKNOWN_NUMBER_MODE}.
         * @hide
         */
        public static final int BLACKLIST_DO_NOT_BLOCK = 0;
        /**
         * @hide
         */
        public static final int BLACKLIST_BLOCK = 1;
        /**
         * @hide
         */
        public static final int BLACKLIST_PHONE_SHIFT = 0;
        /**
         * @hide
         */
        public static final int BLACKLIST_MESSAGE_SHIFT = 4;

        /**
         * Whether the regex blacklisting feature for phone calls is enabled
         * @hide
         */
        public static final String PHONE_BLACKLIST_REGEX_ENABLED = "phone_blacklist_regex_enabled";

        /**
         * Whether silent mode should allow vibration feedback. This is used
         * internally in AudioService and the Sound settings activity to
@@ -3769,12 +3720,7 @@ public final class Settings {
            RINGTONE,
            LOCK_TO_APP_ENABLED,
            NOTIFICATION_SOUND,
            ACCELEROMETER_ROTATION,
            PHONE_BLACKLIST_ENABLED,
            PHONE_BLACKLIST_NOTIFY_ENABLED,
            PHONE_BLACKLIST_PRIVATE_NUMBER_MODE,
            PHONE_BLACKLIST_UNKNOWN_NUMBER_MODE,
            PHONE_BLACKLIST_REGEX_ENABLED
            ACCELEROMETER_ROTATION
        };

        /**
+0 −30
Original line number Diff line number Diff line
@@ -3083,36 +3083,6 @@
    <permission android:name="android.permission.MODIFY_DAY_NIGHT_MODE"
                android:protectionLevel="signature|privileged" />

    <!-- =============================================================== -->
    <!-- Permissions for accessing security data                         -->
    <!-- =============================================================== -->
    <eat-comment />

    <!-- Used for permissions that allow an application to access or configure
         the device security information.
         @hide This is not a third-party API (intended for system apps). -->
    <permission-group android:name="android.permission-group.SECURITY"
        android:label="@string/permgrouplab_security"
        android:icon="@drawable/perm_group_security"
        android:description="@string/permgroupdesc_security"
        android:priority="400"/>

    <!-- Allows an application to read the phone blacklist data.
         @hide This is not a third-party API (intended for system apps). -->
    <permission android:name="android.permission.READ_PHONE_BLACKLIST"
        android:permissionGroup="android.permission-group.SECURITY"
        android:protectionLevel="signature|system"
        android:label="@string/permlab_readPhoneBlacklist"
        android:description="@string/permdesc_readPhoneBlacklist" />

    <!-- Allows an application to change the phone blacklist data.
         @hide This is not a third-party API (intended for system apps). -->
    <permission android:name="android.permission.CHANGE_PHONE_BLACKLIST"
        android:permissionGroup="android.permission-group.SECURITY"
        android:protectionLevel="signature|system"
        android:label="@string/permlab_changePhoneBlacklist"
        android:description="@string/permdesc_changePhoneBlacklist" />

    <!-- The system process is explicitly the only one allowed to launch the
         confirmation UI for full backup/restore -->
    <uses-permission android:name="android.permission.CONFIRM_FULL_BACKUP"/>
−1.52 KiB
Loading image diff...
−1.25 KiB
Loading image diff...
Loading