OSDN Git Service

android-x86/frameworks-base.git
5 years agoMerge "WifiSsid: Catch String out of bound exception" into qt-dev
Roshan Pius [Wed, 24 Apr 2019 22:28:32 +0000 (15:28 -0700)]
Merge "WifiSsid: Catch String out of bound exception" into qt-dev
am: 4ec8b460c2

Change-Id: I06adbd18505eb8848802eb1d340971f80d641419

5 years agoMerge "Add dumpable to QSTile. Dump QSTileHost, QSPanel, QuickQSPanel" into qt-dev
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

5 years agoMerge "Fix bug with blinking caption tooltip on rocker click. Also clean up some...
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

5 years agoMerge "Update caption toggle icon with GM2 icons used elsewhere in the system." into...
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

5 years agoMerge "Update process mountpoints when it's storage permissions changes." into qt-dev
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

5 years agoMerge "AudioAttributes: fix regression with setLegacyStreamType in Builder" into...
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

5 years agoMerge "Update the stack bounds for IME changes even if we're expanded." into qt-dev
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

5 years agoMerge "Notify FSC about app ops in main thread" into qt-dev
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

5 years agoMerge "Call PermissionControllerService on workerthread" into qt-dev
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

5 years agoMerge "Don't apply rounded-corner animation on non-default display" into qt-dev
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

5 years ago[automerger skipped] Merge "Delete unused timeout constant." into qt-dev
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

5 years agoMerge "Fix broken test case 'testOverlayInfoStateTransitions'" into qt-dev
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

5 years ago[automerger skipped] Merge "Backwards-incompatible resolv module API change for makin...
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

5 years agoMerge "WifiSsid: Catch String out of bound exception" into qt-dev
TreeHugger Robot [Wed, 24 Apr 2019 18:18:47 +0000 (18:18 +0000)]
Merge "WifiSsid: Catch String out of bound exception" into qt-dev

5 years agoMerge "Add dumpable to QSTile. Dump QSTileHost, QSPanel, QuickQSPanel" into qt-dev
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

5 years agoMerge "Fix bug with blinking caption tooltip on rocker click. Also clean up some...
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

5 years agoMerge "Update caption toggle icon with GM2 icons used elsewhere in the system." into...
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

5 years ago[automerger skipped] Merge "Add 5G evolution icon" am: 8442966df9
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

5 years agoMerge "Update process mountpoints when it's storage permissions changes." into qt-dev
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

5 years agoMerge "AudioAttributes: fix regression with setLegacyStreamType in Builder" into...
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

5 years agoMerge "Add 5G evolution icon"
SongFerng Wang [Wed, 24 Apr 2019 16:54:21 +0000 (09:54 -0700)]
Merge "Add 5G evolution icon"
am: 8442966df9

Change-Id: I9f8d0a708ab5f958c6ceb0ce67cd812298db415b

5 years agoMerge "Make the network stack a persistent process." am: d0e7befaaf
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

5 years agoMerge "Add 5G evolution icon"
SongFerng Wang [Wed, 24 Apr 2019 16:41:14 +0000 (16:41 +0000)]
Merge "Add 5G evolution icon"

5 years agoMerge "Make the network stack a persistent process."
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

5 years agoMerge "Update the stack bounds for IME changes even if we're expanded." into qt-dev
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

5 years agoMerge "Make the network stack a persistent process."
Treehugger Robot [Wed, 24 Apr 2019 16:25:24 +0000 (16:25 +0000)]
Merge "Make the network stack a persistent process."

5 years ago[automerger skipped] Backwards-incompatible resolv module API change for making setRe...
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

5 years agoMerge "Remove Settings constants for NetworkStack" into qt-dev
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

5 years agoMerge "Notify FSC about app ops in main thread" into qt-dev
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

5 years agoMerge "Call PermissionControllerService on workerthread" 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

5 years agoAudioAttributes: fix regression with setLegacyStreamType in Builder
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

5 years agoAdd 5G evolution icon
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

