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

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

Browse Source
This commit is contained in:
Jordan Liu
2019-12-07 00:06:23 +00:00
committed by Gerrit Code Review
parent bd4031de4a bf68dc85a4
commit 9fd7c05eb9
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Android.bp
View File

@@ -1604,10 +1604,13 @@ genrule {
filegroup { filegroup {
name: "framework-cellbroadcast-shared-srcs", name: "framework-cellbroadcast-shared-srcs",
srcs: [ srcs: [
"core/java/android/util/LocalLog.java", "core/java/android/os/HandlerExecutor.java",
"core/java/android/util/LocalLog.java",
"core/java/android/util/Slog.java", "core/java/android/util/Slog.java",
"core/java/com/android/internal/util/State.java", "core/java/com/android/internal/util/IState.java",
"core/java/com/android/internal/util/StateMachine.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",
], ],
} }

1
api/system-current.txt
View File

@@ -8583,6 +8583,7 @@ package android.telephony {
method @NonNull public android.content.ContentValues getContentValues(); method @NonNull public android.content.ContentValues getContentValues();
method @Nullable public android.telephony.SmsCbEtwsInfo getEtwsWarningInfo(); method @Nullable public android.telephony.SmsCbEtwsInfo getEtwsWarningInfo();
method public int getGeographicalScope(); method public int getGeographicalScope();
method @NonNull public java.util.List<android.telephony.CbGeoUtils.Geometry> getGeometries();
method @Nullable public String getLanguageCode(); method @Nullable public String getLanguageCode();
method @NonNull public android.telephony.SmsCbLocation getLocation(); method @NonNull public android.telephony.SmsCbLocation getLocation();
method public int getMaximumWaitingDuration(); method public int getMaximumWaitingDuration();

15
telephony/java/android/telephony/SmsCbMessage.java
View File

@@ -29,6 +29,7 @@ import android.telephony.CbGeoUtils.Geometry;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
import java.util.List; 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. * Get the warning area coordinates information represented by polygons and circles.
* @return a list of geometries, {@link Nullable} means there is no coordinate information * @return a list of geometries, or an empty list if there is no coordinate information
* associated to this message. * associated with this message.
* @hide * @hide
*/ */
@Nullable @SystemApi
@NonNull
public List<Geometry> getGeometries() { public List<Geometry> getGeometries() {
if (mGeometries == null) {
return new ArrayList<>();
}
return mGeometries; return mGeometries;
} }
@@ -720,6 +725,6 @@ public final class SmsCbMessage implements Parcelable {
* @return {@code True} if this message needs geo-fencing check. * @return {@code True} if this message needs geo-fencing check.
*/ */
public boolean needGeoFencingCheck() { public boolean needGeoFencingCheck() {
return mMaximumWaitTimeSec > 0 && mGeometries != null; return mMaximumWaitTimeSec > 0 && mGeometries != null && !mGeometries.isEmpty();
} }
} }