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

Commit 5e215e6d authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "Merge Android R"

parents c230d42e 2f318fa1

Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -58,9 +58,10 @@ java_library { 
    },

    srcs: [

        ":opt-telephony-common-srcs",

        ":framework-telephony-stack-shared-srcs",

        ":framework-telephony-common-shared-srcs",

        ":net-utils-telephony-common-srcs",

        ":statslog-telephony-java-gen",

        ":statslog-cellbroadcast-java-gen",

        "src/java/**/I*.aidl",

        "src/java/**/*.logtags",

    ],

jarjar-rules-shared.txt

+1 −0
Original line number Diff line number Diff line 
rule android.net.NetworkFactory* com.android.internal.telephony.NetworkFactory@1

rule android.os.BasicShellCommandHandler* com.android.internal.telephony.BasicShellCommandHandler@1

rule android.os.RegistrantList* com.android.internal.telephony.RegistrantList@1

rule android.os.Registrant* com.android.internal.telephony.Registrant@1

rule android.hidl.** android.internal.hidl.@1

proto/src/telephony.proto

+3 −0
Original line number Diff line number Diff line
@@ -2611,6 +2611,9 @@ message SmsSession { 


    // Indicates if the incoming SMS was blocked

    optional bool blocked = 17;



    // Optional xMS message unique id

    optional int64 message_id = 18;

  }



  // Time when session has started, in minutes since epoch,

src/java/com/android/internal/telephony/BlockChecker.java

+0 −1
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ public class BlockChecker { 
        } catch (Exception e) {

            Rlog.e(TAG, "Exception checking for blocked number: " + e);

        }



        int durationMillis = (int) ((System.nanoTime() - startTimeNano) / 1000000);

        if (durationMillis > 500 || VDBG) {

            Rlog.d(TAG, "Blocked number lookup took: " + durationMillis + " ms.");

src/java/com/android/internal/telephony/Call.java

+8 −16
Original line number Diff line number Diff line
@@ -37,23 +37,15 @@ public abstract class Call { 
    /* Enums */

    @UnsupportedAppUsage(implicitMember = "values()[Lcom/android/internal/telephony/Call$State;")

    public enum State {

        @UnsupportedAppUsage

        IDLE,

        @UnsupportedAppUsage IDLE,

        ACTIVE,

        @UnsupportedAppUsage

        HOLDING,

        @UnsupportedAppUsage

        DIALING,

        @UnsupportedAppUsage

        ALERTING,

        @UnsupportedAppUsage

        INCOMING,

        @UnsupportedAppUsage

        WAITING,

        @UnsupportedAppUsage

        DISCONNECTED,

        @UnsupportedAppUsage

        DISCONNECTING;

        @UnsupportedAppUsage HOLDING,

        @UnsupportedAppUsage DIALING,

        @UnsupportedAppUsage ALERTING,

        @UnsupportedAppUsage INCOMING,

        @UnsupportedAppUsage WAITING,

        @UnsupportedAppUsage DISCONNECTED,

        @UnsupportedAppUsage DISCONNECTING;



        @UnsupportedAppUsage

        public boolean isAlive() {