Xin Li
f56a529627
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
...
am: 0172a23b1a
2019-07-02 10:02:36 -07:00
Xin Li
0172a23b1a
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into
...
stage-aosp-master
Bug: 134405016
Change-Id: I0d1fc0e5f5f7fbd56d9f1032b806bfe82a5dd08b
2019-07-02 04:47:18 +00:00
Maciej Żenczykowski
2db791f6b1
Merge "Fix mobile data usage didn't get increased for xlat464 traffic" am: e284b30c81
...
am: e74fb60c29
2019-07-01 21:31:42 -07:00
Maciej Żenczykowski
e74fb60c29
Merge "Fix mobile data usage didn't get increased for xlat464 traffic"
...
am: e284b30c81
2019-07-01 21:03:06 -07:00
Maciej Żenczykowski
e284b30c81
Merge "Fix mobile data usage didn't get increased for xlat464 traffic"
2019-07-02 03:46:29 +00:00
Nazanin Bakhshi
b3a7b953bc
[automerger skipped] Merge "Add device identifier permission checks to TelephonyPermissions" am: 1ca89a995b
...
am: 43f45f94d06d20d75e9e
2019-07-01 18:16:20 -07:00
Nazanin Bakhshi
d961980369
[automerger skipped] Merge "Store subscriber ID / IMSI into telephony database" am: cf5e620a19
...
am: 98969328f2a120f95d26
2019-07-01 18:15:53 -07:00
Nazanin Bakhshi
43f45f94d0
Merge "Add device identifier permission checks to TelephonyPermissions"
...
am: 1ca89a995b
2019-07-01 17:36:49 -07:00
Nazanin Bakhshi
98969328f2
Merge "Store subscriber ID / IMSI into telephony database"
...
am: cf5e620a19
2019-07-01 17:36:32 -07:00
Nazanin Bakhshi
1ca89a995b
Merge "Add device identifier permission checks to TelephonyPermissions"
2019-07-01 23:26:18 +00:00
Nazanin Bakhshi
cf5e620a19
Merge "Store subscriber ID / IMSI into telephony database"
2019-07-01 23:26:18 +00:00
junyulai
669ef46c58
Fix mobile data usage didn't get increased for xlat464 traffic
...
Interface stats on stacked interfaces is usually clatd. For
xt_qtaguid supported device, the stats is already accounted
against its final egress interface by the kernel.
Framework side does not need to handle stats on statcked
interface at all.
However, on devices that support BPF offload, xlat464
packets are seen by the iptables rules as arriving on stack
interface only. Thus, add stack interface into accounting is
needed.
Bug: 136193260
Test: 1. atest FrameworksNetTests
2. atest android.app.usage.cts.NetworkUsageStatsTest
3. manual test on ipv6-only wifi network
Change-Id: I8ebbefbe4df00e40f4896a17fa52c8438d41286e
2019-07-01 14:17:47 -07:00
Ned Burns
09f16abd76
Merge "Delay possible re-entrant call to updateNotificationViews()" into qt-dev
...
am: bce828f157
2019-07-01 14:10:59 -07:00
TreeHugger Robot
bce828f157
Merge "Delay possible re-entrant call to updateNotificationViews()" into qt-dev
2019-07-01 20:53:27 +00:00
Chavi Weingarten
ed912b8737
Merge "Call syncInputWindows after calling transferTouchFocus" into qt-dev
...
am: 7efce5e143
2019-07-01 12:03:10 -07:00
Chavi Weingarten
7efce5e143
Merge "Call syncInputWindows after calling transferTouchFocus" into qt-dev
2019-07-01 18:20:53 +00:00
Michael Groover
94672cea7c
Add device identifier permission checks to TelephonyPermissions
...
Bug: 131916175
Fixes: 136305129
Test: atest PhoneSubInfoControllerTest
Change-Id: Icca98347ab76b7c3468b95756a33a758a3abde37
Merged-In: I3c82c53ec89cd17b34a61166ccc9e9747388efac
2019-07-01 17:53:11 +00:00
Andreas Gampe
ddc3e06578
[automerger skipped] Merge changes Ia3ec6198,I211696c8 am: 9cbb19d0a8
...
am: dd2fa79779fb4c558f0b
2019-07-01 10:04:38 -07:00
Andreas Gampe
dd2fa79779
Merge changes Ia3ec6198,I211696c8
...
am: 9cbb19d0a8
2019-07-01 09:44:47 -07:00
Andreas Gampe
9cbb19d0a8
Merge changes Ia3ec6198,I211696c8
...
* changes:
Decouple downgrade and optimization processes.
Add new atoms to log Downgraded Apps and Low Storage
2019-07-01 16:22:25 +00:00
Felix Lopez Luis
4bf2be9528
Decouple downgrade and optimization processes.
...
Extract the logic to downgrade apps from the logic to
optimize apps. This will make easier to add more logic for downgrade
applications as required for b/112144519
Bug: 112144519
Test: This change is cover by the integration tests in
BackgroundDexOptServiceIntegrationTests/src/com/android/server/pm/BackgroundDexOptServiceIntegrationTests.java
Merged-In: Ia3ec6198bd8bac9871372ae87994ca0c596e36d7
Change-Id: Ia3ec6198bd8bac9871372ae87994ca0c596e36d7
2019-07-01 16:22:15 +00:00
Felix Lopez Luis
7ca1abd367
Add new atoms to log Downgraded Apps and Low Storage
...
Merged-In: I211696c836cb9c8a7b72e3693ecba3061ca599bf
Exempt-From-Owner-Approval: Cherry-pick
Change-Id: I211696c836cb9c8a7b72e3693ecba3061ca599bf
Bug-Id: b/120911106
Test: refactoring CL. Existing unit tests still pass.
2019-07-01 16:20:55 +00:00
Bill Yi
bca28ead67
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 5924e5eee9
2019-06-30 17:34:30 -07:00
TreeHugger Robot
5924e5eee9
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-07-01 00:01:21 +00:00
Bill Yi
72291c890b
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I2636f8a8fb5002a464776676a7b5fd21eafd6189
2019-06-30 10:55:16 -07:00
Bill Yi
ff1829fdfe
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 5de09b24e5
2019-06-29 23:28:41 -07:00
TreeHugger Robot
5de09b24e5
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-06-30 05:41:31 +00:00
Bill Yi
a7f5fbcc2c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I2bc537499432a02f6a9ad5a41a1d29efd49abc3a
2019-06-29 20:11:40 -07:00
Patrick Baumann
966e5e3ff5
Merge "Call ActivityManagerService.enterSafeMode" into qt-dev
...
am: cfa47f6183
2019-06-29 20:08:47 -07:00
TreeHugger Robot
cfa47f6183
Merge "Call ActivityManagerService.enterSafeMode" into qt-dev
2019-06-30 02:33:16 +00:00
Bill Yi
a6d9bffb63
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 5e0da71b78
2019-06-29 12:25:59 -07:00
TreeHugger Robot
5e0da71b78
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-06-29 19:02:43 +00:00
Adam He
f57a060afc
Merge "Fix delay_save and multiple required fields." into qt-dev
...
am: eea916967a
2019-06-29 11:49:42 -07:00
TreeHugger Robot
eea916967a
Merge "Fix delay_save and multiple required fields." into qt-dev
2019-06-29 18:11:01 +00:00
Adam He
0df08228be
Fix delay_save and multiple required fields.
...
Fixes: 136120151
Test: atest android.autofillservice.cts.SimpleSaveActivityTest#testDelayedSave
Change-Id: Ie0fd8ef0fbb8457fafc7cb5bed30813abaa0b893
Exempt-From-Owner-Approval: Felipe is no longer with the team
2019-06-29 17:21:45 +00:00
Bill Yi
ee6fa818a4
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Iaff0280a44b8b0facfffb478fbe771a66dd2a06d
2019-06-29 07:33:22 -07:00
Lorenzo Colitti
736194dfbf
Merge "Unit tests for new explicitlySelected behaviour." am: d1379a4a80
...
am: 10c1a704c0
2019-06-29 02:01:55 -07:00
Lorenzo Colitti
10c1a704c0
Merge "Unit tests for new explicitlySelected behaviour."
...
am: d1379a4a80
2019-06-29 01:48:36 -07:00
Lorenzo Colitti
d1379a4a80
Merge "Unit tests for new explicitlySelected behaviour."
2019-06-29 08:25:20 +00:00
Mathew Inwood
07f3dfc625
Merge "Restore some greylist entries." into qt-dev
...
am: 4c46902338
2019-06-28 23:32:29 -07:00
TreeHugger Robot
4c46902338
Merge "Restore some greylist entries." into qt-dev
2019-06-29 06:12:17 +00:00
Mehdi Alizadeh
71a1c2a2b9
Merge "Persists share targets after reading from Apps xml resource" into qt-dev
...
am: ffdf5b5639
2019-06-28 22:16:33 -07:00
Mehdi Alizadeh
ffdf5b5639
Merge "Persists share targets after reading from Apps xml resource" into qt-dev
2019-06-29 04:47:23 +00:00
Philip P. Moltmann
4f7f78cce5
Merge "Disable historical appops" into qt-dev
...
am: 16128cc7a2
2019-06-28 20:48:36 -07:00
Eugene Susla
230c3cfaab
Merge "[DO NOT MERGE] Guard against launching permission backup/restore twice per request" into qt-dev
...
am: 40c5864445
2019-06-28 20:42:04 -07:00
Eugene Susla
2f27997760
[DO NOT MERGE] Guard against launching permission backup/restore twice per request
...
am: 8c2fb0ea1e
2019-06-28 20:42:01 -07:00
TreeHugger Robot
16128cc7a2
Merge "Disable historical appops" into qt-dev
2019-06-29 03:28:31 +00:00
TreeHugger Robot
40c5864445
Merge "[DO NOT MERGE] Guard against launching permission backup/restore twice per request" into qt-dev
2019-06-29 02:56:35 +00:00
Wale Ogunwale
8aa1dd7096
Merge "Reland: Clear transitions for app windows display change." into qt-dev
...
am: bf4eee2181
2019-06-28 19:44:44 -07:00
TreeHugger Robot
bf4eee2181
Merge "Reland: Clear transitions for app windows display change." into qt-dev
2019-06-29 01:49:22 +00:00