5 years agoMerge "Don't apply rounded-corner animation on non-default display" into qt-dev
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

5 years agoMerge "Remove unused methods from INetworkManagementService" am: 5d2c5d5dc2
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

5 years agoMerge "Remove unused methods from INetworkManagementService"
Rubin Xu [Wed, 24 Apr 2019 14:43:27 +0000 (07:43 -0700)]
Merge "Remove unused methods from INetworkManagementService"
am: 5d2c5d5dc2

Change-Id: Ie37c9c751830d209d40772bd2d410a9c550236cd

5 years agoMerge "Delete unused timeout constant." into qt-dev
Lorenzo Colitti [Wed, 24 Apr 2019 14:30:05 +0000 (14:30 +0000)]
Merge "Delete unused timeout constant." into qt-dev

5 years agoMerge "Remove unused methods from INetworkManagementService"
Treehugger Robot [Wed, 24 Apr 2019 14:29:39 +0000 (14:29 +0000)]
Merge "Remove unused methods from INetworkManagementService"

5 years agoFix bug with blinking caption tooltip on rocker click. Also clean up
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

5 years agoMerge "Make Watchdog request timeout flag configurable" into qt-dev
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

5 years agoMake the network stack a persistent process.
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

5 years agoNotify FSC about app ops in main thread
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

5 years agoMerge "Fix broken test case 'testOverlayInfoStateTransitions'" into qt-dev
TreeHugger Robot [Wed, 24 Apr 2019 13:21:34 +0000 (13:21 +0000)]
Merge "Fix broken test case 'testOverlayInfoStateTransitions'" into qt-dev

5 years agoMerge "Merge "Add test for rollback of same version apk." into qt-dev am: ceba00a7de...
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

5 years agoMerge "Add test for rollback of same version apk." into qt-dev
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

5 years agoMerge "Switch to HexEncoding from ByteStringUtils" am: 6badf7c7da
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

5 years agoMerge "Switch to HexEncoding from ByteStringUtils"
Neil Fuller [Wed, 24 Apr 2019 13:08:15 +0000 (06:08 -0700)]
Merge "Switch to HexEncoding from ByteStringUtils"
am: 6badf7c7da

Change-Id: I0af52cb2289e1df89ac65fa01334d4e9de69e010

5 years agoMerge "Backwards-incompatible resolv module API change for making setResolverConfigur...
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

5 years agoMerge "Change the test mapping configuration of GTS modules by using "imports.""...
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

5 years agoMerge "Switch to HexEncoding from ByteStringUtils"
Neil Fuller [Wed, 24 Apr 2019 12:57:25 +0000 (12:57 +0000)]
Merge "Switch to HexEncoding from ByteStringUtils"

5 years agoMerge "Fix idmap scan to apply odm and oem policies" into qt-dev
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

5 years agoDelete unused timeout constant.
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)

5 years agoMerge "Add support for /oem/overlay" into qt-dev
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

5 years agoMerge changes I84461d40,Ib3ab9105 into qt-dev
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

5 years ago[automerger skipped] Add a timeout for the DNS probe.
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

5 years agoMerge "Remove Settings constants for NetworkStack" into qt-dev
TreeHugger Robot [Wed, 24 Apr 2019 11:46:25 +0000 (11:46 +0000)]
Merge "Remove Settings constants for NetworkStack" into qt-dev

5 years agoDon't apply rounded-corner animation on non-default display
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

5 years agoMerge "Make Watchdog request timeout flag configurable" into qt-dev
Shafik Nassar [Wed, 24 Apr 2019 10:39:39 +0000 (10:39 +0000)]
Merge "Make Watchdog request timeout flag configurable" into qt-dev

5 years agoMerge "Add test for rollback of same version apk." 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

5 years agoMerge "Delete unused timeout constant." am: 1439bbb6d5
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

5 years agoMerge "Reinstate new VPN uid filtering unit tests" am: 554a15d5ea
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

