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

384579 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Shuo Qian
b8c7afacec Merge "Modify the deprecation of PhoneNumberUtil isEmergencyNumber" 2019-04-03 22:18:31 +00:00
sqian
9371193264 Modify the deprecation of PhoneNumberUtil isEmergencyNumber 
1) Telephony API is still called by a bunch of Util methods in Android that
don't have context, therefore the service can be null. Throwing an
 exception can cause crash.
2) Fix the usage of isEmergencyNumber and isPotentialEmergencyNumber.

Test: Manual
Fixes: 129721537
Change-Id: If82bfc5102a9ac1d7e07ff744c0775a1dc95ba2c
Merged-In: If82bfc5102a9ac1d7e07ff744c0775a1dc95ba2c
(cherry picked from commit c6d55453ee)
 2019-04-03 21:32:28 +00:00
Nicolas Geoffray
1b7fb8f7ae Merge "Use Class.forName instead of ClassLoader.loadClass." 
am: dc489aba0e

Change-Id: I80f1488c7cca5ce68555786a7951f30172c905f2
 2019-04-03 12:44:56 -07:00
Treehugger Robot
dc489aba0e Merge "Use Class.forName instead of ClassLoader.loadClass." 2019-04-03 19:24:22 +00:00
Yifan Hong
751f3484ed Merge "libmedia2_jni: link to libcgrouprc" 
am: 847de83188

Change-Id: If9c9289f1ce10cbdb1fa9a8d81c463756dfebada
 2019-04-03 12:22:47 -07:00
Yifan Hong
847de83188 Merge "libmedia2_jni: link to libcgrouprc" 2019-04-03 19:08:51 +00:00
Sasha Smundak
7f0a256a78 Merge "Convert Android.mk file to Android.bp" 
am: e6bcf626be

Change-Id: I960027bd43c94d6d9908b83a1a13bffab8973549
 2019-04-03 11:39:45 -07:00
Treehugger Robot
e6bcf626be Merge "Convert Android.mk file to Android.bp" 2019-04-03 18:23:31 +00:00
Cody Kesting
2680416a67 Clarify documentation for TelMan#iccOpenLogicalChannel. 
TelephonyManager#iccOpenLogicalChannel documentation should be improved
to clarify the function and its inputs. Relevant standards are also
explicitly referenced.

Bug: 129555815
Test: Only documentation is changed. Tests not affected.
Change-Id: I0664572c83cde480a9ac5f39d8664723b9ac81c9
 2019-04-03 10:39:55 -07:00
Chenbo Feng
ecb28c1948 Merge "Clean up permissions when uids are no longer used" 
am: 7754d368f4

Change-Id: I3c06a36368abb9a1e7885d281ea1155fce857eea
 2019-04-03 10:38:57 -07:00
Nicolas Geoffray
7ef8030754 Use Class.forName instead of ClassLoader.loadClass. 
Class.forName has a fast path that ClassLoader.loadClass doesn't
have yet.

Bug: 129834244
Test: m
Change-Id: I52427be9dae5acd8eef530f706626246d16dc82a
 2019-04-03 10:32:49 -07:00
Treehugger Robot
7754d368f4 Merge "Clean up permissions when uids are no longer used" 2019-04-03 17:15:48 +00:00
paulhu
8a7d2b0e00 Fix ConnectivityServiceTest fail. 
NetdService#getInstance() will get null object in
WrappedConnectivityService constructor. Then pass this null
INetd object to PermissionMonitor will case NPE in
PermissionMonitor#sendPackagePermissionsToNetd()

Bug: None
Test: atest FrameworksNetTests
Change-Id: Ia1c80f9600a19c4aaf3f3c1b497b355d96c49c8e
 2019-04-04 00:07:40 +08:00
David Brazdil
33ed677361 Merge "Pass app's data dir to ART" 
am: 16749ac83e

Change-Id: I170cbff78d12ccc418cb440820a584f141f28433
 2019-04-03 08:35:34 -07:00
David Brazdil
16749ac83e Merge "Pass app's data dir to ART" 2019-04-03 15:21:45 +00:00
David Brazdil
06f2e1294b Pass app's data dir to ART 
Inform ART about the location of the app's data directory when setting
up the process. This is part of an optimization that has ART cache
verification data into that directory.

Test: compiles, boots
Bug: 72131483
Change-Id: Ic80526b6ee383733eb5860e66f6c608109d838fb
 2019-04-03 13:22:27 +01:00