Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
384,600 Commits 3 Branches 0 Tags
8cf6ace11d50cd0767aec3858ef1a71bf546fe9c
Commit Graph

384600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sundong Ahn
8cf6ace11d Merge "Add Vts test for xsd_config" 
am: fd7bbebeaa

Change-Id: I1f04bffed53a360fc9f90ba00d1fc89ea617543f
 2019-04-05 00:02:36 -07:00
Treehugger Robot
fd7bbebeaa Merge "Add Vts test for xsd_config" 2019-04-05 06:50:43 +00:00
Remi NGUYEN VAN
6652f5242a Merge "Move attach*Filter() and addArpEntry() methods to NetworkStack" 
am: 1ddf974859

Change-Id: I1d6a490a42f68d01e3d0649035cd0015cb522da3
 2019-04-04 23:50:27 -07:00
Remi NGUYEN VAN
1ddf974859 Merge "Move attach*Filter() and addArpEntry() methods to NetworkStack" 2019-04-05 06:38:08 +00:00
Sasha Smundak
e9834d4fbf Merge "Convert core/tests/BroadcastRadioTests/Android.mk file to Android.bp" 
am: c9cb0dc031

Change-Id: Iee2eae42ebb1e46c3ddda978d0b219d7b094b92c
 2019-04-04 22:16:06 -07:00
Treehugger Robot
c9cb0dc031 Merge "Convert core/tests/BroadcastRadioTests/Android.mk file to Android.bp" 2019-04-05 04:59:14 +00:00
Remi NGUYEN VAN
2d7dbf8ea3 Merge "Call clearCallingIdentity before notifyDnsResponse" 
am: e40bc74057

Change-Id: I21d52314f332a12bdd96d8f20e68a3eb38f70d6b
 2019-04-04 19:02:18 -07:00
Remi NGUYEN VAN
e40bc74057 Merge "Call clearCallingIdentity before notifyDnsResponse" 2019-04-05 01:54:08 +00:00
Sundong Ahn
a409e9fbb7 Merge "Change to choice" 
am: 5baeab86a0

Change-Id: Idb8bf87d8980d15a30ea0a8d4f20f23649e07d34
 2019-04-04 17:58:20 -07:00
Treehugger Robot
5baeab86a0 Merge "Change to choice" 2019-04-05 00:36:00 +00:00
Steven Moreland
be708ba226 Merge "ApplicationLoaders: hard failures & tests" 
am: 54ea352532

Change-Id: I60277b748571fb2e311f65d6b65b814cea314e9b
 2019-04-04 16:27:53 -07:00
Steven Moreland
54ea352532 Merge "ApplicationLoaders: hard failures & tests" 2019-04-04 23:10:04 +00:00
Tyler Gunn
4d97d127fd resolve merge conflicts of 37f6620029 to stage-aosp-master 
Bug: 129531123
Test: I solemnly swear I didn't test this conflict resolution.
Change-Id: I9efdae311353efc40402db6080312d3683330c41
 2019-04-04 20:54:37 +00:00
Sasha Smundak
4c601c39f4 Convert core/tests/BroadcastRadioTests/Android.mk file to Android.bp 
Cherrypick of https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/6924098
See build/soong/README.md for more information.

Bug: 122332340
Test: treehugger
Change-Id: I8d270949cb2dd4391ceeaf57ea8557be849c9ed8
Merged-In: I8d270949cb2dd4391ceeaf57ea8557be849c9ed8
 2019-04-04 12:55:19 -07:00
Sasha Smundak
37c0949bf5 Merge "Convert core/tests/**/Android.mk file to Android.bp" 
am: d0fc8c9d5b

Change-Id: I2521964e5699950745f69cb9f9de680cfd43ac44
 2019-04-04 12:44:55 -07:00
Tyler Gunn
37f6620029 Merge "Remove call identification APIs." 2019-04-04 19:35:10 +00:00
Treehugger Robot
d0fc8c9d5b Merge "Convert core/tests/**/Android.mk file to Android.bp" 2019-04-04 19:27:20 +00:00
Tyler Gunn
f31c79bef4 Merge "Add @hide API to get the phone account handle for a subId." 
am: f910aa4e60

