OSDN Git Service
Youming Ye [Wed, 27 Mar 2019 21:42:02 +0000 (14:42 -0700)]
Merge "Enable Telecom to bind third party InCallServices." am:
90a9d627aa
am:
b9bace1656
Change-Id: I3c7b9ce9388be00a892c77827b8a599fe1fd291d
Youming Ye [Wed, 27 Mar 2019 21:30:23 +0000 (14:30 -0700)]
Merge "Enable Telecom to bind third party InCallServices."
am:
90a9d627aa
Change-Id: I021f72505a6e516747dffd31b177bdac9e291d78
Youming Ye [Wed, 27 Mar 2019 21:12:58 +0000 (21:12 +0000)]
Merge "Enable Telecom to bind third party InCallServices."
Xiangyu/Malcolm Chen [Wed, 27 Mar 2019 19:37:56 +0000 (12:37 -0700)]
Merge changes I592d3538,I791fd630 am:
42914720d8
am:
65b0fb178d
Change-Id: I3dc009832e48e9787db336ab08549a6e0517b61f
Xiangyu/Malcolm Chen [Wed, 27 Mar 2019 19:22:40 +0000 (12:22 -0700)]
Merge changes I592d3538,I791fd630
am:
42914720d8
Change-Id: Iae4c04c2f86d73c711d0ceab710ef1464c149370
Hayden Gomes [Wed, 27 Mar 2019 19:19:05 +0000 (12:19 -0700)]
Merge "Moving BT SMS logic to internal telephony" am:
2b7db36a14
am:
a75c1cdc4d
Change-Id: I0eb4679fac9dc73331051d9e0031b05b9e944649
Hayden Gomes [Wed, 27 Mar 2019 19:09:19 +0000 (12:09 -0700)]
Merge "Moving BT SMS logic to internal telephony"
am:
2b7db36a14
Change-Id: I8bfcbec0a6d2d892831b017349193aae16f0100f
Xiangyu/Malcolm Chen [Wed, 27 Mar 2019 19:06:12 +0000 (19:06 +0000)]
Merge changes I592d3538,I791fd630
* changes:
Add @Nullable on SubscriptionInfo#getGroupUuid
Adding nullability annotation.
Hayden Gomes [Wed, 27 Mar 2019 19:01:48 +0000 (19:01 +0000)]
Merge "Moving BT SMS logic to internal telephony"
Jack Yu [Wed, 27 Mar 2019 17:01:24 +0000 (10:01 -0700)]
Merge "Renamed DataSpecificRegistrationState" am:
86675ed5c0
am:
5a1db25c73
Change-Id: Ibb0ca2e282ff3671d520a9367a65b281e18ca1d7
Jack Yu [Wed, 27 Mar 2019 16:51:07 +0000 (09:51 -0700)]
Merge "Renamed DataSpecificRegistrationState"
am:
86675ed5c0
Change-Id: Ice5fa2213a8a1850e6a6842c197d5926c0193b3c
Jack Yu [Wed, 27 Mar 2019 16:39:46 +0000 (16:39 +0000)]
Merge "Renamed DataSpecificRegistrationState"
Youming Ye [Tue, 2 Oct 2018 20:24:43 +0000 (13:24 -0700)]
Enable Telecom to bind third party InCallServices.
Changes for Telecom to bind third party companion apps or
automotive ui installed from Play Store. Add new permissions and
settings for the third party InCallService APIs.
Bug:
78174835
Test: Manual
Change-Id: I1b4eff28b9dfd61f1c951d14b6c82395b51fe769
Merged-In: I1b4eff28b9dfd61f1c951d14b6c82395b51fe769
Siarhei Vishniakou [Wed, 27 Mar 2019 15:05:59 +0000 (08:05 -0700)]
Merge "Move tag definitions into policy" am:
3200c0bcb8
am:
e322940fa9
Change-Id: I9e26a191ce5aff6a2ae698fbdd3cbdccfc90a4cd
Siarhei Vishniakou [Wed, 27 Mar 2019 14:55:01 +0000 (07:55 -0700)]
Merge "Move tag definitions into policy"
am:
3200c0bcb8
Change-Id: I64c8ac2e104c025ee3f4aed88d03e6c9aa9bcabe
Treehugger Robot [Wed, 27 Mar 2019 14:41:12 +0000 (14:41 +0000)]
Merge "Move tag definitions into policy"
Andrei-Valentin Onea [Wed, 27 Mar 2019 14:07:16 +0000 (07:07 -0700)]
Merge changes from topic "unsupported-internal" am:
2f573ac6f8
am:
6acb2106f7
Change-Id: I98fdc3085646e3378560dc66eb7c46dfb74aee13
Andrei-Valentin Onea [Wed, 27 Mar 2019 13:56:12 +0000 (06:56 -0700)]
Merge changes from topic "unsupported-internal"
am:
2f573ac6f8
Change-Id: I0fedf5c754a59a9c57b3abd00adff00d58b4930c
Andrei-Valentin Onea [Wed, 27 Mar 2019 13:40:15 +0000 (13:40 +0000)]
Merge changes from topic "unsupported-internal"
* changes:
Add @UnsupportedAppUsage annotations
Add android internal dirs to hiddenapi-mappings
Andrei Onea [Wed, 27 Mar 2019 10:32:55 +0000 (10:32 +0000)]
Add @UnsupportedAppUsage annotations
For packages:
com.android.internal.app
com.android.internal.database
com.android.internal.http
com.android.internal.os
com.android.internal.policy
com.android.internal.util
com.android.internal.view
com.android.internal.view.menu
com.android.internal.widget
com.android.server.net
com.android.server
com.google.android.collect
com.google.android.util
This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.
Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@
Bug:
110868826
Test: m
Merged-In: Ia5306f4713298b46ae3aba6fc9d87fae41f8a593
Change-Id: Ie26033d486033289ad3e010a534a921d29c3b2ca
Andrei Onea [Fri, 22 Mar 2019 14:56:51 +0000 (14:56 +0000)]
Add android internal dirs to hiddenapi-mappings
Bug:
110868826
Test: m hiddenapi-mappings
(cherry picked from commit
77b22e33b6f9f85567bddd420488f0e88fe27bff)
Merged-In: Ie13962cc6a58af88e63a95c7f0d846aceda11f53
Change-Id: Ic6d0f663f79466d0d8692a3ebfe4a9792cd7ca07
Jack He [Wed, 27 Mar 2019 10:29:09 +0000 (03:29 -0700)]
[automerger skipped] Merge "DO NOT MERGE Atoms: Add BluetoothClassicPairingEvent" into pi-dev
am:
0c9ce0913c -s ours
am skip reason: SHA1
0c9ce0913c skipped by user siyuanh
Change-Id: I39d8af52f6e3c7614f4a024689c7c4ee0a16997d
Lorenzo Colitti [Wed, 27 Mar 2019 08:22:13 +0000 (01:22 -0700)]
Merge "Enable more logs for networking" am:
f3736d67f8
am:
310609b8be
Change-Id: Ie5dd53b7a8f9fbab801b5476b2ce89489b7ba09c
Lorenzo Colitti [Wed, 27 Mar 2019 08:13:26 +0000 (01:13 -0700)]
Merge "Enable more logs for networking"
am:
f3736d67f8
Change-Id: I422863512aa78849dcb5d61d986d7f8bbff24fd2
Lorenzo Colitti [Wed, 27 Mar 2019 07:55:35 +0000 (07:55 +0000)]
Merge "Enable more logs for networking"
Chenbo Feng [Wed, 27 Mar 2019 05:42:38 +0000 (22:42 -0700)]
Merge "Get the permission information for native services" am:
743a1c8001
am:
cfe2cc942a
Change-Id: I61bdf44239c880ef1b95c31a037f64158a32d789
Chenbo Feng [Wed, 27 Mar 2019 05:33:27 +0000 (22:33 -0700)]
Merge "Get the permission information for native services"
am:
743a1c8001
Change-Id: I806e3e948dfab0cc8c691c20f377bbc3a24240a6
Treehugger Robot [Wed, 27 Mar 2019 05:21:29 +0000 (05:21 +0000)]
Merge "Get the permission information for native services"
Jack Yu [Thu, 21 Mar 2019 23:33:15 +0000 (16:33 -0700)]
Renamed DataSpecificRegistrationState
Renamed DataSpecificRegistrationState to
DataSpecificRegistrationInfo. And added some
APIs to test API so they can be accessed by
CTS.
Test: Manual
Bug:
127657991
Merged-In: I1a623c18f02cfd19ca1af9df912d859b363f42d1
Change-Id: I1a623c18f02cfd19ca1af9df912d859b363f42d1
(cherry picked from commit
dba103204cf09187dbb0147dac39457f5993769f)
TreeHugger Robot [Wed, 27 Mar 2019 05:09:25 +0000 (05:09 +0000)]
Merge "DO NOT MERGE Atoms: Add BluetoothClassicPairingEvent" into pi-dev
Remi NGUYEN VAN [Wed, 27 Mar 2019 03:18:30 +0000 (20:18 -0700)]
Merge "Use SystemApi framework parcelables directly" am:
021ea66aea
am:
4864ffd97e
Change-Id: I28b60bcaf76d8902f3cd9d7956931c98d8d85710
Remi NGUYEN VAN [Wed, 27 Mar 2019 03:09:17 +0000 (20:09 -0700)]
Merge "Use SystemApi framework parcelables directly"
am:
021ea66aea
Change-Id: I33ab2a6935edc25eb0cfcaee258ef6da92ed2c83
Chenbo Feng [Wed, 27 Mar 2019 03:02:14 +0000 (20:02 -0700)]
Merge "Fix the INTERNET related permissions" am:
88fb51277b
am:
ddd4e08d2c
Change-Id: I7b07ca0ef7966f0ebee17cabe2eb79c5d6381228
Treehugger Robot [Wed, 27 Mar 2019 02:55:15 +0000 (02:55 +0000)]
Merge "Use SystemApi framework parcelables directly"
Chenbo Feng [Wed, 27 Mar 2019 02:52:57 +0000 (19:52 -0700)]
Merge "Fix the INTERNET related permissions"
am:
88fb51277b
Change-Id: Id97b1ea945409e938158f30efd564b10c9e81380
Chenbo Feng [Tue, 26 Mar 2019 21:36:34 +0000 (14:36 -0700)]
Get the permission information for native services
For native services such as mediaserver and audioserver, the permission
information cannot be retrieved from getInstalledPackages. Instead, the
high level permission information is avalaible in systemConfigs. With
those permission information, netd can store the complete list of uids
that have UPDATE_DEVICE_STATS permission.
Bug:
128944261
Test: dumpsys netd trafficcontroller
Change-Id: I0331d5a3a5b927a351fcfe6689ef1ba2b993db0c
Treehugger Robot [Wed, 27 Mar 2019 02:35:35 +0000 (02:35 +0000)]
Merge "Fix the INTERNET related permissions"
Lucas Lin [Wed, 27 Mar 2019 01:49:59 +0000 (18:49 -0700)]
Merge "Fix flaky test for ConnectivityServiceTest#testPartialConnectivity" am:
9e3297a099
am:
d593ac0f90
Change-Id: I4b0a70cbfdce8f43c07275ace151d3ab464da5a4
Lucas Lin [Wed, 27 Mar 2019 01:41:00 +0000 (18:41 -0700)]
Merge "Fix flaky test for ConnectivityServiceTest#testPartialConnectivity"
am:
9e3297a099
Change-Id: I0639d4ccd7c3211595ede82bce3daa87ae759e10
Lucas Lin [Wed, 27 Mar 2019 01:29:51 +0000 (01:29 +0000)]
Merge "Fix flaky test for ConnectivityServiceTest#testPartialConnectivity"
Badhri Jagan Sridharan [Wed, 27 Mar 2019 01:03:54 +0000 (18:03 -0700)]
Merge "Fix missing combination check SINK/DEVICE" am:
25a7e6ed25
am:
a890cc7c97
Change-Id: I284e113c8f0154032dc54fd3e2053aefa5f78503
Badhri Jagan Sridharan [Wed, 27 Mar 2019 00:54:08 +0000 (17:54 -0700)]
Merge "Fix missing combination check SINK/DEVICE"
am:
25a7e6ed25
Change-Id: I3b8e25d60b051785c486555176472fd072163885
Treehugger Robot [Wed, 27 Mar 2019 00:34:25 +0000 (00:34 +0000)]
Merge "Fix missing combination check SINK/DEVICE"
Youming Ye [Wed, 27 Mar 2019 00:12:34 +0000 (17:12 -0700)]
Merge "Hide blocking pay phone option use carrier config" am:
c365007e5f
am:
694020234b
Change-Id: I91d75a6365cc629d10bfaaebdba3faf6ead646af
Amit Mahajan [Tue, 26 Mar 2019 23:48:14 +0000 (16:48 -0700)]
Merge "Device could not use wifi hotspot when data card switch to sim2" am:
cd24e832e8
am:
012a279038
Change-Id: I5e3aac3d3181aaae02e5568923154cd89f427380
Badhri Jagan Sridharan [Mon, 25 Mar 2019 18:02:44 +0000 (11:02 -0700)]
Fix missing combination check SINK/DEVICE
While checking for possible role combinations, the SINK/HOST combination
seems to be mistakenly checked twice intead of SINK/DEVICE.
This CL fixes this. The code now checks for:
1. source & host
2. sink & host
3. source & device
4. sink & device
Bug:
119142682
Change-Id: I5e652fbf9313bd2c122fe728d58e577085632253
Merged-In: I5e652fbf9313bd2c122fe728d58e577085632253
Youming Ye [Tue, 26 Mar 2019 22:56:42 +0000 (15:56 -0700)]
Merge "Hide blocking pay phone option use carrier config"
am:
c365007e5f
Change-Id: I4385f33d658a394d80e0b0722faf5ca12df940f6
Amit Mahajan [Tue, 26 Mar 2019 22:45:52 +0000 (15:45 -0700)]
Merge "Device could not use wifi hotspot when data card switch to sim2"
am:
cd24e832e8
Change-Id: I9ae2b31e6dd3f4a4c575ff37b8a9df58eb2c2e70
Chenbo Feng [Fri, 8 Mar 2019 19:55:12 +0000 (11:55 -0800)]
Fix the INTERNET related permissions
Change the INTERNET permission implementation so it only block socket
creation when non of the packages under the same uid have internet
permission. Fix the UPDATE_DEVICE_STATS permission so only the uid that
own the permission can change it.
Bug:
111560570
Test: CtsNetTestCasesUpdateStatsPermission
CtsNetTestCasesInternetPermission
Change-Id: I42385526c191d4429f486cde01293b27fcc1374b
Treehugger Robot [Tue, 26 Mar 2019 22:10:58 +0000 (22:10 +0000)]
Merge "Hide blocking pay phone option use carrier config"
Amit Mahajan [Tue, 26 Mar 2019 21:18:23 +0000 (21:18 +0000)]
Merge "Device could not use wifi hotspot when data card switch to sim2"
Amin Shaikh [Tue, 26 Mar 2019 21:02:37 +0000 (14:02 -0700)]
Merge "Add bluetooth icon." am:
af76131710
am:
94628539aa
Change-Id: Ib315b1f5e7c2244bb1fe60ec19425dc14048bdcb
Amin Shaikh [Tue, 26 Mar 2019 20:28:50 +0000 (13:28 -0700)]
Merge "Add bluetooth icon."
am:
af76131710
Change-Id: Id2ee34a49d26bcf8109b59f9012c750fe2da1be5
Bill Yi [Tue, 26 Mar 2019 20:19:53 +0000 (13:19 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
895f1c1032 -s ours
am skip reason: subject contains skip directive
Change-Id: I78a17b7ef9e97b76874def995894674bd4b1199f
Siarhei Vishniakou [Mon, 25 Mar 2019 22:38:11 +0000 (15:38 -0700)]
Move tag definitions into policy
Currently, the tags are defined in system/core.
Instead, reserve a range in system/core and define the tags in policy.
Next, we add a flag for interceptKeyBeforeQueueing.
Bug:
128933363
Test: adb logcat -b events, turn on screen, then press power button and
observe the logs.
Change-Id: I1fde2a2e7451ec67987ad3b09abc28be64410427
Merged-In: I1fde2a2e7451ec67987ad3b09abc28be64410427
TreeHugger Robot [Tue, 26 Mar 2019 19:36:47 +0000 (19:36 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Treehugger Robot [Tue, 26 Mar 2019 18:30:30 +0000 (18:30 +0000)]
Merge "Add bluetooth icon."
Tadashi G. Takaoka [Tue, 26 Mar 2019 18:17:15 +0000 (11:17 -0700)]
Merge "Rename WM test filter to FrameworksTestsFilter" am:
d824faeb46
am:
487ddbf518
Change-Id: I04f88e7d16b8da5821050f1ed7a64566b1fadd3d
Tadashi G. Takaoka [Tue, 26 Mar 2019 17:53:06 +0000 (10:53 -0700)]
Merge "Rename WM test filter to FrameworksTestsFilter"
am:
d824faeb46
Change-Id: I7a9eebc68ec839dde90f9cf7f9952ac67a3d94df
Treehugger Robot [Tue, 26 Mar 2019 17:32:22 +0000 (17:32 +0000)]
Merge "Rename WM test filter to FrameworksTestsFilter"
Tadashi G. Takaoka [Tue, 26 Mar 2019 10:19:01 +0000 (19:19 +0900)]
Rename WM test filter to FrameworksTestsFilter
This CL adds Window Manager related tests of FrameworksServicesTests
to the test filter, and adds a comment to each tests mentioning about
FrameworksTestsFilter.
Test: Pass all 85 non-flaky presubmit tests of FrameworksCoreTests specified
in FrameworksTestsFilter.
$ tradefed.sh run commandAndExit FrameworksCoreTests \
--instrumentation-arg filter=com.android.server.wm.test.filters.FrameworksTestsFilter
--include-annotation android.platform.test.annotations.Presubmit \
--exclude-annotation androidx.test.filters.FlakyTest
Test: Pass all 133 non-flaky presubmit tests of FrameworksServicesTests
specified in FrameworksTestsFilter.
$ tradefed.sh run commandAndExit FrameworksServicesTests \
--instrumentation-arg filter=com.android.server.wm.test.filters.FrameworksTestsFilter
--include-annotation android.platform.test.annotations.Presubmit \
--exclude-annotation androidx.test.filters.FlakyTest
Test: Pass all 162 non-flaky presubmit tests of FrameworksServicesTests
specified as under package com.android.server.wm.
$ tradefed.sh run commandAndExit FrameworksServicesTests \
--instrumentation-arg selectTest=com.android.server.wm. \
--instrumentation-arg filter=com.android.server.wm.test.filters.FrameworksTestsFilter
--include-annotation android.platform.test.annotations.Presubmit \
--exclude-annotation androidx.test.filters.FlakyTest
Bug:
122451194
Change-Id: I9592ff01158eec1b4ef4d0dd22be243e10bd198e
Merged-In: I9592ff01158eec1b4ef4d0dd22be243e10bd198e
Amin Shaikh [Thu, 14 Mar 2019 16:33:19 +0000 (16:33 +0000)]
Add bluetooth icon.
Add accent_device_default that uses the light/dark variant based on
light/dark ui mode.
Bug:
126425594
Change-Id: I08640cc161b6d63da42c3f03df7cf41b182b005e
Test: make
Anton Hansson [Tue, 26 Mar 2019 13:08:25 +0000 (06:08 -0700)]
Merge "Move EmergencyInfo perm whitelist to /product" am:
ae957afaa6
am:
300026a5e9
Change-Id: Ia932307a9b85366daa8e8ec09dd92a124ea1d8cf
Anton Hansson [Tue, 26 Mar 2019 12:59:02 +0000 (05:59 -0700)]
Merge "Move EmergencyInfo perm whitelist to /product"
am:
ae957afaa6
Change-Id: I5fe7aefb42087ed577d67b9677915d1392d7ef9e
Anton Hansson [Tue, 26 Mar 2019 12:39:09 +0000 (12:39 +0000)]
Merge "Move EmergencyInfo perm whitelist to /product"
lucaslin [Tue, 26 Mar 2019 09:49:49 +0000 (17:49 +0800)]
Fix flaky test for ConnectivityServiceTest#testPartialConnectivity
There are 2 problems will make testPartialConnectivity flaky:
1. If we call setNetworkValid() before expectCapabilitiesWith(),
there may be a timing issue that network will become VALID before
NetworkMonitor send PARTIAL_CONNECTIVITY to ConnectivityService.
Solution:
We should set network to valid after ConnectivityService received
NETWORK_TEST_RESULT_PARTIAL_CONNECTIVITY to ensure NetworkMonitor
will send PARTIAL_CONNECTIVITY to ConnectivityService first then
send VALID.
2. When test case call explicitlySelected(true) first then call
connect(true), NetworkMonitor will report the network validation
test result twice because ConnectivityServiceTest() will trigger
notifyNetworkTested() when setAcceptPartialConnectivity() is
called, it may cause a timing that before the second test result
send to ConnectivityService, connect() already called
setNetworkInvalid. So, NET_CAPABILITY_VALIDATED will be removed
and ConnectivityService will trigger onCapabilitiesChanged()
unexpectedly.
Solution:
Don't trigger notifyNetworkTested() when
setAcceptPartialConnectivity() is called. If there is needed,
use mCm.reportNetworkConnectivity() to report the test result
instead.
Bug:
128426024
Test: 1. atest FrameworksNetTests: \
ConnectivityServiceTest#testPartialConnectivity \
--generate-new-metrics 1000
Change-Id: I7200528378201a3c7c09a78ff827b41f2741dfa1
Chuwei Xu [Tue, 26 Mar 2019 09:48:21 +0000 (02:48 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix CtsActivityManagerDeviceTestCases fails" am:
dbe9e763fa -s ours
am:
cb9ba1011b -s ours
am skip reason: subject contains skip directive
Change-Id: I9e25d71fe76aa2412a290d0b40fd76ad9f9fa976
Chuwei Xu [Tue, 26 Mar 2019 09:39:58 +0000 (02:39 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix CtsActivityManagerDeviceTestCases fails"
am:
dbe9e763fa -s ours
am skip reason: subject contains skip directive
Change-Id: I84206ddca4b6abbb0ca842b9056669ec16b832dd
Treehugger Robot [Tue, 26 Mar 2019 09:28:08 +0000 (09:28 +0000)]
Merge "DO NOT MERGE Fix CtsActivityManagerDeviceTestCases fails"
Junyu Lai [Tue, 26 Mar 2019 07:03:27 +0000 (00:03 -0700)]
Merge "Reveal the call trace of failed test cases which run in executors" am:
bb8954df3b
am:
1a48fc466d
Change-Id: I1a2d312842f33a9b7b98da925b332becaece3cb2
Junyu Lai [Tue, 26 Mar 2019 06:54:01 +0000 (23:54 -0700)]
Merge "Reveal the call trace of failed test cases which run in executors"
am:
bb8954df3b
Change-Id: Ia0de9ac66ad2137c6d1147e2ad5c899ab7b33ece
Junyu Lai [Tue, 26 Mar 2019 06:38:39 +0000 (06:38 +0000)]
Merge "Reveal the call trace of failed test cases which run in executors"
Ruoyao Liu [Mon, 21 Jan 2019 03:36:18 +0000 (11:36 +0800)]
Enable more logs for networking
Sometimes we would encounter problems that happen by chance and
hard to reproduce. So we recommend to enable more logs in ENG and
UESRDEBUG load by default.
Bug:
123256412
Test: android.net.ip.IpClientTest can pass
Change-Id: Ia3363de96966a4e86ab550c768fb70317da005ed
Remi NGUYEN VAN [Tue, 26 Mar 2019 02:40:34 +0000 (11:40 +0900)]
Use SystemApi framework parcelables directly
Remove StaticIpConfigurationParcelable and ApfCapabilitiesParcelable and
use StaticIpConfiguration and ApfCapabilities directly.
These two classes are SystemApi and defined in framework.jar, so no
stability guarantee is needed: the parceled and unparceled class will
always be the framework.jar version.
Bug:
126477266
Fixes:
126477266
Test: atest FrameworksNetTests NetworkStackTests
Test: flashed, booted, WiFi and captive portal works.
Change-Id: Iaf80ae23e003752cc6d2300700021931923b6533
Tyler Gunn [Mon, 25 Mar 2019 22:00:45 +0000 (15:00 -0700)]
Merge "Fix potential NPE in telephony registry dumpsys." am:
06bdf061f0
am:
0e1e725bb5
Change-Id: I1c5e56f0e18ce49addfaab5a3ffa146fad8b08b9
Tyler Gunn [Mon, 25 Mar 2019 21:38:45 +0000 (14:38 -0700)]
Merge "Fix potential NPE in telephony registry dumpsys."
am:
06bdf061f0
Change-Id: I2dc15f126fb34767cadaa02000bbf83f374193a8
Treehugger Robot [Mon, 25 Mar 2019 21:00:07 +0000 (21:00 +0000)]
Merge "Fix potential NPE in telephony registry dumpsys."
Bill Yi [Mon, 25 Mar 2019 20:31:58 +0000 (13:31 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Idf2fed403af24397c26d6ee44a60a27ec9424274
Anton Hansson [Mon, 25 Mar 2019 19:41:53 +0000 (19:41 +0000)]
Move EmergencyInfo perm whitelist to /product
The app is moving to /product, to separate out its permission
grants to a separate file and move that file to /product as well.
Bug:
122353713
Test: boot aosp_arm64 emulator
Change-Id: Ic165aae180a002c3566e3c1b1495a1d50dfd0e4a
Tadashi G. Takaoka [Mon, 25 Mar 2019 17:03:35 +0000 (10:03 -0700)]
Merge "Make SelectTest append selectTest argument from extended class" am:
96cf453355
am:
bf2309beae
Change-Id: I068d7b920796ac90f756bfcba6cf51e046ebbff3
Tadashi G. Takaoka [Mon, 25 Mar 2019 16:52:49 +0000 (09:52 -0700)]
Merge "Make SelectTest append selectTest argument from extended class"
am:
96cf453355
Change-Id: I875035648d138f2fbae86ebc1c0f04c8c8dfaa82
Treehugger Robot [Mon, 25 Mar 2019 16:38:20 +0000 (16:38 +0000)]
Merge "Make SelectTest append selectTest argument from extended class"
madym [Mon, 25 Mar 2019 15:09:13 +0000 (08:09 -0700)]
Merge "Add to sysui owners" am:
e9e5017afe
am:
5a5ec0b4e8
Change-Id: Ie573d2218aa63d1c6529c4cda98dabfeb64baba5
madym [Mon, 25 Mar 2019 14:57:46 +0000 (07:57 -0700)]
Merge "Add to sysui owners"
am:
e9e5017afe
Change-Id: Idf2bf55ce705756cd98f21396a21fc0c3b207bf0
Treehugger Robot [Mon, 25 Mar 2019 14:43:37 +0000 (14:43 +0000)]
Merge "Add to sysui owners"
Tyler Gunn [Mon, 25 Mar 2019 14:26:33 +0000 (07:26 -0700)]
Fix potential NPE in telephony registry dumpsys.
There is no guarantee that mImsCallDisconnectCause will be non-null, so
we should not be calling toString here.
Test: Compile/build
Fixes:
129251351
Change-Id: I8b983ce8fa7f5316bc474ffbd67052ae0df4d75d
Remi NGUYEN VAN [Mon, 25 Mar 2019 13:42:49 +0000 (06:42 -0700)]
Merge "Add nullability annotations" am:
a1ee1fc888
am:
3d48153a8f
Change-Id: Ic81850c2976e7412e85856c5d1336f30d0691125
Mark Chien [Mon, 25 Mar 2019 13:34:45 +0000 (06:34 -0700)]
Merge "[TCPKeepalive] Fill correct TOS and TTL value" am:
6aef2afd4e
am:
37dd29a169
Change-Id: I0de6ff4a97f64b0ba72856c9d9d6fe57d677e5fa
Remi NGUYEN VAN [Mon, 25 Mar 2019 13:33:40 +0000 (06:33 -0700)]
Merge "Add nullability annotations"
am:
a1ee1fc888
Change-Id: I47ec92d406b16eaff049ad4a5af1b1b407418e4d
Mark Chien [Mon, 25 Mar 2019 13:25:42 +0000 (06:25 -0700)]
Merge "[TCPKeepalive] Fill correct TOS and TTL value"
am:
6aef2afd4e
Change-Id: I8c5993aadd1bfa79290821215f6dae2bba057c5f
Treehugger Robot [Mon, 25 Mar 2019 13:19:19 +0000 (13:19 +0000)]
Merge "Add nullability annotations"
Tadashi G. Takaoka [Fri, 22 Mar 2019 08:21:51 +0000 (17:21 +0900)]
Make SelectTest append selectTest argument from extended class
This CL also moves CoreTestsFilter to frameworks/base/tests/utils, so
that FrameworksCoreTests, FrameworksServicesTests, and WmTests can use
CoreTestsFilter.
Test: Pass SelectTestTests
$ atest WmTests:com.android.test.filters.SelectTestTests
Test: Pass all 85 WM related non-flaky presubmit tests in FrameworksCoreTests
using CoreTestsFilter
$ tradefed.sh run commandAndExit FrameworksCoreTests \
--instrumentation-arg selectTest=com.android.server.wm.,com.android.server.am. \
--instrumentation-arg filter=com.android.server.wm.test.filters.CoreTestsFilter
--include-annotation android.platform.test.annotations.Presubmit \
--exclude-annotation androidx.test.filters.FlakyTest
Test: Pass all 293 WM related non-flaky presubmit tests in
FrameworksServicesTests using CoreTestsFilter
$ tradefed.sh run commandAndExit FrameworksServicesTests \
--instrumentation-arg selectTest=com.android.server.wm.,com.android.server.am. \
--instrumentation-arg filter=com.android.server.wm.test.filters.CoreTestsFilter
--include-annotation android.platform.test.annotations.Presubmit \
--exclude-annotation androidx.test.filters.FlakyTest
Bug:
122451194
Change-Id: I83d13d9ef82a92677bee67da5ee8a5faa0690f82
Merged-In: I83d13d9ef82a92677bee67da5ee8a5faa0690f82
Mark Chien [Mon, 25 Mar 2019 13:10:17 +0000 (13:10 +0000)]
Merge "[TCPKeepalive] Fill correct TOS and TTL value"
junyulai [Tue, 19 Mar 2019 10:50:23 +0000 (18:50 +0800)]
Reveal the call trace of failed test cases which run in executors
Currently, the fails in testTcpSocketKeepalives are triggered by
fail() inside the executor, which is hiding the actual call trace
but only message remains. And it made the fail case hard to
debug.
So this commit is to bubble up the Exception by using a custom
functional interface.
Bug:
123987272
Test: 1. atest FrameworksNetTests
2. manually fail the test case and see the call trace
Change-Id: I125e673938a5e9d1de86f83c1a732227a4bd3207
Junyu Lai [Mon, 25 Mar 2019 11:06:39 +0000 (04:06 -0700)]
Merge "Fix SocketKeepalive APIs which do not meet API review requirement" am:
8324c3e7e5
am:
08e1787088
Change-Id: Iead39e877aec917ff3c409fda1ff0c4dbaa21fcb
Junyu Lai [Mon, 25 Mar 2019 10:57:32 +0000 (03:57 -0700)]
Merge "Fix SocketKeepalive APIs which do not meet API review requirement"
am:
8324c3e7e5
Change-Id: Id82be12a54e676c4ad18900ae910e6d08079e62c
Remi NGUYEN VAN [Mon, 25 Mar 2019 10:50:40 +0000 (03:50 -0700)]
Merge "Add nullable annotations to startActivityAsUser" am:
743a4b7872
am:
2704d2f4f6
Change-Id: I9f52f733b219acaae437c452bc238f6933bb0cec
Junyu Lai [Mon, 25 Mar 2019 10:42:37 +0000 (10:42 +0000)]
Merge "Fix SocketKeepalive APIs which do not meet API review requirement"
Remi NGUYEN VAN [Mon, 25 Mar 2019 10:41:34 +0000 (03:41 -0700)]
Merge "Add nullable annotations to startActivityAsUser"
am:
743a4b7872
Change-Id: Ifa44f448fd37ecc2051a16d979717b8aeaa05ebf
Treehugger Robot [Mon, 25 Mar 2019 10:29:22 +0000 (10:29 +0000)]
Merge "Add nullable annotations to startActivityAsUser"