OSDN Git Service

android-x86/frameworks-base.git
5 years agoMove IPlatformCompat.aidl definition to framework.jar
atrost [Wed, 14 Aug 2019 15:13:56 +0000 (16:13 +0100)]
Move IPlatformCompat.aidl definition to framework.jar

There are non-app process usecases in framework code that need to have
access to this API.
Created a new package android.compat in frameworks/base/core following
previous definition of android.compat.Compatibility for app processes
(http://cs/android/libcore/luni/src/main/java/android/compat/Compatibility.java).

Bug: 137769727
Test: m
Change-Id: Ifc1b97ad40c2baf65a86169e101acfa72e3aae5f
Merged-In: Ifc1b97ad40c2baf65a86169e101acfa72e3aae5f

5 years agoMerge "Modify RCS UCE APIs to use AIDL Interfaces."
Brad Ebinger [Tue, 13 Aug 2019 23:34:41 +0000 (16:34 -0700)]
Merge "Modify RCS UCE APIs to use AIDL Interfaces."
am: 4204a6017e

Change-Id: I3c10e76be4266bb4f43306ca3f0c7362499208f7

5 years agoMerge "Modify RCS UCE APIs to use AIDL Interfaces."
Brad Ebinger [Tue, 13 Aug 2019 22:46:18 +0000 (22:46 +0000)]
Merge "Modify RCS UCE APIs to use AIDL Interfaces."

5 years agoMerge "Prevent Infinite Recursion in Telecom Sessions"
Brad Ebinger [Tue, 13 Aug 2019 17:25:44 +0000 (10:25 -0700)]
Merge "Prevent Infinite Recursion in Telecom Sessions"
am: 8dec6de25a

Change-Id: I779c9424dc7a1f9f14f7907bba76a24b9026ec5a

5 years agoMerge "Prevent Infinite Recursion in Telecom Sessions"
Brad Ebinger [Tue, 13 Aug 2019 17:10:53 +0000 (17:10 +0000)]
Merge "Prevent Infinite Recursion in Telecom Sessions"

5 years agoMerge "Don't allow upstream if entitlement don't know any downstream"
Mark Chien [Tue, 13 Aug 2019 09:49:09 +0000 (02:49 -0700)]
Merge "Don't allow upstream if entitlement don't know any downstream"
am: 161814ffb1

Change-Id: Ibac99a20b470b48597859fe737732f3c6f491805

5 years agoMerge "Don't allow upstream if entitlement don't know any downstream"
Mark Chien [Tue, 13 Aug 2019 09:36:16 +0000 (09:36 +0000)]
Merge "Don't allow upstream if entitlement don't know any downstream"

5 years agoDon't allow upstream if entitlement don't know any downstream
markchien [Fri, 9 Aug 2019 13:43:38 +0000 (21:43 +0800)]
Don't allow upstream if entitlement don't know any downstream

In case tethering donwstream is setup but don't ask EntitlementManager
to run provisioning. Cellular upstream should not be allowed if
EntilementManager don't have any donwstream record.

Bug: 134649258
Test: -build, flash, boot
      -manual test with carrier SIM
Change-Id: I609722c79f0a45a1c2164d39721ef5883e436feb

5 years agoMerge "Add documentation for Locked Messages"
Leland Miller [Tue, 13 Aug 2019 01:21:16 +0000 (18:21 -0700)]
Merge "Add documentation for Locked Messages"
am: 3e85da2d89

Change-Id: Ie2ada062645c674ef35b386272a592f36e1485ee

5 years agoPrevent Infinite Recursion in Telecom Sessions
Brad Ebinger [Thu, 8 Aug 2019 21:23:05 +0000 (14:23 -0700)]
Prevent Infinite Recursion in Telecom Sessions

There looks to be a case where infinite recursion
is occuring when printing information about
Telecom Sessions. Set a reasonable limit of
iterations and throw a warning when this condition
occurs to better track down a root cause.

Bug: 139045282
Test: atest TelecomUnitTests:SessionTest
Merged-In: Iae69c5db070c5e58ae5d37c12d1c4df027138611
Change-Id: Iae69c5db070c5e58ae5d37c12d1c4df027138611

5 years agoMerge "Add documentation for Locked Messages"
Leland Miller [Mon, 12 Aug 2019 23:42:56 +0000 (23:42 +0000)]
Merge "Add documentation for Locked Messages"

5 years ago[automerger skipped] Merge "SurfaceControl: Fix captureLayers JNI"
Brad Ebinger [Mon, 12 Aug 2019 18:23:41 +0000 (11:23 -0700)]
[automerger skipped] Merge "SurfaceControl: Fix captureLayers JNI"
am: ce98a32755 -s ours
am skip reason: change_id I43fa93eea7d79f5b773497e3bb65750866eca2cb with SHA1 fbc22c2b6d is in history

Change-Id: I70e4eec7b690b80e5ec1bfb4610614030d508cb3

5 years agoMerge "SurfaceControl: Fix captureLayers JNI"
Brad Ebinger [Mon, 12 Aug 2019 17:46:33 +0000 (17:46 +0000)]
Merge "SurfaceControl: Fix captureLayers JNI"

5 years agoMerge "Fix reference leak on TvInputHardwareManager"
Sungsoo Lim [Mon, 12 Aug 2019 04:32:00 +0000 (21:32 -0700)]
Merge "Fix reference leak on TvInputHardwareManager"
am: 8b578c9c92

Change-Id: I7fb3e249c5ae0102d61783b6bd2e70a823297a94

5 years agoMerge "Fix reference leak on TvInputHardwareManager"
Sungsoo Lim [Mon, 12 Aug 2019 04:02:56 +0000 (04:02 +0000)]
Merge "Fix reference leak on TvInputHardwareManager"

5 years agoMerge "Fix a lock issue in AudioPortEventHandler"
Kyeongkab.Nam [Mon, 12 Aug 2019 01:38:44 +0000 (18:38 -0700)]
Merge "Fix a lock issue in AudioPortEventHandler"
am: 0985eea389

Change-Id: If2113f4150e35c7aeb1751181dab8aa2ea05dee4

5 years agoMerge "Fix a lock issue in AudioPortEventHandler"
Treehugger Robot [Mon, 12 Aug 2019 01:22:58 +0000 (01:22 +0000)]
Merge "Fix a lock issue in AudioPortEventHandler"

5 years agoSurfaceControl: Fix captureLayers JNI
Robert Carr [Tue, 9 Apr 2019 14:42:02 +0000 (07:42 -0700)]
SurfaceControl: Fix captureLayers JNI

Missed a call-point in last refactoring.

Bug: 135965618
Bug: 130211665
Bug: 133054270
Test: Manual
Merged-In: I43fa93eea7d79f5b773497e3bb65750866eca2cb
Change-Id: I43fa93eea7d79f5b773497e3bb65750866eca2cb
(cherry picked from commit bf9298f1c9b848ff0db4ae0be3913ad531bafa9e)

5 years agoMerge "Add klhyun@ to media OWNERS"
Kyunglyul Hyun [Fri, 9 Aug 2019 14:29:58 +0000 (07:29 -0700)]
Merge "Add klhyun@ to media OWNERS"
am: 454029142c

Change-Id: Ifef678adceb8faeae1cc46b04a4a48ccf29c0924

5 years agoMerge "Add klhyun@ to media OWNERS"
Treehugger Robot [Fri, 9 Aug 2019 14:04:34 +0000 (14:04 +0000)]
Merge "Add klhyun@ to media OWNERS"

5 years agoMerge "Fix ParcelNullabilityTest." into stage-aosp-master
TreeHugger Robot [Fri, 9 Aug 2019 01:59:23 +0000 (01:59 +0000)]
Merge "Fix ParcelNullabilityTest." into stage-aosp-master

5 years agoFix a lock issue in AudioPortEventHandler
Kyeongkab.Nam [Tue, 6 Aug 2019 01:29:01 +0000 (10:29 +0900)]
Fix a lock issue in AudioPortEventHandler

It used "this" as a lock object to guard mListeners. but "this" is
pointing to mHandler in handler thread.
This causes the IndexOutOfBoundsException.

bug: 138951761
Test: manual
Change-Id: I826c7c68ecff4fc0d39addd3d56bc989e00848bc

5 years ago[automerger skipped] Merge "Fix statsd ASAN failure"
Yi Kong [Thu, 8 Aug 2019 22:49:08 +0000 (15:49 -0700)]
[automerger skipped] Merge "Fix statsd ASAN failure"
am: 12140677ea -s ours
am skip reason: SHA1 12140677ea skipped by user yikong

Change-Id: I7b70255b4556c7105523c892a966ef120fac8d87

5 years agoMerge "Fix statsd ASAN failure"
Yi Kong [Thu, 8 Aug 2019 22:09:48 +0000 (22:09 +0000)]
Merge "Fix statsd ASAN failure"

5 years agoFix statsd ASAN failure
Yi Kong [Thu, 8 Aug 2019 00:02:22 +0000 (17:02 -0700)]
Fix statsd ASAN failure

If tagId is not found in kAllPullAtomInfo map, StatsPuller will read
outside of the object. Add a condition check to gracefully handle
unrecognised tagId and fix the ASAN failure.

Bug: 139037732
Test: boot aosp_x86-eng
Change-Id: Ic62b89866dbec82f05e6f8e6afca9b312f44a801
Merged-In: I5db561c4223efc4ef6b1441490d319cc6ec8afc7
Exempt-From-Owner-Approval: trivial change, owner OOO.

5 years agoMerge "Use String8 for UTF16 to UTF8 conversion."
Elliott Hughes [Thu, 8 Aug 2019 19:51:31 +0000 (12:51 -0700)]
Merge "Use String8 for UTF16 to UTF8 conversion."
am: 527c91320d

Change-Id: Ica55f07373dfada4729df8472b1bae71bf0011c3

5 years agoMerge "Use String8 for UTF16 to UTF8 conversion."
Elliott Hughes [Thu, 8 Aug 2019 19:12:04 +0000 (19:12 +0000)]
Merge "Use String8 for UTF16 to UTF8 conversion."

5 years agoFix ParcelNullabilityTest.
Steven Moreland [Thu, 8 Aug 2019 18:15:35 +0000 (11:15 -0700)]
Fix ParcelNullabilityTest.

Test: atest android.os.ParcelNullabilityTest
Fixes: 138999297
Change-Id: I0f5c09a1e8f7a2927409f228a566988d949f34c7

5 years agoUse String8 for UTF16 to UTF8 conversion.
Elliott Hughes [Thu, 8 Aug 2019 16:36:14 +0000 (09:36 -0700)]
Use String8 for UTF16 to UTF8 conversion.

This is the only actual user of libcutils' jstring.h.

Test: treehugger
Change-Id: I0444d42e5a3ca57de3bffca48aa265f267c3d4dc

5 years agoMerge "Stop showing disclosure UI when isDisclosureEnabled is false."
Rajeev Kumar [Thu, 8 Aug 2019 16:13:56 +0000 (09:13 -0700)]
Merge "Stop showing disclosure UI when isDisclosureEnabled is false."
am: 6452cc3cc1

Change-Id: Ie616ed1e05c45a30b5ab20873fa07f963f0d3e49

5 years agoMerge "Stop showing disclosure UI when isDisclosureEnabled is false."
Rajeev Kumar [Thu, 8 Aug 2019 15:42:51 +0000 (15:42 +0000)]
Merge "Stop showing disclosure UI when isDisclosureEnabled is false."

5 years agoMerge "Fix interfaceVersion in DhcpServerCallbacks"
Remi NGUYEN VAN [Thu, 8 Aug 2019 13:02:06 +0000 (06:02 -0700)]
Merge "Fix interfaceVersion in DhcpServerCallbacks"
am: e921001f2d

Change-Id: I5e917252cc3632a823d3912094066f96597da3ae

5 years agoMerge "Fix interfaceVersion in DhcpServerCallbacks"
Treehugger Robot [Thu, 8 Aug 2019 12:41:51 +0000 (12:41 +0000)]
Merge "Fix interfaceVersion in DhcpServerCallbacks"

5 years agoMerge "Notify the ART runtime when boot is complete."
Nicolas Geoffray [Thu, 8 Aug 2019 12:11:55 +0000 (05:11 -0700)]
Merge "Notify the ART runtime when boot is complete."
am: f83748ae28

Change-Id: Iea67d64570657173832ee0d61288dc97af11496b

5 years agoMerge "Notify the ART runtime when boot is complete."
Nicolas Geoffray [Thu, 8 Aug 2019 11:58:06 +0000 (11:58 +0000)]
Merge "Notify the ART runtime when boot is complete."

5 years agoMerge "Upload platform compat config generated from framework target."
Anna Trostanetski [Thu, 8 Aug 2019 11:34:15 +0000 (04:34 -0700)]
Merge "Upload platform compat config generated from framework target."
am: d7345e923a

Change-Id: I41a4313e96c68bb8efa644816c7d8278c988265b

5 years agoMerge "Upload platform compat config generated from framework target."
Anna Trostanetski [Thu, 8 Aug 2019 10:54:02 +0000 (10:54 +0000)]
Merge "Upload platform compat config generated from framework target."

5 years agoFix interfaceVersion in DhcpServerCallbacks
Remi NGUYEN VAN [Thu, 8 Aug 2019 08:45:24 +0000 (17:45 +0900)]
Fix interfaceVersion in DhcpServerCallbacks

The getInterfaceVersion method was missed when freezing the AIDL
interface version.
This causes Q devices to return 0 instead of 3 on this interface.

Bug: 139110717
Test: toggle tethering, dumpsys network_stack version
Change-Id: If587cc9ead4191b9c2ad2ae65473bd89e7c37b5c

5 years agoNotify the ART runtime when boot is complete.
David Srbecky [Mon, 5 Aug 2019 14:43:34 +0000 (15:43 +0100)]
Notify the ART runtime when boot is complete.

Needed for jit-zygote performance improvements.

Test: device boots
Bug: 119800099
Change-Id: I1e46f49d94440384473430d8afebe29fbee9c68e

5 years agoAdd klhyun@ to media OWNERS
Kyunglyul Hyun [Thu, 8 Aug 2019 06:27:26 +0000 (15:27 +0900)]
Add klhyun@ to media OWNERS

Test: N/A
Change-Id: I4328217199581fcb181f74a5c3baabd3a9148136

5 years agoMerge "Added disallowed APN types configuration support"
Jack Yu [Thu, 8 Aug 2019 04:34:28 +0000 (21:34 -0700)]
Merge "Added disallowed APN types configuration support"
am: 13b0b1a73d

Change-Id: I6c66b42ba4e39005bb255a9d924aa518810d99f3

5 years agoMerge "Added disallowed APN types configuration support"
Jack Yu [Thu, 8 Aug 2019 04:16:30 +0000 (04:16 +0000)]
Merge "Added disallowed APN types configuration support"

5 years agoStop showing disclosure UI when isDisclosureEnabled is false.
Rajeev Kumar [Tue, 6 Aug 2019 19:02:47 +0000 (12:02 -0700)]
Stop showing disclosure UI when isDisclosureEnabled is false.

Bug: 137395050
Change-Id: Ic7768f7d3306f5d9d5c5c988afda4e8710c4ccd0
Test: Manual tests

5 years agoModify RCS UCE APIs to use AIDL Interfaces.
Brad Ebinger [Thu, 6 Dec 2018 00:12:23 +0000 (16:12 -0800)]
Modify RCS UCE APIs to use AIDL Interfaces.

Integrate AIDL backend into RCS UCE APIs.

Test: Telephony Unit Tests
Change-Id: I7a1af154676797ce5adf7b037c883827f4085d52

5 years agoMerge "Fix StorageManagerService linkToDeath more than one time when vold/storaged...
Jeff Sharkey [Wed, 7 Aug 2019 16:36:24 +0000 (09:36 -0700)]
Merge "Fix StorageManagerService linkToDeath more than one time when vold/storaged died."
am: d7f82d5766

Change-Id: I2a6fc7358c3c13cd67fc642d55c9973ab24331d1

5 years agoMerge "Fix StorageManagerService linkToDeath more than one time when vold/storaged...
Jeff Sharkey [Wed, 7 Aug 2019 16:02:59 +0000 (16:02 +0000)]
Merge "Fix StorageManagerService linkToDeath more than one time when vold/storaged died."

5 years agoMerge "Remove obsolete methods from DumpstateListener implementations"
Nandana Dutt [Wed, 7 Aug 2019 14:08:27 +0000 (07:08 -0700)]
Merge "Remove obsolete methods from DumpstateListener implementations"
am: cbdb10f982

Change-Id: Ia746b0cdadd0c4d652c373763f7a12266b080e3b

5 years agoMerge "Remove obsolete methods from DumpstateListener implementations"
Nandana Dutt [Wed, 7 Aug 2019 13:45:36 +0000 (13:45 +0000)]
Merge "Remove obsolete methods from DumpstateListener implementations"

5 years agoMerge "API updated for ICU4J 64.2"
vichang [Wed, 7 Aug 2019 11:13:35 +0000 (04:13 -0700)]
Merge "API updated for ICU4J 64.2"
am: 0473b08b6b

Change-Id: Ic7b3702100d989abdc387a91f19c9017f35948e9

5 years agoMerge "API updated for ICU4J 64.2"
vichang [Wed, 7 Aug 2019 10:38:20 +0000 (10:38 +0000)]
Merge "API updated for ICU4J 64.2"

5 years agoMerge "Update API signature file to reflect the correct logp nullability"
Aurimas Liutikas [Tue, 6 Aug 2019 22:03:05 +0000 (15:03 -0700)]
Merge "Update API signature file to reflect the correct logp nullability"
am: e6024b34ed

Change-Id: I2407c4c19d1552f456412f22ae13e9e6b036a190

5 years agoMerge "Extract test utilities for ConnectivityService"
Remi NGUYEN VAN [Tue, 6 Aug 2019 21:58:43 +0000 (14:58 -0700)]
Merge "Extract test utilities for ConnectivityService"
am: b7d270a73e

Change-Id: I0ac2a480f961bb6fd1d83dedad6a7942ee03858f

5 years agoMerge "Add carrier config for data roaming notification"
Xiangyu/Malcolm Chen [Tue, 6 Aug 2019 21:57:23 +0000 (14:57 -0700)]
Merge "Add carrier config for data roaming notification"
am: 8526f8788d

Change-Id: Ic25d7b8e133e479ce68dca375b5879f8adecd327

5 years agoMerge "Add a documentation in EmergencyNumber#getNumber"
Shuo Qian [Tue, 6 Aug 2019 21:56:19 +0000 (14:56 -0700)]
Merge "Add a documentation in EmergencyNumber#getNumber"
am: 27c3d13f9f

Change-Id: Ic3d047f3ec396de5ae6384c83cb31a113aabdaa8

5 years agoMerge "Adds better logging for ImsFeature features"
Brad Ebinger [Tue, 6 Aug 2019 21:52:27 +0000 (14:52 -0700)]
Merge "Adds better logging for ImsFeature features"
am: 4c5cd98c53

Change-Id: I7ba12bae00ffeea77f83076f99bd9a9ae89d120b

5 years ago[automerger skipped] Merge "Added the min match system config for loose phone numbers...
Hui Yu [Tue, 6 Aug 2019 21:44:14 +0000 (14:44 -0700)]
[automerger skipped] Merge "Added the min match system config for loose phone numbers comparison"
am: 483e6e3731 -s ours
am skip reason: change_id I7f9e9ad824d44f2ebf8367beb6ec337e3eb3a8ad with SHA1 b89c2984bb is in history

Change-Id: I5fa678f7bfed301fcc894bdbd81cfd197bd5e78e

5 years agoMerge "Update API signature file to reflect the correct logp nullability"
Aurimas Liutikas [Tue, 6 Aug 2019 17:45:39 +0000 (17:45 +0000)]
Merge "Update API signature file to reflect the correct logp nullability"

5 years agoRemove obsolete methods from DumpstateListener implementations
Nandana Dutt [Fri, 14 Jun 2019 13:26:10 +0000 (14:26 +0100)]
Remove obsolete methods from DumpstateListener implementations

Note that with the new Bugreporting API, SystemServer is the only
expected DumpstateListener implementation. Once we fully migrate Shell
app, we can remove the implementation in BugreportService as well.

BUG: 128980174
Test: bugreport from power menu, observe progress bar

Change-Id: I40d654a70bd9ceb3a29f8a0113b85616100f4ee9
Merged-In: I40d654a70bd9ceb3a29f8a0113b85616100f4ee9

5 years agoUpdate API signature file to reflect the correct logp nullability
Aurimas Liutikas [Tue, 6 Aug 2019 13:26:37 +0000 (06:26 -0700)]
Update API signature file to reflect the correct logp nullability

A matching patch to the fix in java.util.logging.Logging nullability.
See https://android-review.googlesource.com/c/platform/libcore/+/1096198/

Test: make -j update-api
Change-Id: I0b653de474b6162764cfa711eb967aada4c0ee50

5 years agoMerge "Extract test utilities for ConnectivityService"
Treehugger Robot [Tue, 6 Aug 2019 11:04:36 +0000 (11:04 +0000)]
Merge "Extract test utilities for ConnectivityService"

5 years agoMerge "Add carrier config for data roaming notification"
Xiangyu/Malcolm Chen [Tue, 6 Aug 2019 06:04:47 +0000 (06:04 +0000)]
Merge "Add carrier config for data roaming notification"

5 years agoAdd carrier config for data roaming notification
Jordan Liu [Tue, 23 Jul 2019 22:52:08 +0000 (15:52 -0700)]
Add carrier config for data roaming notification

This config, when enabled, shows the user a notification when the device
switches to data roaming and the user has data roaming on.

Bug: 133358875
Test: manual
Change-Id: Ia091575ff0fa7e02f0c6a98bae0e66ef73beff81
Merged-In: Ia091575ff0fa7e02f0c6a98bae0e66ef73beff81

5 years agoMerge "Add a documentation in EmergencyNumber#getNumber"
Shuo Qian [Tue, 6 Aug 2019 01:56:32 +0000 (01:56 +0000)]
Merge "Add a documentation in EmergencyNumber#getNumber"

5 years agoMerge "Adds better logging for ImsFeature features"
Brad Ebinger [Tue, 6 Aug 2019 00:27:04 +0000 (00:27 +0000)]
Merge "Adds better logging for ImsFeature features"

5 years agoAdded the min match system config for loose phone numbers comparison
Taesu Lee [Tue, 28 May 2019 10:05:06 +0000 (19:05 +0900)]
Added the min match system config for loose phone numbers comparison

Specific min match is required for each country.

Test: atest PhoneNumberUtilsTest

Change-Id: I7f9e9ad824d44f2ebf8367beb6ec337e3eb3a8ad
Merged-In: I7f9e9ad824d44f2ebf8367beb6ec337e3eb3a8ad
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Bug:134246556
(cherry picked from commit d65aafc748a1b424f3d6b7608dd8487ae20cdaff)

5 years agoAdd a documentation in EmergencyNumber#getNumber
sqian [Thu, 11 Jul 2019 21:42:37 +0000 (14:42 -0700)]
Add a documentation in EmergencyNumber#getNumber

If the number starts with a carrier prefix, the
 carrier prefix is configured in
 {@link CarrierConfigManager#KEY_EMERGENCY_NUMBER_PREFIX_STRING_ARRAY}.

This is important because it provides a solid reference for Apps to
strip the prefix, which they may not prefer to display.

Bug: 137225076
Test: Treehugger
Change-Id: I1f6bd74f1d6eb86fe3326246e0ddb08b9cf7ac11
Merged-In: I1f6bd74f1d6eb86fe3326246e0ddb08b9cf7ac11
(cherry picked from commit 552a58ae51e4f8ef1a0bcefe9a475b4511454c17)

5 years agoMerge "Added the min match system config for loose phone numbers comparison"
Hui Yu [Mon, 5 Aug 2019 21:41:56 +0000 (21:41 +0000)]
Merge "Added the min match system config for loose phone numbers comparison"

5 years agoAdded the min match system config for loose phone numbers comparison
Taesu Lee [Tue, 28 May 2019 10:05:06 +0000 (19:05 +0900)]
Added the min match system config for loose phone numbers comparison

Specific min match is required for each country.

Test: atest PhoneNumberUtilsTest

Change-Id: I7f9e9ad824d44f2ebf8367beb6ec337e3eb3a8ad
Merged-In: I7f9e9ad824d44f2ebf8367beb6ec337e3eb3a8ad
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Bug:134246556

5 years agoMerge "Fix dependency on APK used by test"
Dan Shi [Mon, 5 Aug 2019 21:19:06 +0000 (14:19 -0700)]
Merge "Fix dependency on APK used by test"
am: 85d2ac2e12

Change-Id: I1ae6bff68d4aa4890fee47b5943e4d3420c32ed2

5 years agoMerge "Fix dependency on APK used by test"
Treehugger Robot [Mon, 5 Aug 2019 21:04:28 +0000 (21:04 +0000)]
Merge "Fix dependency on APK used by test"

5 years agoMerge "Add documentation in TelephonyManager#getNetworkCountryIso"
Shuo Qian [Mon, 5 Aug 2019 20:30:31 +0000 (13:30 -0700)]
Merge "Add documentation in TelephonyManager#getNetworkCountryIso"
am: 753f6c3e5a

Change-Id: Iae5df44de8a307888b4eff8d581ddefd68ad3450

5 years agoMerge "Add documentation in TelephonyManager#getNetworkCountryIso"
Shuo Qian [Mon, 5 Aug 2019 20:17:53 +0000 (20:17 +0000)]
Merge "Add documentation in TelephonyManager#getNetworkCountryIso"

5 years agoMerge "Clean up duplicated uses-permission"
jay [Mon, 5 Aug 2019 20:10:39 +0000 (13:10 -0700)]
Merge "Clean up duplicated uses-permission"
am: 2bfe37de04

Change-Id: I283778ef4b61e9f0a7a6592f1be563da91e8c628

5 years agoMerge "Clean up duplicated uses-permission"
Treehugger Robot [Mon, 5 Aug 2019 19:40:28 +0000 (19:40 +0000)]
Merge "Clean up duplicated uses-permission"

5 years agoMerge "[view compiler] Remove dex_builder_test.cc"
Eric Holk [Mon, 5 Aug 2019 17:06:15 +0000 (10:06 -0700)]
Merge "[view compiler] Remove dex_builder_test.cc"
am: 63f6a62163

Change-Id: Ib73ed6f1fee41358eabe4b93fd99fe96339c205d

5 years agoMerge "[view compiler] Remove dex_builder_test.cc"
Treehugger Robot [Mon, 5 Aug 2019 16:34:46 +0000 (16:34 +0000)]
Merge "[view compiler] Remove dex_builder_test.cc"

5 years agoUpload platform compat config generated from framework target.
atrost [Mon, 5 Aug 2019 11:22:18 +0000 (12:22 +0100)]
Upload platform compat config generated from framework target.

Add compat-changeid-annotation-processor and upload the generated compat
config using the platform_compat_config rule.
Make both libcore and framework compat configs required for framework to
make sure they get onto the device. Libcore will be removed once the
config is uploaded to APEX.

Test: flashed device locally, config files found and read by
com.android.server.compat.CompatConfig.
Bug: 138222363

Change-Id: Ie04fde8b4b18e7e34d95257f5ef8ca78d5076b4f

5 years agoMerge "Fix broken Javadoc links in frameworks/base"
Aurimas Liutikas [Sun, 4 Aug 2019 07:49:17 +0000 (00:49 -0700)]
Merge "Fix broken Javadoc links in frameworks/base"
am: 4a532813df

Change-Id: I5a6152fa6baab86dde980af57b84167b154b44c7

5 years agoMerge "Fix broken Javadoc links in frameworks/base"
Treehugger Robot [Sat, 3 Aug 2019 01:37:45 +0000 (01:37 +0000)]
Merge "Fix broken Javadoc links in frameworks/base"

5 years agoAdd documentation in TelephonyManager#getNetworkCountryIso
sqian [Thu, 1 Aug 2019 22:45:48 +0000 (15:45 -0700)]
Add documentation in TelephonyManager#getNetworkCountryIso

In multi-sim, returns a shared emergency network country iso
 from other subscription if the subscription used to create the
 TelephonyManager doesn't camp on a network due to some reason
 (e.g. pin/puk locked), or sim is absent in the corresponding slot.

Test: unit test
Bug: 137236159
Bug: 137235431
Change-Id: I311e690d1f79ebefbc068c486d9bed814c129aab
Merged-In: I311e690d1f79ebefbc068c486d9bed814c129aab
(cherry picked from commit 8ab9550f86c10ccb86353f59790ce2b5d329f716)

5 years agoFix broken Javadoc links in frameworks/base
Aurimas Liutikas [Fri, 2 Aug 2019 22:40:29 +0000 (15:40 -0700)]
Fix broken Javadoc links in frameworks/base

Test: running metalava with syntax check enabled.
Change-Id: I13ec355b591b0ae3cfb5009794b1ed844d27cba8

5 years agoMerge "Fix null pointer exception of calling NetworkInfo.mState.name()"
Chalard Jean [Fri, 2 Aug 2019 20:25:36 +0000 (13:25 -0700)]
Merge "Fix null pointer exception of calling NetworkInfo.mState.name()"
am: ecc1ceb18c

Change-Id: Ic003b658854f9407ed8024771c6219df2b6e3806

5 years agoMerge "Fix null pointer exception of calling NetworkInfo.mState.name()"
Chalard Jean [Fri, 2 Aug 2019 19:56:10 +0000 (19:56 +0000)]
Merge "Fix null pointer exception of calling NetworkInfo.mState.name()"

5 years agoMerge "Add graphicsstats.proto owner"
John Reck [Fri, 2 Aug 2019 17:48:47 +0000 (10:48 -0700)]
Merge "Add graphicsstats.proto owner"
am: 839c6cffaa

Change-Id: Ie916d395cb8184593a7c2e667795e58ea4be2393

5 years agoMerge "Add graphicsstats.proto owner"
John Reck [Fri, 2 Aug 2019 17:26:07 +0000 (17:26 +0000)]
Merge "Add graphicsstats.proto owner"

5 years agoAdded disallowed APN types configuration support
Jack Yu [Fri, 28 Jun 2019 23:42:37 +0000 (16:42 -0700)]
Added disallowed APN types configuration support

The change added the configuration support for disallowed APN
types for WWAN or WLAN transport. This is to meet carrier policy
that certain traffic for APN types are not allowed on given
transport.

Bug: 135551751
Test: Manual + unit tests
Merged-in: I63c44d1e774b7491929406929e1a5a556db9515a
Change-Id: I63c44d1e774b7491929406929e1a5a556db9515a
(cherry picked from commit ac9a731d270552957641f15a5b58450003d5b964)

5 years ago[view compiler] Remove dex_builder_test.cc
Eric Holk [Fri, 2 Aug 2019 16:32:02 +0000 (09:32 -0700)]
[view compiler] Remove dex_builder_test.cc

This test is problematic because it links against libdexfile and we would like
to remove this dependency. All of the functionality covered by this test is also
tested more thoroughly by the on-device dex-builder-test, so there's no reason
to test it here as well.

Change-Id: Ie45d4a1c99668b68476168fc072a220fa5db3695

5 years agoMerge "Fix lint error getSystemService for EuiccManager"
Brad Ebinger [Thu, 1 Aug 2019 23:02:21 +0000 (16:02 -0700)]
Merge "Fix lint error getSystemService for EuiccManager"
am: 97245795e7

Change-Id: I5b42feafdfd0c88daeb502d0f2602d072028850d

5 years agoMerge "Fix lint error getSystemService for EuiccManager"
Brad Ebinger [Thu, 1 Aug 2019 22:06:44 +0000 (22:06 +0000)]
Merge "Fix lint error getSystemService for EuiccManager"

5 years agoAdd documentation for Locked Messages
Nagaraja [Wed, 22 May 2019 10:27:59 +0000 (15:57 +0530)]
Add documentation for Locked Messages

Test: None, documentation only.
Bug: 124791757
Change-Id: I5e0005547dbf47d2b0b3b5de4f1f9486f0385736

5 years agoMerge "Fix the race between entitlement start/stop"
Mark Chien [Thu, 1 Aug 2019 11:25:05 +0000 (04:25 -0700)]
Merge "Fix the race between entitlement start/stop"
am: 0a4baeae84

Change-Id: If28fb2159672cf58058229f4cb7ee2d549ca15a8

5 years agoMerge "Fix the race between entitlement start/stop"
Mark Chien [Thu, 1 Aug 2019 10:38:46 +0000 (10:38 +0000)]
Merge "Fix the race between entitlement start/stop"

5 years agoExtract test utilities for ConnectivityService
Remi NGUYEN VAN [Thu, 13 Jun 2019 07:12:02 +0000 (16:12 +0900)]
Extract test utilities for ConnectivityService

The utilities help using ConnectivityService in tests, and will be used
to write integration tests for ConnectivityService.

Test: atest FrameworksNetTests
Change-Id: Ie895ad05139cd5768d3d8a9bd5589d72571f47e6

5 years agoFix the race between entitlement start/stop
markchien [Fri, 19 Jul 2019 09:28:04 +0000 (17:28 +0800)]
Fix the race between entitlement start/stop

For very quickly hotspot OFF/ON, there is race between tethering
start entitlement from Settings and stop entitlement from wifi's
intent broadcast. Entitlement would only be started when Settings
call #startTethering(). But there are two points that tethering
would stop entitlement. One is #stopTethering() from Settings.
Another one is wifi tell tethering that it is shuting down.

In this change, second point of stop entitlement is removed to avoid
this race problem. Entitlement may have chance that do not be stopped
(e.g. network reset). This is not great but the behavior is the same
as P.
TODO: Don't reply on caller to stop entitlement. Refactor the design
to call #stopProvisioningIfNeeded when IpServer leaving TETHERED state.
TODO: mWifiTetherRequested may also suffer this race condition.

Bug: 137034691
Test: -build, flash, boot
      -atest FrameworkNetTests
      -Enable hotspot with entitlement supported SIM,
       then changing the AP band.

Change-Id: I63f858356b4543b5bdda41d03e45adc944b86da3

5 years agoMerge "Fix the reference leak on RemoteCallbackList"
Dan Zhang [Thu, 1 Aug 2019 05:19:30 +0000 (22:19 -0700)]
Merge "Fix the reference leak on RemoteCallbackList"
am: be30d27a8a

Change-Id: Ibf79be3f125ab58c8048c15f3f6f3a3e693295e7

5 years agoMerge "Fix the reference leak on RemoteCallbackList"
Dan Zhang [Thu, 1 Aug 2019 05:03:03 +0000 (05:03 +0000)]
Merge "Fix the reference leak on RemoteCallbackList"

5 years agoMerge changes from topic "ims_cc"
Dheeraj Shetty [Thu, 1 Aug 2019 04:57:40 +0000 (21:57 -0700)]
Merge changes from topic "ims_cc"
am: a08cc8306f

Change-Id: I481a681784df325066a9087c0a82d0f15268ba7f

5 years agoCarrierConfig: get configs by prefix
Dheeraj Shetty [Thu, 1 Aug 2019 04:57:26 +0000 (21:57 -0700)]
CarrierConfig: get configs by prefix
am: 1c446a22d4

Change-Id: Ia39370cb55a8418f5ce600bf4e58a62a985a53ce

5 years ago[automerger skipped] Add new carrier config for supporting WPS over IMS
andychou [Thu, 1 Aug 2019 04:57:07 +0000 (21:57 -0700)]
[automerger skipped] Add new carrier config for supporting WPS over IMS
am: a722fdf05a -s ours
am skip reason: change_id Idb698b12ba08086584e1883cc61e31f924ae42cb with SHA1 dcc0dd2efc is in history

Change-Id: I2d118c2b0032df8457c9d000091d6633b17318ef

5 years agoMerge changes I9350ec13,I809d9191,I235f727d,I1930f3ba
Josh Gao [Thu, 1 Aug 2019 04:46:23 +0000 (21:46 -0700)]
Merge changes I9350ec13,I809d9191,I235f727d,I1930f3ba
am: a0c949d5de

Change-Id: I1633d9eae6f162e338990766e62e3aa3873df606