Change-Id: Ib7e13db1f586b9032082683ebae083b3b68ae11e
 2019-04-04 11:34:35 -07:00
Tyler Gunn
f910aa4e60 Merge "Add @hide API to get the phone account handle for a subId." 2019-04-04 18:26:29 +00:00
Sasha Smundak
8b788b2194 Merge "Convert core/tests/featureflagtests/Android.mk file to Android.bp" 
am: 2e96d3f554

Change-Id: Ia8e12a04fb7fff08926734f042491bbea4a30f32
 2019-04-04 09:13:43 -07:00
Treehugger Robot
2e96d3f554 Merge "Convert core/tests/featureflagtests/Android.mk file to Android.bp" 2019-04-04 15:55:11 +00:00
Remi NGUYEN VAN
c7407715ab Merge "Add common tests for FrameworksBaseTests and CTS" 
am: a57e80e60a

Change-Id: I1616831ad8f143298b80ebce9af205f8e50de1f8
 2019-04-04 05:42:21 -07:00
Treehugger Robot
a57e80e60a Merge "Add common tests for FrameworksBaseTests and CTS" 2019-04-04 12:29:44 +00:00
Lorenzo Colitti
ae9f7b6723 Merge "Fix flaky UdpEncapsulationSocket test" 
am: 13078345c5

Change-Id: I4d6cc85fcd539a38674fc3daff1af57fa1bdd2f7
 2019-04-04 01:38:02 -07:00
Lorenzo Colitti
13078345c5 Merge "Fix flaky UdpEncapsulationSocket test" 2019-04-04 08:09:06 +00:00
Colin Cross
2fbbe40e59 Merge "Export framework-res raw resources to robolectric" 
am: 8ea6953a12

Change-Id: Icec447394dc0cf347f1b4af6826ab9ec5ddf83ef
 2019-04-03 21:20:21 -07:00
Lorenzo Colitti
b318f8a490 Merge "Temporarily disable InetDiagSocketTest." 
am: 5f2ae0dfbd

Change-Id: I7530c58091cff748e3eca9324cc66f7bec7e02b6
 2019-04-03 21:10:16 -07:00
Colin Cross
8ea6953a12 Merge "Export framework-res raw resources to robolectric" 2019-04-04 04:00:13 +00:00
Treehugger Robot
5f2ae0dfbd Merge "Temporarily disable InetDiagSocketTest." 2019-04-04 03:48:29 +00:00
Tyler Gunn
c0340aa16a Add @hide API to get the phone account handle for a subId. 
This is used in SubscriptionManager to figure out which phone account
is being updated when the default voice sub changes.  It seemed like
a good spot to put it since we should really have an api for this in
the future.

Test: Manual, manual, manual
Bug: 128916238
Change-Id: If5137c0e7f01a14810e0ee94e5d857d69f368a87
 2019-04-03 20:18:01 -07:00
Chen Xu
44b5e3389f Merge "scrub pii (imsi) from carrierIdentifier logging" 
am: 7871659f67

Change-Id: I1db6ee51e908d1e777981798bee78225aa795ee9
 2019-04-03 19:09:51 -07:00
Yifan Hong
ab98e503be Merge "Fix NetworkStackTests." 
am: e4d640b3a8

Change-Id: Ia02f3b4788ddc7fac3327b82d0b3f2bf8c19d49b
 2019-04-03 19:03:26 -07:00
Lorenzo Colitti
e8a44acc0c Temporarily disable InetDiagSocketTest. 
This test is too flaky to run in presubmits.

Bug: 124354087
Test: atest InetDiagSocketTest
Change-Id: I90bc52a6f5b92d634862e3464634dfdbd3cada6a
 2019-04-04 02:02:13 +00:00
Chen Xu
7871659f67 Merge "scrub pii (imsi) from carrierIdentifier logging" 2019-04-04 01:53:53 +00:00
Sundong Ahn
560de69213 Change to choice 
The sequence element is changed to choice element with minOccurs="0" and
maxOccurs="unbounded" for supporting any order and any times sub
element. And maxOccurs of subelement is deleted because maxOccurs are
not needed.

Bug: 127435354
Test: m -j
Change-Id: I72866da5b2a8ac37d725f5b604dae37a06f30162
 2019-04-04 01:32:55 +00:00