5 years agoMerge "Delete unused timeout constant."
Lorenzo Colitti [Wed, 24 Apr 2019 09:57:48 +0000 (02:57 -0700)]
Merge "Delete unused timeout constant."
am: 1439bbb6d5

Change-Id: I341540745196f1d23fb95263a8948561cdfa4c8e

5 years agoMerge "Reinstate new VPN uid filtering unit tests"
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

5 years agoMerge "Delete unused timeout constant."
Treehugger Robot [Wed, 24 Apr 2019 09:44:14 +0000 (09:44 +0000)]
Merge "Delete unused timeout constant."

5 years agoMerge "Reinstate new VPN uid filtering unit tests"
Treehugger Robot [Wed, 24 Apr 2019 09:37:49 +0000 (09:37 +0000)]
Merge "Reinstate new VPN uid filtering unit tests"

5 years agoMerge "Change the test mapping configuration of GTS modules by using "imports.""...
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

5 years agoFix broken test case 'testOverlayInfoStateTransitions'
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

5 years agoMerge "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 "Fix idmap scan to apply odm and oem policies" into qt-dev

5 years agoMerge "Add support for /oem/overlay" 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

5 years agoMerge changes I84461d40,Ib3ab9105 into qt-dev
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.

5 years agoDelete unused timeout constant.
Lorenzo Colitti [Wed, 24 Apr 2019 08:09:08 +0000 (17:09 +0900)]
Delete unused timeout constant.

Test: m
Bug: 129312219
Change-Id: I5b4c8b42dea515f674ff10d64d0e1d06d849cca1

5 years agoMerge "Disable flaky tests" into qt-dev
John Reck [Wed, 24 Apr 2019 07:22:45 +0000 (00:22 -0700)]
Merge "Disable flaky tests" into qt-dev
am: 30a25acb83

Change-Id: I9d5c0e7cdc03d1298fa23d70d8210faddaf54ab6

5 years agoMerge "Disable flaky tests" into qt-dev
TreeHugger Robot [Wed, 24 Apr 2019 06:58:00 +0000 (06:58 +0000)]
Merge "Disable flaky tests" into qt-dev

5 years agoMerge "Merge "Run performInitialGrantsIfNecessaryAsync() on main thread." into qt...
Android Build Merger (Role) [Wed, 24 Apr 2019 06:45:44 +0000 (06:45 +0000)]
Merge "Merge "Run performInitialGrantsIfNecessaryAsync() on main thread." into qt-dev am: eb90b66cb5" into qt-dev-plus-aosp

5 years agoMerge "Run performInitialGrantsIfNecessaryAsync() on main thread." into qt-dev
Hai Zhang [Wed, 24 Apr 2019 06:45:05 +0000 (23:45 -0700)]
Merge "Run performInitialGrantsIfNecessaryAsync() on main thread." into qt-dev
am: eb90b66cb5

Change-Id: I729f70641a3143a31967bf8e5c425299a5608df2

5 years agoMerge "Create new RcsMessageQueryResultParcelable" am: 6af6e3a4f6
Leland Miller [Wed, 24 Apr 2019 06:42:12 +0000 (23:42 -0700)]
Merge "Create new RcsMessageQueryResultParcelable" am: 6af6e3a4f6
am: 728f0e4927

Change-Id: I0ef4197635fac2c6d78b423e120cd8b9580c52ff

5 years agoMerge "Create new RcsMessageQueryResultParcelable"
Leland Miller [Wed, 24 Apr 2019 06:30:26 +0000 (23:30 -0700)]
Merge "Create new RcsMessageQueryResultParcelable"
am: 6af6e3a4f6

Change-Id: Id86442efa84f9c2ed49dc362f4a17466851dacfe

5 years agoMerge "Race condition while injecting ACTION_OUTSIDE" into qt-dev
Jackal Guo [Wed, 24 Apr 2019 06:25:13 +0000 (23:25 -0700)]
Merge "Race condition while injecting ACTION_OUTSIDE" into qt-dev
am: efc894eeec

Change-Id: I92160ccd59f7fa250a1d747eddb6a2e12f1c5be3

