Commit Graph

431187 Commits

Author SHA1 Message Date
Eric Holk
efa011f8a3 Merge "[view compiler] Add test coverage for layouts compiled from APK" am: a2b218db06
am: 9142ac8119

Change-Id: I35a74d2ed6c1920672b61981a9d6b40b3b089495
2019-09-06 14:49:05 -07:00
Brad Ebinger
86d97445cf Merge "Re-deprecating Capabilities in ImsFeature" am: f4cd3de77a
am: 36d3aa0e02

Change-Id: Id9ea164e537b6f12b2af02f2833b0f95d3391e1c
2019-09-06 14:33:57 -07:00
Eric Holk
9142ac8119 Merge "[view compiler] Add test coverage for layouts compiled from APK"
am: a2b218db06

Change-Id: I4e6e938ea8f831182550966ea7cfccb258fb05ca
2019-09-06 14:26:37 -07:00
Pengquan Meng
90247580a7 Merge "Support maximum wait time for Cell broadcast" am: 156f347db4
am: 0362123033

Change-Id: I08d29451c56e9f0405399eddbc3c4fc662ee1b6a
2019-09-06 14:22:00 -07:00
Treehugger Robot
a2b218db06 Merge "[view compiler] Add test coverage for layouts compiled from APK" 2019-09-06 20:40:22 +00:00
Brad Ebinger
36d3aa0e02 Merge "Re-deprecating Capabilities in ImsFeature"
am: f4cd3de77a

Change-Id: I3dab955f70d6f4027f79cefc3b9d35c1cbfffaa6
2019-09-06 12:11:35 -07:00
Brad Ebinger
f4cd3de77a Merge "Re-deprecating Capabilities in ImsFeature" 2019-09-06 18:55:17 +00:00
Pengquan Meng
0362123033 Merge "Support maximum wait time for Cell broadcast"
am: 156f347db4

Change-Id: Id6bdf363bc2819e2e16a9ee2b67e0ab449e5c09d
2019-09-06 10:39:37 -07:00
Pengquan Meng
156f347db4 Merge "Support maximum wait time for Cell broadcast" 2019-09-06 17:15:28 +00:00
Jonathan Scott
7f08445f65 Merge "Add MANAGED_PROVISIONING_DPC_DOWNLOADED." into qt-dev am: b01fe73ed3
am: 719cd95a84

Change-Id: I27898e265c24dbb7c4668cb47dbcb23ebdbf2b95
2019-09-06 04:57:04 -07:00
Jonathan Scott
719cd95a84 Merge "Add MANAGED_PROVISIONING_DPC_DOWNLOADED." into qt-dev
am: b01fe73ed3

Change-Id: I800c640883b1ef9eff5fff0200a0785ccd2d18ae
2019-09-06 04:44:09 -07:00
Jonathan Scott
b01fe73ed3 Merge "Add MANAGED_PROVISIONING_DPC_DOWNLOADED." into qt-dev 2019-09-06 11:20:56 +00:00
Jiyong Park
2ce280c5d5 Revert "Fix: vendor public libraries are accessible via System.loadLibrary" am: 9c7d8b12b4
am: c93d704df2

Change-Id: Iee36c8f242d6fc7b29af0b3cc1811af3e4890e98
2019-09-06 03:41:10 -07:00
Jiyong Park
c93d704df2 Revert "Fix: vendor public libraries are accessible via System.loadLibrary"
am: 9c7d8b12b4

Change-Id: I37e549a8a39bdfd478808c415384d90537cbbe62
2019-09-06 03:27:16 -07:00
Jiyong Park
9c7d8b12b4 Revert "Fix: vendor public libraries are accessible via System.loadLibrary"
This reverts commit cfe38cdb1c.

The CL 8f712189dfc02285573337e2b4ab17678011db14 in libcore project avoids
the need for adding the new paths in LoadedApk. With the CL, a classloader
does not give up even when loader.findLibrary() has failed due to some
paths are not added to it. Instead, the classloader converts the given
libname into a filename (e.g. foo -> libfoo.so) then calls dlopen()
with the filename. The classloader reports failure only when the dlopen()
call has failed. Therefore, manually adding these paths to the classloader
is no longer needed and thus removed.