Yifan Hong
e4d640b3a8 Merge "Fix NetworkStackTests." 2019-04-04 01:21:34 +00:00
Yifan Hong
0e5459731f Fix NetworkStackTests. 
NetworkStackTests dlopens library which indirectly
uses libcgrouprc. Add it to jni_libs.

Test: atest
Fixes: 129902619
Change-Id: I0d60d7a317fa60607d6fdaea15f61b458aefd2f0
 2019-04-03 18:15:22 -07:00
Cody Kesting
c7ca13334b Merge "Clarify documentation for TelMan#iccOpenLogicalChannel." 
am: 4d71a57887

Change-Id: I89b28e0297aea91443d7c40df1f99f646ee7b237
 2019-04-03 17:59:43 -07:00
Benedict Wong
abcc6c0821 Fix flaky UdpEncapsulationSocket test 
This commit reduces the flakiness of the
testOpenAndCloseUdpEncapsulationSocket by retrying up to three times.
Unfortunately, testing port-selected socket creation is racy against
other applications. This helps to handle the same race condition as done
in IpSecService#bindToRandomPort

Bug: 128024100
Test: 200x runs of testOpenAndCloseUdpEncapsulationSocket
Change-Id: I7e036ce821019dbac6c50899bd0894e89d2fe82a
 2019-04-03 17:52:03 -07:00
chen xu
c33a47fece scrub pii (imsi) from carrierIdentifier logging 
Bug: 129229239
Test: Manual
Change-Id: I642d60e4ba1001bfd481aada87fa08dbd19098be
(cherry picked from commit 61b2c86719)
Merged-in: I642d60e4ba1001bfd481aada87fa08dbd19098be
 2019-04-03 17:32:05 -07:00
Sasha Smundak
e23e5c6edc Convert core/tests/featureflagtests/Android.mk file to Android.bp 
Cherrypick of https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/6924943
See build/soong/README.md for more information.

Bug: 122332340
Test: treehugger
Change-Id: If3f574bc15dedcd7880be605667297d257175c8d
Merged-In: If3f574bc15dedcd7880be605667297d257175c8d
 2019-04-03 17:28:11 -07:00
paulhu
ccc12f673b Merge "Fix ConnectivityServiceTest fail." 
am: fa8fc65340

Change-Id: If3f7a3cbf2ed1a180a3b09872512a5f91bddd89c
 2019-04-03 17:24:39 -07:00
Jack Yu
279a924fdf Merge "Removed data and voice RAT from service state" 
am: ced4a31769

Change-Id: I2ef8a5d4647d404d5b782e78c8ab2613f6466f92
 2019-04-03 17:13:45 -07:00
Cody Kesting
4d71a57887 Merge "Clarify documentation for TelMan#iccOpenLogicalChannel." 2019-04-04 00:01:06 +00:00
Treehugger Robot
fa8fc65340 Merge "Fix ConnectivityServiceTest fail." 2019-04-03 23:54:38 +00:00
Jack Yu
ced4a31769 Merge "Removed data and voice RAT from service state" 2019-04-03 23:39:24 +00:00
Xiangyu/Malcolm Chen
2cadf8e9f9 Merge "Clean up a few names of Telephony intent extra." 
am: 63bf486921

Change-Id: If08d387b21a4e4cb71e7026ca781a472db51e2d1
 2019-04-03 16:24:23 -07:00
Xiangyu/Malcolm Chen
63bf486921 Merge "Clean up a few names of Telephony intent extra." 2019-04-03 23:06:47 +00:00
Shuo Qian
4362b01d2c Merge "Modify the deprecation of PhoneNumberUtil isEmergencyNumber" 
am: b8c7afacec

Change-Id: I5a41e63ee113447f75178bf3bfd996431046799a
 2019-04-03 16:04:48 -07:00
Jack Yu
138e2af543 Removed data and voice RAT from service state 
The voice and data RAT are now derived from
CS and PS network registration info.

Test: Manual + unit tests
Bug: 129863444

Merged-In: I3f4cb6057a4ae821363099583eeac7c867147afb
Change-Id: I3f4cb6057a4ae821363099583eeac7c867147afb
(cherry picked from commit 5ff5ab5649)
 2019-04-03 15:26:21 -07:00