OSDN Git Service
Fabian Kozynski [Wed, 24 Apr 2019 22:53:12 +0000 (15:53 -0700)]
Merge "Add dumpable to QSTile. Dump QSTileHost, QSPanel, QuickQSPanel" into qt-dev am:
0d89767b9e
am:
bb94577151
Change-Id: Ib9d952194ada40db57477a801a739f6b3fef6637
Anthony Tripaldi [Wed, 24 Apr 2019 22:47:34 +0000 (15:47 -0700)]
Merge "Fix bug with blinking caption tooltip on rocker click. Also clean up some older code that flashed the dialog on screen initially and triggered dismiss too often." into qt-dev am:
e0b95fbe37
am:
9d4e80e7d0
Change-Id: I013e6cb421820e144eed516fd001b16a6b7ebaf6
Anthony Tripaldi [Wed, 24 Apr 2019 22:41:40 +0000 (15:41 -0700)]
Merge "Update caption toggle icon with GM2 icons used elsewhere in the system." into qt-dev am:
9a5f74f090
am:
c3c003d75d
Change-Id: I7aa438ac40de44f49531e84b95981f5780894316
Sudheer Shanka [Wed, 24 Apr 2019 22:33:05 +0000 (15:33 -0700)]
Merge "Update process mountpoints when it's storage permissions changes." into qt-dev am:
26e44f9c24
am:
96897dcd70
Change-Id: I8ef2898f5891aa0cd371f9e2c3e064f13c00c765
Jean-Michel Trivi [Wed, 24 Apr 2019 22:27:05 +0000 (15:27 -0700)]
Merge "AudioAttributes: fix regression with setLegacyStreamType in Builder" into qt-dev am:
22ad8a5eb9
am:
fd72d60f71
Change-Id: I20f76d7725dab1c329af50e7a58ab7f2c1d4f222
Fabian Kozynski [Wed, 24 Apr 2019 22:23:33 +0000 (15:23 -0700)]
Merge "Add dumpable to QSTile. Dump QSTileHost, QSPanel, QuickQSPanel" into qt-dev
am:
0d89767b9e
Change-Id: Ib5c4631b68e95fa795bb171fdacdc8459bc38da4
Josh Tsuji [Wed, 24 Apr 2019 22:21:21 +0000 (15:21 -0700)]
Merge "Update the stack bounds for IME changes even if we're expanded." into qt-dev am:
d86369ae3e
am:
48f372c55d
Change-Id: I39229dda2f703e4add9fffa9b6da8469e81698c0
Anthony Tripaldi [Wed, 24 Apr 2019 22:18:45 +0000 (15:18 -0700)]
Merge "Fix bug with blinking caption tooltip on rocker click. Also clean up some older code that flashed the dialog on screen initially and triggered dismiss too often." into qt-dev
am:
e0b95fbe37
Change-Id: Iffe2969f80ce4528eae0543e2a6368b82badbf49
Anthony Tripaldi [Wed, 24 Apr 2019 22:13:48 +0000 (15:13 -0700)]
Merge "Update caption toggle icon with GM2 icons used elsewhere in the system." into qt-dev
am:
9a5f74f090
Change-Id: I6d161e052f6111b5c8978878f585ad9da57e03d9
Fabian Kozynski [Wed, 24 Apr 2019 22:12:06 +0000 (15:12 -0700)]
Merge "Notify FSC about app ops in main thread" into qt-dev am:
5b5c8f67b2
am:
fbf77effb2
Change-Id: I971e62ec8e0df6d44567ccc1950c5da4dc7745e8
Sudheer Shanka [Wed, 24 Apr 2019 22:08:57 +0000 (15:08 -0700)]
Merge "Update process mountpoints when it's storage permissions changes." into qt-dev
am:
26e44f9c24
Change-Id: Ia5cd724b75b655885877cd9938b9a61e15b7968b
Philip P. Moltmann [Wed, 24 Apr 2019 22:06:23 +0000 (15:06 -0700)]
Merge "Call PermissionControllerService on workerthread" into qt-dev am:
4da5dc4df7
am:
979c3103b4
Change-Id: I5cb903306a98ccdbd770b1e80475d16e6d3da662
Jean-Michel Trivi [Wed, 24 Apr 2019 22:03:51 +0000 (15:03 -0700)]
Merge "AudioAttributes: fix regression with setLegacyStreamType in Builder" into qt-dev
am:
22ad8a5eb9
Change-Id: Iab4e141950302346f05272a6dfa06f4787eb09d8
Josh Tsuji [Wed, 24 Apr 2019 21:58:49 +0000 (14:58 -0700)]
Merge "Update the stack bounds for IME changes even if we're expanded." into qt-dev
am:
d86369ae3e
Change-Id: I3dac5279e7dd1981e7c479b3cdbd7fab0028e564
Fabian Kozynski [Wed, 24 Apr 2019 21:54:08 +0000 (14:54 -0700)]
Merge "Notify FSC about app ops in main thread" into qt-dev
am:
5b5c8f67b2
Change-Id: Ie0dfc7d8d2a5a1c3a5184673bba38b4f29847080
Philip P. Moltmann [Wed, 24 Apr 2019 21:49:03 +0000 (14:49 -0700)]
Merge "Call PermissionControllerService on workerthread" into qt-dev
am:
4da5dc4df7
Change-Id: I1823a57f447168a8b593d4576bef288c0a007523
Tiger Huang [Wed, 24 Apr 2019 21:36:18 +0000 (14:36 -0700)]
Merge "Don't apply rounded-corner animation on non-default display" into qt-dev am:
97af1b385e
am:
3b66b09293
Change-Id: I18fa71b44e1c45841635f4da7e88b690726a8579
Yiwen Chen [Wed, 24 Apr 2019 21:33:05 +0000 (21:33 +0000)]
Merge "Check if ramping ringer is enabled for vibrator service."
Tiger Huang [Wed, 24 Apr 2019 21:24:03 +0000 (14:24 -0700)]
Merge "Don't apply rounded-corner animation on non-default display" into qt-dev
am:
97af1b385e
Change-Id: Ia59cff5885fda044bc945713a19645193b8d906d
Lorenzo Colitti [Wed, 24 Apr 2019 21:16:57 +0000 (14:16 -0700)]
[automerger skipped] Merge "Delete unused timeout constant." into qt-dev am:
f2e3c4f47d -s ours
am:
14b3723245 -s ours
am skip reason: change_id I5b4c8b42dea515f674ff10d64d0e1d06d849cca1 with SHA1
11aaadd6ae is in history
Change-Id: Iad97592f2ed87dc9f9beb92bd2cac66a57da77c7
Lorenzo Colitti [Wed, 24 Apr 2019 21:00:40 +0000 (14:00 -0700)]
[automerger skipped] Merge "Delete unused timeout constant." into qt-dev
am:
f2e3c4f47d -s ours
am skip reason: change_id I5b4c8b42dea515f674ff10d64d0e1d06d849cca1 with SHA1
11aaadd6ae is in history
Change-Id: I24134cdcd55373921b2811c9d4dfc5c4892f4ccb
Mårten Kongstad [Wed, 24 Apr 2019 20:51:04 +0000 (13:51 -0700)]
Merge "Fix broken test case 'testOverlayInfoStateTransitions'" into qt-dev am:
22f79f250c
am:
802013d73b
Change-Id: Ibb18193b515cc989d2e774867da706165b29835a
Mårten Kongstad [Wed, 24 Apr 2019 20:37:07 +0000 (13:37 -0700)]
Merge "Fix broken test case 'testOverlayInfoStateTransitions'" into qt-dev
am:
22f79f250c
Change-Id: Id44dbec56c7355a3e67a95d452606c11da247546
Wayne Ma [Wed, 24 Apr 2019 20:31:59 +0000 (13:31 -0700)]
[automerger skipped] Merge "Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable." into qt-dev am:
e9635d80f1 -s ours
am:
7866c679c8 -s ours
am skip reason: change_id I6dc9029af0df0d3b391210bd315516bdf1b5e4c9 with SHA1
23752d475a is in history
Change-Id: Id15d4dc0e60c8506cd9b7b7a4f91d0d5348dd896
Wayne Ma [Wed, 24 Apr 2019 20:14:17 +0000 (13:14 -0700)]
[automerger skipped] Merge "Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable." into qt-dev
am:
e9635d80f1 -s ours
am skip reason: change_id I6dc9029af0df0d3b391210bd315516bdf1b5e4c9 with SHA1
23752d475a is in history
Change-Id: Ie9bfef68a5c78272d4c7b31e9427ba2f5c57d056
Yiwen Chen [Wed, 17 Apr 2019 18:39:14 +0000 (11:39 -0700)]
Check if ramping ringer is enabled for vibrator service.
Bug:
130366100
Test: Tested on device
Change-Id: I413814ff643df9c44ae436a39379a6ac89e78575
TreeHugger Robot [Wed, 24 Apr 2019 19:32:03 +0000 (19:32 +0000)]
Merge "incidentd: Move logging statement so it's used"
Fabian Kozynski [Wed, 24 Apr 2019 18:05:15 +0000 (18:05 +0000)]
Merge "Add dumpable to QSTile. Dump QSTileHost, QSPanel, QuickQSPanel" into qt-dev
Anthony Tripaldi [Wed, 24 Apr 2019 17:30:13 +0000 (17:30 +0000)]
Merge "Fix bug with blinking caption tooltip on rocker click. Also clean up some older code that flashed the dialog on screen initially and triggered dismiss too often." into qt-dev
TreeHugger Robot [Wed, 24 Apr 2019 17:27:34 +0000 (17:27 +0000)]
Merge "Update caption toggle icon with GM2 icons used elsewhere in the system." into qt-dev
SongFerng Wang [Wed, 24 Apr 2019 17:20:07 +0000 (10:20 -0700)]
[automerger skipped] Merge "Add 5G evolution icon" am:
8442966df9 am:
a788bd9308 -s ours
am:
0db8585736 -s ours
am skip reason: change_id Ife0401219138c7ed22e7bfbd4d5e8648c54a98a8 with SHA1
3cbcf75c4a is in history
Change-Id: I250595882a35a0d61af6e124c1f097b07aecd18e
Lorenzo Colitti [Wed, 24 Apr 2019 17:09:51 +0000 (10:09 -0700)]
Merge "Make the network stack a persistent process." am:
d0e7befaaf am:
ef68d77b4b
am:
c1eedfcd12
Change-Id: I3e1093fc50c8cbd41e82848c86208aeb6c4a1c04
SongFerng Wang [Wed, 24 Apr 2019 17:08:44 +0000 (10:08 -0700)]
[automerger skipped] Merge "Add 5G evolution icon" am:
8442966df9
am:
a788bd9308 -s ours
am skip reason: change_id Ife0401219138c7ed22e7bfbd4d5e8648c54a98a8 with SHA1
3cbcf75c4a is in history
Change-Id: If1a627d7edf8e2a69bd7ba95da4fa674e11cefb3
Sudheer Shanka [Wed, 24 Apr 2019 16:59:43 +0000 (16:59 +0000)]
Merge "Update process mountpoints when it's storage permissions changes." into qt-dev
Jean-Michel Trivi [Wed, 24 Apr 2019 16:54:32 +0000 (16:54 +0000)]
Merge "AudioAttributes: fix regression with setLegacyStreamType in Builder" into qt-dev
SongFerng Wang [Wed, 24 Apr 2019 16:54:21 +0000 (09:54 -0700)]
Merge "Add 5G evolution icon"
am:
8442966df9
Change-Id: I9f8d0a708ab5f958c6ceb0ce67cd812298db415b
Lorenzo Colitti [Wed, 24 Apr 2019 16:51:09 +0000 (09:51 -0700)]
Merge "Make the network stack a persistent process." am:
d0e7befaaf
am:
ef68d77b4b
Change-Id: I55261fc6a5937f38ba038ac567f2f2419e40f9e8
SongFerng Wang [Wed, 24 Apr 2019 16:41:14 +0000 (16:41 +0000)]
Merge "Add 5G evolution icon"
Wayne Ma [Wed, 24 Apr 2019 16:39:22 +0000 (09:39 -0700)]
[automerger skipped] Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable. am:
28417f4982 -s ours
am:
db25f187dc -s ours
am skip reason: change_id I6dc9029af0df0d3b391210bd315516bdf1b5e4c9 with SHA1
23752d475a is in history
Change-Id: Ie9270d639d3faad1efd58fb8190365ca6a128882
Lorenzo Colitti [Wed, 24 Apr 2019 16:37:50 +0000 (09:37 -0700)]
Merge "Make the network stack a persistent process."
am:
d0e7befaaf
Change-Id: I7de9d01aa2ee0d71f7c862e530d86b4a136013a6
Josh Tsuji [Wed, 24 Apr 2019 16:34:20 +0000 (16:34 +0000)]
Merge "Update the stack bounds for IME changes even if we're expanded." into qt-dev
Treehugger Robot [Wed, 24 Apr 2019 16:25:24 +0000 (16:25 +0000)]
Merge "Make the network stack a persistent process."
Chiachang Wang [Wed, 24 Apr 2019 16:24:19 +0000 (09:24 -0700)]
Merge "Remove Settings constants for NetworkStack" into qt-dev am:
c84e33b3f1
am:
3429aac7ab
Change-Id: Ic48bea07e79490dd3787068bc88c748525752a61
Wayne Ma [Wed, 24 Apr 2019 16:21:29 +0000 (09:21 -0700)]
[automerger skipped] Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable.
am:
28417f4982 -s ours
am skip reason: change_id I6dc9029af0df0d3b391210bd315516bdf1b5e4c9 with SHA1
23752d475a is in history
Change-Id: Ic26258dd1ef7a0f3c7c802d764f83a272c3d519f
Chiachang Wang [Wed, 24 Apr 2019 16:15:30 +0000 (09:15 -0700)]
Merge "Remove Settings constants for NetworkStack" into qt-dev
am:
c84e33b3f1
Change-Id: I7291cfa86cd6e907df35e8fbc97e2e9a77e56cab
Fabian Kozynski [Wed, 24 Apr 2019 16:01:10 +0000 (16:01 +0000)]
Merge "Notify FSC about app ops in main thread" into qt-dev
Philip P. Moltmann [Wed, 24 Apr 2019 15:28:25 +0000 (15:28 +0000)]
Merge "Call PermissionControllerService on workerthread" into qt-dev
Jean-Michel Trivi [Tue, 23 Apr 2019 23:49:50 +0000 (16:49 -0700)]
AudioAttributes: fix regression with setLegacyStreamType in Builder
A regression was introduced by commit @
6d69bde which caused a new
Builder instance to be created when using setLegacyStreamType(),
instead of returning the current one.
Bug:
130274354
Test: atest android.media.cts.AudioAttributesTest#testSetLegacyStreamOnBuilder
Change-Id: Ib66a0beb5f0f4489a6003cb9be6b8313b3318eac
Rubin Xu [Wed, 24 Apr 2019 15:05:38 +0000 (08:05 -0700)]
Merge "Remove unused methods from INetworkManagementService" am:
5d2c5d5dc2 am:
39c2091c88
am:
a430eda4dd
Change-Id: I15a3c4e55b4be434cb485e83c39cde5748efc59c
SongFerngWang [Thu, 21 Mar 2019 15:14:20 +0000 (23:14 +0800)]
Add 5G evolution icon
This add the 5GE icon to the system UI for specific carriers
LTE CA network.
Bug:
124768697
Test: build & manually test:
fake the operator name with pattern, and check the status bar data icon.
Change-Id: Ife0401219138c7ed22e7bfbd4d5e8648c54a98a8
Merged-In: Ife0401219138c7ed22e7bfbd4d5e8648c54a98a8
Tiger Huang [Wed, 24 Apr 2019 14:59:09 +0000 (14:59 +0000)]
Merge "Don't apply rounded-corner animation on non-default display" into qt-dev
Rubin Xu [Wed, 24 Apr 2019 14:54:34 +0000 (07:54 -0700)]
Merge "Remove unused methods from INetworkManagementService" am:
5d2c5d5dc2
am:
39c2091c88
Change-Id: I7acbbd36f41bef1356a158bed075c7be330728f4
Rubin Xu [Wed, 24 Apr 2019 14:43:27 +0000 (07:43 -0700)]
Merge "Remove unused methods from INetworkManagementService"
am:
5d2c5d5dc2
Change-Id: Ie37c9c751830d209d40772bd2d410a9c550236cd
Lorenzo Colitti [Wed, 24 Apr 2019 14:30:05 +0000 (14:30 +0000)]
Merge "Delete unused timeout constant." into qt-dev
Treehugger Robot [Wed, 24 Apr 2019 14:29:39 +0000 (14:29 +0000)]
Merge "Remove unused methods from INetworkManagementService"
Shafik Nassar [Wed, 24 Apr 2019 13:55:21 +0000 (06:55 -0700)]
Merge "Make Watchdog request timeout flag configurable" into qt-dev am:
62a176c140
am:
54812e81bb
Change-Id: I61ac8f10d52a4a79fbccaabfd6c0cbdf17a1cefc
Richard Uhler [Wed, 24 Apr 2019 13:43:07 +0000 (06:43 -0700)]
Merge "Merge "Add test for rollback of same version apk." into qt-dev am:
ceba00a7de" into qt-dev-plus-aosp
am:
3b4b369c70
Change-Id: I876318bc0cef09a44467ead93c20c5f4274d9aef
Anthony Tripaldi [Tue, 23 Apr 2019 21:56:56 +0000 (17:56 -0400)]
Fix bug with blinking caption tooltip on rocker click. Also clean up
some older code that flashed the dialog on screen initially and
triggered dismiss too often.
Bug:
131178834
Test: VolumeDialogImplTest still passes with atest
Change-Id: Ia8879aabe1d97fd2bb78620b962ad959bbbeaa25
Shafik Nassar [Wed, 24 Apr 2019 13:39:47 +0000 (06:39 -0700)]
Merge "Make Watchdog request timeout flag configurable" into qt-dev
am:
62a176c140
Change-Id: I932f149e106ab536816f9568b1f1c321eb86a728
Lorenzo Colitti [Wed, 24 Apr 2019 13:26:42 +0000 (22:26 +0900)]
Make the network stack a persistent process.
The network stack should never be killed, because if it does,
recovering networking requires a reboot. Make the process
persistent to reduce the chances of it being killed by the OOM
killer.
Bug:
131046856
Test: builds, boots
Test: process oom_score_adj is -800
Test: process goes from "Persistent Service" to "Persistent" in dumpsys meminfo
Change-Id: Ic8ebf6356e23489f6cd984d680ff9f1b4cbbe52d
Neil Fuller [Wed, 24 Apr 2019 13:30:56 +0000 (06:30 -0700)]
Merge "Switch to HexEncoding from ByteStringUtils" am:
6badf7c7da am:
78ccbc3bec
am:
01e95772de
Change-Id: I20c76208e86ea6954edb0e4ae36a29cd1016d365
Fabian Kozynski [Wed, 24 Apr 2019 13:25:14 +0000 (09:25 -0400)]
Notify FSC about app ops in main thread
Test: build
Bug:
131188506
Change-Id: I7c73344d65ac0322c32ad13e6f81ad52c7b629d7
TreeHugger Robot [Wed, 24 Apr 2019 13:21:34 +0000 (13:21 +0000)]
Merge "Fix broken test case 'testOverlayInfoStateTransitions'" into qt-dev
Android Build Merger (Role) [Wed, 24 Apr 2019 13:20:28 +0000 (13:20 +0000)]
Merge "Merge "Add test for rollback of same version apk." into qt-dev am:
ceba00a7de" into qt-dev-plus-aosp
Richard Uhler [Wed, 24 Apr 2019 13:20:05 +0000 (06:20 -0700)]
Merge "Add test for rollback of same version apk." into qt-dev
am:
ceba00a7de
Change-Id: I0a6334decf4439222d19cd24365a20eb538c4382
Neil Fuller [Wed, 24 Apr 2019 13:19:51 +0000 (06:19 -0700)]
Merge "Switch to HexEncoding from ByteStringUtils" am:
6badf7c7da
am:
78ccbc3bec
Change-Id: Id4ca66a608a9df9fb357d5fd5e7179dc73cc8475
Greg Kaiser [Wed, 24 Apr 2019 13:15:54 +0000 (06:15 -0700)]
incidentd: Move logging statement so it's used
We move our ALOGE() to prior to the 'return', so it gets invoked
if we get to this logic.
Test: TreeHugger
Change-Id: Ifcd73d3abe98705cb94616bedd224b4425f4e964
easoncylee [Wed, 24 Apr 2019 13:11:42 +0000 (06:11 -0700)]
Merge "Change the test mapping configuration of GTS modules by using "imports."" into qt-dev am:
c37d832194
am:
d801826073
Change-Id: I124596c91d6ca0ed2e381adfa8b90369cd9b0a8a
Neil Fuller [Wed, 24 Apr 2019 13:08:15 +0000 (06:08 -0700)]
Merge "Switch to HexEncoding from ByteStringUtils"
am:
6badf7c7da
Change-Id: I0af52cb2289e1df89ac65fa01334d4e9de69e010
Wayne Ma [Wed, 24 Apr 2019 13:05:59 +0000 (13:05 +0000)]
Merge "Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable." into qt-dev
easoncylee [Wed, 24 Apr 2019 13:00:23 +0000 (06:00 -0700)]
Merge "Change the test mapping configuration of GTS modules by using "imports."" into qt-dev
am:
c37d832194
Change-Id: I1d6e329d5001d056d0d9c73c94ac0b4ed881ee63
Ryan Mitchell [Wed, 24 Apr 2019 12:57:59 +0000 (05:57 -0700)]
Merge "Fix idmap scan to apply odm and oem policies" into qt-dev am:
35e7fa1b50
am:
2cdba65f07
Change-Id: Ic1f66749eb67668be29d38855861ae9a3d228e66
Neil Fuller [Wed, 24 Apr 2019 12:57:25 +0000 (12:57 +0000)]
Merge "Switch to HexEncoding from ByteStringUtils"
Mårten Kongstad [Wed, 24 Apr 2019 12:51:27 +0000 (05:51 -0700)]
Merge "Add support for /oem/overlay" into qt-dev am:
b0815b80e8
am:
aa37c69107
Change-Id: I0bf94462253d016d6a17f383cd92f496a36f3772
Lorenzo Colitti [Wed, 24 Apr 2019 12:40:31 +0000 (05:40 -0700)]
Merge changes I84461d40,Ib3ab9105 into qt-dev am:
3fe30fa71b
am:
b63abe5f0e
Change-Id: I55f63560154e23d5dd02ca9a80f744d18fa70794
Ryan Mitchell [Wed, 24 Apr 2019 12:39:39 +0000 (05:39 -0700)]
Merge "Fix idmap scan to apply odm and oem policies" into qt-dev
am:
35e7fa1b50
Change-Id: I5801e8d6ae255745b30ac7895a5f5ea23f45dd66
Lorenzo Colitti [Wed, 24 Apr 2019 10:10:52 +0000 (03:10 -0700)]
Delete unused timeout constant.
Test: m
Bug:
129312219
Change-Id: I5b4c8b42dea515f674ff10d64d0e1d06d849cca1
Merged-In: I5b4c8b42dea515f674ff10d64d0e1d06d849cca1
(cherry picked from commit
21c692d71783d1c14a82910feaa3965367af85a6)
Lorenzo Colitti [Wed, 24 Apr 2019 12:34:29 +0000 (05:34 -0700)]
[automerger skipped] Add a timeout for the DNS probe. am:
28c966eaa9 -s ours
am:
37673bcd68 -s ours
am skip reason: change_id Ib3ab9105d7ae39f551b51e8d5a04b9ec5e549655 with SHA1
6413419435 is in history
Change-Id: I45f5f108935d238e5a374004ba37cc1f0206bf03
Mårten Kongstad [Wed, 24 Apr 2019 12:32:03 +0000 (05:32 -0700)]
Merge "Add support for /oem/overlay" into qt-dev
am:
b0815b80e8
Change-Id: I9afd18e53cac11ad86a92888811769b5c0af1cce
Lorenzo Colitti [Wed, 24 Apr 2019 12:24:15 +0000 (05:24 -0700)]
Merge changes I84461d40,Ib3ab9105 into qt-dev
am:
3fe30fa71b
Change-Id: Ief0b029527ec71a6744ba2b6a72751e8a5b2bf98
Lorenzo Colitti [Wed, 24 Apr 2019 12:16:47 +0000 (05:16 -0700)]
[automerger skipped] Add a timeout for the DNS probe.
am:
28c966eaa9 -s ours
am skip reason: change_id Ib3ab9105d7ae39f551b51e8d5a04b9ec5e549655 with SHA1
6413419435 is in history
Change-Id: Id730bd5b05ad4bd9f891d35a47485c8f7d2a1218
TreeHugger Robot [Wed, 24 Apr 2019 11:46:25 +0000 (11:46 +0000)]
Merge "Remove Settings constants for NetworkStack" into qt-dev
Tiger Huang [Wed, 24 Apr 2019 10:39:53 +0000 (18:39 +0800)]
Don't apply rounded-corner animation on non-default display
Non-default displays usually don't have rounded-corners. It doesn't
make sense to apply rounded-corner animations on them. Besides, we
don't know if an external display has rounded-corners or not.
Bug:
131040127
Test: Follow the reproduction steps in the bug.
Change-Id: I0b892bfb50875eaa59b2bf5ba07074bb3494042b
Shafik Nassar [Wed, 24 Apr 2019 10:39:39 +0000 (10:39 +0000)]
Merge "Make Watchdog request timeout flag configurable" into qt-dev
TreeHugger Robot [Wed, 24 Apr 2019 10:24:57 +0000 (10:24 +0000)]
Merge "Add test for rollback of same version apk." into qt-dev
Lorenzo Colitti [Wed, 24 Apr 2019 10:23:54 +0000 (03:23 -0700)]
Merge "Delete unused timeout constant." am:
1439bbb6d5 am:
15b57501ab
am:
21c692d717
Change-Id: I016dad3a42268836e361d8c312a7fec6478106e9
Rubin Xu [Wed, 24 Apr 2019 10:15:38 +0000 (03:15 -0700)]
Merge "Reinstate new VPN uid filtering unit tests" am:
554a15d5ea am:
89213aa483
am:
4469b1d8a5
Change-Id: I327acdf20cb9bad61c9e4c193298edd0f2e69f2f
Lorenzo Colitti [Wed, 24 Apr 2019 10:10:52 +0000 (03:10 -0700)]
Merge "Delete unused timeout constant." am:
1439bbb6d5
am:
15b57501ab
Change-Id: I36baeaef7ecac045150ca92e72293c49829c128f
Rubin Xu [Wed, 24 Apr 2019 10:05:12 +0000 (03:05 -0700)]
Merge "Reinstate new VPN uid filtering unit tests" am:
554a15d5ea
am:
89213aa483
Change-Id: Ic2faef44831575b2d03bc00ef2553d5c549adc95
Lorenzo Colitti [Wed, 24 Apr 2019 09:57:48 +0000 (02:57 -0700)]
Merge "Delete unused timeout constant."
am:
1439bbb6d5
Change-Id: I341540745196f1d23fb95263a8948561cdfa4c8e
Rubin Xu [Wed, 24 Apr 2019 09:53:44 +0000 (02:53 -0700)]
Merge "Reinstate new VPN uid filtering unit tests"
am:
554a15d5ea
Change-Id: Ib76c2cf319377141a374b3bdcf5e6606aaf9c06b
Treehugger Robot [Wed, 24 Apr 2019 09:44:14 +0000 (09:44 +0000)]
Merge "Delete unused timeout constant."
Treehugger Robot [Wed, 24 Apr 2019 09:37:49 +0000 (09:37 +0000)]
Merge "Reinstate new VPN uid filtering unit tests"
TreeHugger Robot [Wed, 24 Apr 2019 09:36:07 +0000 (09:36 +0000)]
Merge "Change the test mapping configuration of GTS modules by using "imports."" into qt-dev
Mårten Kongstad [Wed, 10 Apr 2019 12:33:12 +0000 (14:33 +0200)]
Fix broken test case 'testOverlayInfoStateTransitions'
Commit
e0b984e8054 "Diff overlays between PackageManagerService and
OverlayManagerService" removed the OverlayInfo.STATE_TARGET_UPGRADING
state. Update the OverlayManagerServiceImplTests tests accordingly.
Bug:
130257545
Test: atest 'com.android.server.om.OverlayManagerServiceImplTests#testOverlayInfoStateTransitions'
Change-Id: I06fed8cfe4daf0206843d140ae7ab594cc89ab09
TreeHugger Robot [Wed, 24 Apr 2019 08:33:38 +0000 (08:33 +0000)]
Merge "Fix idmap scan to apply odm and oem policies" into qt-dev
TreeHugger Robot [Wed, 24 Apr 2019 08:33:38 +0000 (08:33 +0000)]
Merge "Add support for /oem/overlay" into qt-dev
John Reck [Wed, 24 Apr 2019 08:11:37 +0000 (01:11 -0700)]
Merge "Disable flaky tests" into qt-dev am:
30a25acb83
am:
64bb45ad2a
Change-Id: I4523099930a8f5a105882fb2049266b75650770f
Lorenzo Colitti [Wed, 24 Apr 2019 08:11:26 +0000 (08:11 +0000)]
Merge changes I84461d40,Ib3ab9105 into qt-dev
* changes:
Allow overlaying the DNS probe timeout.
Add a timeout for the DNS probe.
Lorenzo Colitti [Wed, 24 Apr 2019 08:09:08 +0000 (17:09 +0900)]
Delete unused timeout constant.
Test: m
Bug:
129312219
Change-Id: I5b4c8b42dea515f674ff10d64d0e1d06d849cca1
OSDN Git Service