5 years agoMerge "Create new RcsMessageQueryResultParcelable"
Treehugger Robot [Wed, 24 Apr 2019 06:12:47 +0000 (06:12 +0000)]
Merge "Create new RcsMessageQueryResultParcelable"

5 years agoMerge "Add overlay tag for default dns servers." into qt-dev
Xiao Ma [Wed, 24 Apr 2019 06:00:19 +0000 (23:00 -0700)]
Merge "Add overlay tag for default dns servers." into qt-dev
am: fdc8356a6f

Change-Id: I09fe5c1990cb5b1bfb7bd49a9e8fb874aee6085f

5 years agoMerge "Run performInitialGrantsIfNecessaryAsync() on main thread." into qt-dev
TreeHugger Robot [Wed, 24 Apr 2019 05:57:24 +0000 (05:57 +0000)]
Merge "Run performInitialGrantsIfNecessaryAsync() on main thread." into qt-dev

5 years agoAllow overlaying the DNS probe timeout.
Lorenzo Colitti [Wed, 24 Apr 2019 05:43:50 +0000 (14:43 +0900)]
Allow overlaying the DNS probe timeout.

Test: m
Bug: 129312219
Change-Id: I84461d40e4d2e63ce8c111c047cbc085cb49443e

5 years agoMerge "Race condition while injecting ACTION_OUTSIDE" into qt-dev
Jackal Guo [Wed, 24 Apr 2019 05:47:11 +0000 (05:47 +0000)]
Merge "Race condition while injecting ACTION_OUTSIDE" into qt-dev

5 years agoAdd a timeout for the DNS probe.
Lorenzo Colitti [Tue, 23 Apr 2019 16:57:47 +0000 (09:57 -0700)]
Add a timeout for the DNS probe.

Bug: 129312219
Test: atest NetworkStackTests
Test: atest --generate-new-metrics 50 NetworkStackTests:com.android.server.connectivity.NetworkMonitorTest
Change-Id: Ib3ab9105d7ae39f551b51e8d5a04b9ec5e549655
Merged-In: Ib3ab9105d7ae39f551b51e8d5a04b9ec5e549655
(cherry picked from commit c7204f689dc58c3ac84818cb1f8fb9add307d90c)

5 years agoMerge "Post a notification when ACQUIRED_RECALIBRATE is received" into qt-dev
Kevin Chyn [Wed, 24 Apr 2019 05:36:20 +0000 (22:36 -0700)]
Merge "Post a notification when ACQUIRED_RECALIBRATE is received" into qt-dev
am: 895664662b

Change-Id: I5028210278c1238591ec5b9e842fd7b2a0b73868

5 years agoMerge "DngCreator: Assume square pixel centered at (x+0.5, y+0.5)" into qt-dev
Shuzhen Wang [Wed, 24 Apr 2019 05:11:37 +0000 (22:11 -0700)]
Merge "DngCreator: Assume square pixel centered at (x+0.5, y+0.5)" into qt-dev
am: 5f01dcc5f3

Change-Id: I8ba569669290b4d964a38823652bb3cadb0518e4

5 years agoMerge "Add overlay tag for default dns servers." into qt-dev
TreeHugger Robot [Wed, 24 Apr 2019 05:07:30 +0000 (05:07 +0000)]
Merge "Add overlay tag for default dns servers." into qt-dev

5 years agoMerge "Post a notification when ACQUIRED_RECALIBRATE is received" into qt-dev
Kevin Chyn [Wed, 24 Apr 2019 04:56:10 +0000 (04:56 +0000)]
Merge "Post a notification when ACQUIRED_RECALIBRATE is received" into qt-dev

5 years agoMerge "Address API council feedback" into qt-dev
Svet Ganov [Wed, 24 Apr 2019 04:51:03 +0000 (21:51 -0700)]
Merge "Address API council feedback" into qt-dev
am: f8c904958b

Change-Id: I64b2ee4e8e688743ca5c515328408998405aa0ba