Bug: 109720125
Test: System.loadLibrary("adsprpc") is successful in Pixel (because
libadsprpc.so is in Pixel's vendor public lib list)
Test: atest cts/tests/tests/jni

Merged-In: I1970eba7e732728699042a36b89571915ec81451
(cherry picked from commit 37131e1ee6)
Change-Id: I1970eba7e732728699042a36b89571915ec81451
2019-09-06 14:02:26 +09:00
Pengquan Meng
9f677a0790 Support maximum wait time for Cell broadcast
Geo-Fencing Maximum Wait Time a device shall allow to determines it
location meeting operator policy. If the device is unable to determine
its position meeting operator policy within the GeoFencing Maximum Wait Time,
it shall present the alert to the user and discontinue further positioning
determination for the alert.

Bug: 139022202
Test: manual
Merged-In: If3d8d7915f2d86da20c63e99bee01f30e3ea89c0
Change-Id: If3d8d7915f2d86da20c63e99bee01f30e3ea89c0
(cherry picked from commit 02d6ac0f20)
2019-09-05 15:27:31 -07:00
Xin Li
6500b83b40 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: d191463bb0 -s ours am: 2556f35b94 -s ours
am: 5cdd996e0a

Change-Id: Ie7b34f06a9600d4e9ddd9587aac1ce2aec5ad12f
2019-09-05 15:04:33 -07:00
Xin Li
81d6024d89 [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: e199ca954d -s ours am: 03f35832bf -s ours
am: 9b38ec8ccd

Change-Id: Ibf2eaa45d685bba0b3472b510a13e2c78a5f2277
2019-09-05 14:44:40 -07:00
Xin Li
5cdd996e0a [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: d191463bb0 -s ours
am: 2556f35b94 -s ours
am skip reason: subject contains skip directive

Change-Id: Id766798b32e4613728ea35b502c15660b8e8fbb2
2019-09-05 14:41:36 -07:00
Xin Li
2556f35b94 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"
am: d191463bb0 -s ours
am skip reason: subject contains skip directive

Change-Id: I47d5e62a09155529525a892c1687519f054d43f9
2019-09-05 14:18:24 -07:00
Xin Li
9b38ec8ccd [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: e199ca954d -s ours
am: 03f35832bf -s ours
am skip reason: subject contains skip directive

Change-Id: I112f6ad00252d63046d6732a5c0fa72e7ff64e9c
2019-09-05 14:06:52 -07:00
Xin Li
03f35832bf [automerger skipped] DO NOT MERGE - Merge Android 10 into master
am: e199ca954d -s ours
am skip reason: subject contains skip directive

Change-Id: I2fad02a5d974eb5bef685a9c695eb52f52f8749a
2019-09-05 13:26:43 -07:00
Pinyao Ting
dcf94d8b0a [automerger skipped] fixes a security vulnerability in slice provider am: 46368e4f5c -s ours am: d16ceb6e8e -s ours
am: 96a88f3a22 -s ours
am skip reason: change_id Ib1b4fba54ebd3599fe11021d21dc9b09d34e8965 with SHA1 a6364d92ed is in history

Change-Id: Iead706be1b918a5ab21e7308b08eb06c2901665e
2019-09-05 13:21:00 -07:00
Pinyao Ting
96a88f3a22 [automerger skipped] fixes a security vulnerability in slice provider am: 46368e4f5c -s ours
am: d16ceb6e8e -s ours
am skip reason: change_id Ib1b4fba54ebd3599fe11021d21dc9b09d34e8965 with SHA1 a6364d92ed is in history

Change-Id: I7eb44433973d93af2063ba68c41892aeb09ba0f7
2019-09-05 12:29:50 -07:00
Pinyao Ting
d16ceb6e8e [automerger skipped] fixes a security vulnerability in slice provider
am: 46368e4f5c -s ours
am skip reason: change_id Ib1b4fba54ebd3599fe11021d21dc9b09d34e8965 with SHA1 a6364d92ed is in history

Change-Id: I62e3dde45298fd57b903cd4dfa1210041789c214
2019-09-05 12:05:29 -07:00
Eric Holk
06a213820d [view compiler] Add test coverage for layouts compiled from APK
The existing LayoutCompilerTest only covered compiled layouts generated from
text XML files. It did not cover layouts that were extracted from the APK. This
is an important area to cover.

This test works by calling `pm compile --compile-layouts` on the test APK, and
then directly loads the `compiled_view.dex` file. From there, it pulls out the
compiled layouts and executes their inflater. This makes sure the generated DEX
files validate and execute without error.

Bug: 111895153
Merged-In: Ifc6719c2f438474b5474def02422ef68eee800b2
Change-Id: I7024069bb4d77a81871366f259fb34ae54a55aac
2019-09-05 11:20:05 -07:00
Brad Ebinger
98c0e000eb Re-deprecating Capabilities in ImsFeature
Readding the @deprecated javadoc to Capabilities as it is valid
to @hide a superclass of a @SystemApi.

Bug: 138990145
Test: manual
Change-Id: I1749aa3f09b7782fd0d665238be4c288a33536ea
2019-09-05 11:18:37 -07:00
Xin Li
d191463bb0 Merge "DO NOT MERGE - Merge Android 10 into master" 2019-09-05 16:53:23 +00:00
Jonathan Scott
a5e4422d14 Add MANAGED_PROVISIONING_DPC_DOWNLOADED.
Test: Just adding a constant
Bug: 132261064
Change-Id: I2bce277ff8f2de4614e19d5385fe6712b076f9c9
Merged-In: I2bce277ff8f2de4614e19d5385fe6712b076f9c9
2019-09-05 17:31:12 +01:00
Lucas Lin
292fd7358a Merge "Fix flaky test - testPartialConnectivity" am: 3f275ca900 am: 6494f3c649
am: 73fc6b4aff

Change-Id: I431756e6e52b99bbbad45f8310f718a40dd5a2b5
2019-09-05 05:32:09 -07:00
Lucas Lin
73fc6b4aff Merge "Fix flaky test - testPartialConnectivity" am: 3f275ca900
am: 6494f3c649

Change-Id: Ic38879fc39fda8ce84032d520f83608e10ea2dd9
2019-09-05 05:24:35 -07:00
Lucas Lin
6494f3c649 Merge "Fix flaky test - testPartialConnectivity"
am: 3f275ca900

Change-Id: Ic643ec7a5641b531befc8a9c4af524177f97e761
2019-09-05 05:09:48 -07:00
Lucas Lin
3f275ca900 Merge "Fix flaky test - testPartialConnectivity" 2019-09-05 11:40:01 +00:00
lucaslin
fe39f0a777 Fix flaky test - testPartialConnectivity
This timing issue is happened when test case already verified
NetworkMonitor#setAcceptPartialConnectivity() before
NetworkAgent send the CONNECTED state to ConnectivityService.
This test case expects that the
NetworkMonitor#setAcceptPartialConnectivity() will be invoked
when network state is CONNECTED in
ConnectivityService#updateNetworkInfo().

NetworkAgent communicates with ConnectivityService by
AsyncChannel. Before they connect to each other, the thread of
NetworkAgent is keeping idle, so waitForIdle cannot handle this
kind of case. Although they have connected to each other, but
they don't communicate with each other, waitForIdle() still
cannot handle this case. It means waitForIdle() can only handle
the case that NetworkAgent already connected to
ConnectivityService and NetworkAgent is communicating with
ConnectivityService. So, that's why waitForIdle() sometimes
doesn't work in this case, and the most simplest and right way
to fix this case is to wait the available callback then verify
the method.

Bug: 140306320
Test: atest FrameworksNetTests: \
      ConnectivityServiceTest#testPartialConnectivity \
      --generate-new-metrics 500

Change-Id: I64bfecbfe3c5776bd5c347a821f9127e79539c48
2019-09-05 11:39:20 +00:00
Remi NGUYEN VAN
ba5eae719b Merge "Add NetIdManagerTest" am: 4339cf3402 am: 99fb017643
am: 6bbee11f5e

Change-Id: Iea5c3d1ab35678edf25f103e54784ce8ab49ca12
2019-09-05 00:22:50 -07:00
Remi NGUYEN VAN
6bbee11f5e Merge "Add NetIdManagerTest" am: 4339cf3402
am: 99fb017643

Change-Id: I47250a4593af4d803942e0ac736b7c0625b6ee70
2019-09-05 00:08:58 -07:00
Remi NGUYEN VAN
99fb017643 Merge "Add NetIdManagerTest"
am: 4339cf3402

Change-Id: Ifbebb446601fcbbdf91fff48dc66ad173a6ecc7c
2019-09-04 23:54:58 -07:00
Treehugger Robot
4339cf3402 Merge "Add NetIdManagerTest" 2019-09-05 06:39:43 +00:00
Remi NGUYEN VAN
fa0b3b5edd Merge "Add ConnectivityServiceIntegrationTest" am: 324d724fd7 am: ef8268d3b0
am: c7e7bb213c

Change-Id: I256ee5f6bad08b4a6ca5037a80388b478ebff266
2019-09-04 23:01:43 -07:00
Remi NGUYEN VAN
c7e7bb213c Merge "Add ConnectivityServiceIntegrationTest" am: 324d724fd7
am: ef8268d3b0

Change-Id: I78627992846ce9e89abe0d8a9cf512c07552e4d2
2019-09-04 22:51:15 -07:00
Remi NGUYEN VAN
ef8268d3b0 Merge "Add ConnectivityServiceIntegrationTest"
am: 324d724fd7

Change-Id: Ib82c5e5aee9e830a0efe8ea6335933237bb33856
2019-09-04 22:41:44 -07:00
Treehugger Robot
324d724fd7 Merge "Add ConnectivityServiceIntegrationTest" 2019-09-05 05:26:34 +00:00
Android Build Merger (Role)
8d0e14eac9 Merge "Merge "Use UnlockMethodCache#canSkipBouncer in user switcher" into qt-dev am: 57e8d83cab am: 1ac62e687a" into qt-r1-dev-plus-aosp 2019-09-05 02:39:28 +00:00
Fabian Kozynski
bb355d419d Merge "Use UnlockMethodCache#canSkipBouncer in user switcher" into qt-dev am: 57e8d83cab
am: 3963e204bb

Change-Id: I120151ebf2837cae579c80f78e6431633d6bcb17
2019-09-04 19:38:26 -07:00
Fabian Kozynski
6db44a4526 Merge "Use UnlockMethodCache#canSkipBouncer in user switcher" into qt-dev am: 57e8d83cab
am: 1ac62e687a

Change-Id: I8d2ef62ab7bbcb9de7e6ac471f2da208422d7bbc
2019-09-04 19:38:23 -07:00
Fabian Kozynski
1ac62e687a Merge "Use UnlockMethodCache#canSkipBouncer in user switcher" into qt-dev
am: 57e8d83cab

Change-Id: I3b66cd3a9ef8790f7239951f74fd8143ed37c61b
2019-09-04 19:30:33 -07:00
Fabian Kozynski
3963e204bb Merge "Use UnlockMethodCache#canSkipBouncer in user switcher" into qt-dev
am: 57e8d83cab

Change-Id: I961586609af7d995b30b0a7bb61a7785a281a41e
2019-09-04 19:30:30 -07:00
TreeHugger Robot
57e8d83cab Merge "Use UnlockMethodCache#canSkipBouncer in user switcher" into qt-dev 2019-09-05 02:17:20 +00:00
Android Build Merger (Role)
ae7d884c09 Merge "Merge "fixes a security vulnerability in slice provider" into qt-dev am: bc59740fe4 am: e3f595c0a4" into qt-r1-dev-plus-aosp 2019-09-04 23:52:48 +00:00
Pinyao Ting
511160a95f Merge "fixes a security vulnerability in slice provider" into qt-dev am: bc59740fe4
am: 023af61a7b

Change-Id: Ieaa0a16857b87ff99f9661e1d2c3583d36198409
2019-09-04 16:51:16 -07:00