diff options
| -rw-r--r-- | Android.bp | 18 | ||||
| -rw-r--r-- | core/java/android/provider/OWNERS | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/ConnectivityService.java | 11 | ||||
| -rwxr-xr-x | telephony/java/android/telephony/CarrierConfigManager.java | 10 | ||||
| -rw-r--r-- | telephony/java/android/telephony/ims/ImsSsInfo.java | 4 | ||||
| -rw-r--r-- | test-base/Android.bp | 13 | ||||
| -rw-r--r-- | test-mock/Android.bp | 12 | ||||
| -rw-r--r-- | test-runner/Android.bp | 13 |
8 files changed, 83 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp index 126b763bc54f..b27003964125 100644 --- a/Android.bp +++ b/Android.bp @@ -1102,6 +1102,24 @@ filegroup { ], } +// Make the api/system-current.txt file available for use by modules in other +// directories. +filegroup { + name: "frameworks-base-api-system-current.txt", + srcs: [ + "api/system-current.txt", + ], +} + +// Make the api/system-removed.txt file available for use by modules in other +// directories. +filegroup { + name: "frameworks-base-api-system-removed.txt", + srcs: [ + "api/system-removed.txt", + ], +} + framework_docs_only_args = " -android -manifest $(location core/res/AndroidManifest.xml) " + "-werror -lerror -hide 111 -hide 113 -hide 125 -hide 126 -hide 127 -hide 128 " + "-overview $(location core/java/overview.html) " + diff --git a/core/java/android/provider/OWNERS b/core/java/android/provider/OWNERS new file mode 100644 index 000000000000..8b7d6ad851f9 --- /dev/null +++ b/core/java/android/provider/OWNERS @@ -0,0 +1,4 @@ +per-file DeviceConfig.java = svetoslavganov@google.com +per-file DeviceConfig.java = hackbod@google.com + + diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index dbee09450faa..c64c2783da51 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -2661,6 +2661,17 @@ public class ConnectivityService extends IConnectivityManager.Stub NetworkAgent.CMD_REPORT_NETWORK_STATUS, (valid ? NetworkAgent.VALID_NETWORK : NetworkAgent.INVALID_NETWORK), 0, redirectUrlBundle); + + // If NetworkMonitor detects partial connectivity before + // EVENT_PROMPT_UNVALIDATED arrives, show the partial connectivity notification + // immediately. Re-notify partial connectivity silently if no internet + // notification already there. + if (!wasPartial && nai.partialConnectivity) { + // Remove delayed message if there is a pending message. + mHandler.removeMessages(EVENT_PROMPT_UNVALIDATED, nai.network); + handlePromptUnvalidated(nai.network); + } + if (wasValidated && !nai.lastValidated) { handleNetworkUnvalidated(nai); } diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 0ebbbc623c45..5ddc3be91db2 100755 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1021,6 +1021,15 @@ public class CarrierConfigManager { "support_manage_ims_conference_call_bool"; /** + * Determines whether the IMS conference merge process supports and returns its participants + * data. When {@code true}, on merge complete, conference call would have a list of its + * participants returned in XML format, {@code false otherwise}. + * @hide + */ + public static final String KEY_SUPPORT_IMS_CONFERENCE_EVENT_PACKAGE_BOOL = + "support_ims_conference_event_package_bool"; + + /** * Determines whether High Definition audio property is displayed in the dialer UI. * If {@code false}, remove the HD audio property from the connection so that HD audio related * UI is not displayed. If {@code true}, keep HD audio property as it is configured. @@ -2864,6 +2873,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_SUPPORT_CONFERENCE_CALL_BOOL, true); sDefaults.putBoolean(KEY_SUPPORT_IMS_CONFERENCE_CALL_BOOL, true); sDefaults.putBoolean(KEY_SUPPORT_MANAGE_IMS_CONFERENCE_CALL_BOOL, true); + sDefaults.putBoolean(KEY_SUPPORT_IMS_CONFERENCE_EVENT_PACKAGE_BOOL, true); sDefaults.putBoolean(KEY_SUPPORT_VIDEO_CONFERENCE_CALL_BOOL, false); sDefaults.putBoolean(KEY_IS_IMS_CONFERENCE_SIZE_ENFORCED_BOOL, false); sDefaults.putInt(KEY_IMS_CONFERENCE_SIZE_LIMIT_INT, 5); diff --git a/telephony/java/android/telephony/ims/ImsSsInfo.java b/telephony/java/android/telephony/ims/ImsSsInfo.java index fba390c26242..02f0cef04a21 100644 --- a/telephony/java/android/telephony/ims/ImsSsInfo.java +++ b/telephony/java/android/telephony/ims/ImsSsInfo.java @@ -250,6 +250,8 @@ public final class ImsSsInfo implements Parcelable { out.writeInt(mStatus); out.writeString(mIcbNum); out.writeInt(mProvisionStatus); + out.writeInt(mClirInterrogationStatus); + out.writeInt(mClirOutgoingState); } @Override @@ -273,6 +275,8 @@ public final class ImsSsInfo implements Parcelable { mStatus = in.readInt(); mIcbNum = in.readString(); mProvisionStatus = in.readInt(); + mClirInterrogationStatus = in.readInt(); + mClirOutgoingState = in.readInt(); } public static final Creator<ImsSsInfo> CREATOR = diff --git a/test-base/Android.bp b/test-base/Android.bp index 8aa0aaf363dd..69c296e7ee9c 100644 --- a/test-base/Android.bp +++ b/test-base/Android.bp @@ -25,7 +25,7 @@ java_sdk_library { srcs: ["src/**/*.java"], errorprone: { - javacflags: ["-Xep:DepAnn:ERROR"], + javacflags: ["-Xep:DepAnn:ERROR"], }, hostdex: true, @@ -96,3 +96,14 @@ java_library_static { ], } +// Make the current.txt available for use by the cts/tests/signature tests. +// ======================================================================== +filegroup { + name: "android-test-base-current.txt", + visibility: [ + "//cts/tests/signature/api", + ], + srcs: [ + "api/current.txt", + ], +} diff --git a/test-mock/Android.bp b/test-mock/Android.bp index e1d6e01d6d06..a5cd1751151f 100644 --- a/test-mock/Android.bp +++ b/test-mock/Android.bp @@ -30,3 +30,15 @@ java_sdk_library { srcs_lib_whitelist_pkgs: ["android"], compile_dex: true, } + +// Make the current.txt available for use by the cts/tests/signature tests. +// ======================================================================== +filegroup { + name: "android-test-mock-current.txt", + visibility: [ + "//cts/tests/signature/api", + ], + srcs: [ + "api/current.txt", + ], +} diff --git a/test-runner/Android.bp b/test-runner/Android.bp index 35212020be7b..75f5b5a96eb1 100644 --- a/test-runner/Android.bp +++ b/test-runner/Android.bp @@ -40,7 +40,7 @@ java_sdk_library { "junit.textui", ], - compile_dex: true + compile_dex: true, } // Build the android.test.runner-minus-junit library @@ -86,3 +86,14 @@ java_library_static { java_version: "1.8", } +// Make the current.txt available for use by the cts/tests/signature tests. +// ======================================================================== +filegroup { + name: "android-test-runner-current.txt", + visibility: [ + "//cts/tests/signature/api", + ], + srcs: [ + "api/current.txt", + ], +} |