5 years agoMerge "DngCreator: Assume square pixel centered at (x+0.5, y+0.5)" into qt-dev
TreeHugger Robot [Wed, 24 Apr 2019 04:50:43 +0000 (04:50 +0000)]
Merge "DngCreator: Assume square pixel centered at (x+0.5, y+0.5)" into qt-dev

5 years agoMerge "Address API council feedback" into qt-dev
TreeHugger Robot [Wed, 24 Apr 2019 04:29:32 +0000 (04:29 +0000)]
Merge "Address API council feedback" into qt-dev

5 years agoMerge "Merge "Move HUN car notifications into SystemUI" into qt-dev am: 949266a388...
Android Build Merger (Role) [Wed, 24 Apr 2019 04:28:29 +0000 (04:28 +0000)]
Merge "Merge "Move HUN car notifications into SystemUI" into qt-dev am: 949266a388" into qt-dev-plus-aosp

5 years agoMerge "Move HUN car notifications into SystemUI" into qt-dev
Brad Stenning [Wed, 24 Apr 2019 04:27:48 +0000 (21:27 -0700)]
Merge "Move HUN car notifications into SystemUI" into qt-dev
am: 949266a388

Change-Id: Id0ff2d9a137f791642675a3a02e7b87d0069e820

5 years agoMerge "Move NattKeepalivePacketData out of the framework" am: 833edcbb1b
Aaron Huang [Wed, 24 Apr 2019 04:26:03 +0000 (21:26 -0700)]
Merge "Move NattKeepalivePacketData out of the framework" am: 833edcbb1b
am: cab3f447ae

Change-Id: Idf7c25b6b553d8c0cc4ef2ea8193438480420fb4

5 years agoMerge "Move NattKeepalivePacketData out of the framework"
Aaron Huang [Wed, 24 Apr 2019 04:17:26 +0000 (21:17 -0700)]
Merge "Move NattKeepalivePacketData out of the framework"
am: 833edcbb1b

Change-Id: I3c291d378ed3dc54199708fdc188a908ccb3ee08

5 years agoMerge "Fix performance regression by fixing keys used in Typeface.Builder" into qt-dev
Seigo Nonaka [Wed, 24 Apr 2019 04:16:08 +0000 (21:16 -0700)]
Merge "Fix performance regression by fixing keys used in Typeface.Builder" into qt-dev
am: 5f873a09a0

Change-Id: I1995dee390d20f18d223addaa6232765dfded8a5

5 years agoMerge "Move NattKeepalivePacketData out of the framework"
Aaron Huang [Wed, 24 Apr 2019 04:00:56 +0000 (04:00 +0000)]
Merge "Move NattKeepalivePacketData out of the framework"

5 years agoMerge "Move HUN car notifications into SystemUI" into qt-dev
TreeHugger Robot [Wed, 24 Apr 2019 03:49:16 +0000 (03:49 +0000)]
Merge "Move HUN car notifications into SystemUI" into qt-dev

5 years agoMerge "Fix performance regression by fixing keys used in Typeface.Builder" into qt-dev
TreeHugger Robot [Wed, 24 Apr 2019 03:35:15 +0000 (03:35 +0000)]
Merge "Fix performance regression by fixing keys used in Typeface.Builder" into qt-dev

5 years agoAdd overlay tag for default dns servers.
Xiao Ma [Wed, 24 Apr 2019 02:28:10 +0000 (11:28 +0900)]
Add overlay tag for default dns servers.

Bug: 130324939
Test: m && flashall && verified dns servers resource has been changed.
Change-Id: Ic897d066567e7c826a18959e1dcc1260f82b4013

5 years agoMerge "Check and configure pixel format when locking canvas" into qt-dev
Emilian Peev [Wed, 24 Apr 2019 02:50:00 +0000 (19:50 -0700)]
Merge "Check and configure pixel format when locking canvas" into qt-dev
am: f8d04b2d2f

Change-Id: I5a99fd6443d6c5dbd85b65a14297cc83a8bce34e