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

Commit 6824b2d6 authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Expose some SystemApis and edit framework-cellbroadcast-shared-srcs" 

am: 9fd7c05e

Change-Id: I94b42317c352098ddef066e065a6a911cb13c0bd
parents 2fb54515 9fd7c05e

Android.bp

+6 −3
Original line number Diff line number Diff line
@@ -1604,8 +1604,11 @@ genrule { 
filegroup {

    name: "framework-cellbroadcast-shared-srcs",

    srcs: [

	"core/java/android/os/HandlerExecutor.java",

	"core/java/android/util/LocalLog.java",

        "core/java/android/util/Slog.java",

	"core/java/com/android/internal/util/IState.java",

	"core/java/com/android/internal/util/Preconditions.java",

	"core/java/com/android/internal/util/State.java",

	"core/java/com/android/internal/util/StateMachine.java",

    ],

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8583,6 +8583,7 @@ package android.telephony { 
    method @NonNull public android.content.ContentValues getContentValues();

    method @Nullable public android.telephony.SmsCbEtwsInfo getEtwsWarningInfo();

    method public int getGeographicalScope();

    method @NonNull public java.util.List<android.telephony.CbGeoUtils.Geometry> getGeometries();

    method @Nullable public String getLanguageCode();

    method @NonNull public android.telephony.SmsCbLocation getLocation();

    method public int getMaximumWaitingDuration();

telephony/java/android/telephony/SmsCbMessage.java

+10 −5
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.telephony.CbGeoUtils.Geometry; 


import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.ArrayList;

import java.util.List;



/**
@@ -407,13 +408,17 @@ public final class SmsCbMessage implements Parcelable { 
    }



    /**

     * Get the warning area coordinates information represent by polygons and circles.

     * @return a list of geometries, {@link Nullable} means there is no coordinate information

     * associated to this message.

     * Get the warning area coordinates information represented by polygons and circles.

     * @return a list of geometries, or an empty list if there is no coordinate information

     * associated with this message.

     * @hide

     */

    @Nullable

    @SystemApi

    @NonNull

    public List<Geometry> getGeometries() {

        if (mGeometries == null) {

            return new ArrayList<>();

        }

        return mGeometries;

    }
@@ -720,6 +725,6 @@ public final class SmsCbMessage implements Parcelable { 
     * @return {@code True} if this message needs geo-fencing check.

     */

    public boolean needGeoFencingCheck() {

        return mMaximumWaitTimeSec > 0 && mGeometries != null;

        return mMaximumWaitTimeSec > 0 && mGeometries != null && !mGeometries.isEmpty();

    }

}