Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
416,195 Commits 3 Branches 0 Tags
37673bcd682d7b2b6cb9d212dec123f03a031a15
Commit Graph

416195 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
37673bcd68 [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
 2019-04-24 05:16:47 -07:00
Lorenzo Colitti
21c692d717 Merge "Delete unused timeout constant." am: 1439bbb6d5 
am: 15b57501ab

Change-Id: I36baeaef7ecac045150ca92e72293c49829c128f
 2019-04-24 03:10:52 -07:00
Rubin Xu
4469b1d8a5 Merge "Reinstate new VPN uid filtering unit tests" am: 554a15d5ea 
am: 89213aa483

Change-Id: Ic2faef44831575b2d03bc00ef2553d5c549adc95
 2019-04-24 03:05:12 -07:00
Lorenzo Colitti
15b57501ab Merge "Delete unused timeout constant." 
am: 1439bbb6d5

Change-Id: I341540745196f1d23fb95263a8948561cdfa4c8e
 2019-04-24 02:57:48 -07:00
Rubin Xu
89213aa483 Merge "Reinstate new VPN uid filtering unit tests" 
am: 554a15d5ea

Change-Id: Ib76c2cf319377141a374b3bdcf5e6606aaf9c06b
 2019-04-24 02:53:44 -07:00
Treehugger Robot
1439bbb6d5 Merge "Delete unused timeout constant." 2019-04-24 09:44:14 +00:00
Treehugger Robot
554a15d5ea Merge "Reinstate new VPN uid filtering unit tests" 2019-04-24 09:37:49 +00:00
Lorenzo Colitti
11aaadd6ae Delete unused timeout constant. 
Test: m
Bug: 129312219
Change-Id: I5b4c8b42dea515f674ff10d64d0e1d06d849cca1
 2019-04-24 17:11:12 +09:00
John Reck
64bb45ad2a Merge "Disable flaky tests" into qt-dev 
am: 30a25acb83

Change-Id: I9d5c0e7cdc03d1298fa23d70d8210faddaf54ab6
 2019-04-24 00:22:45 -07:00
TreeHugger Robot
30a25acb83 Merge "Disable flaky tests" into qt-dev 2019-04-24 06:58:00 +00:00
Android Build Merger (Role)
5605531bac Merge "Merge "Run performInitialGrantsIfNecessaryAsync() on main thread." into qt-dev am: eb90b66cb5" into qt-dev-plus-aosp 2019-04-24 06:45:44 +00:00
Hai Zhang
9075bd8b1f Merge "Run performInitialGrantsIfNecessaryAsync() on main thread." into qt-dev 
am: eb90b66cb5

Change-Id: I729f70641a3143a31967bf8e5c425299a5608df2
 2019-04-23 23:45:05 -07:00
Leland Miller
a2a20dca04 Merge "Create new RcsMessageQueryResultParcelable" am: 6af6e3a4f6 
am: 728f0e4927

Change-Id: I0ef4197635fac2c6d78b423e120cd8b9580c52ff
 2019-04-23 23:42:12 -07:00
Leland Miller
728f0e4927 Merge "Create new RcsMessageQueryResultParcelable" 
am: 6af6e3a4f6

Change-Id: Id86442efa84f9c2ed49dc362f4a17466851dacfe
 2019-04-23 23:30:26 -07:00
Jackal Guo
520ffb3f45 Merge "Race condition while injecting ACTION_OUTSIDE" into qt-dev 
am: efc894eeec

Change-Id: I92160ccd59f7fa250a1d747eddb6a2e12f1c5be3
 2019-04-23 23:25:13 -07:00
Treehugger Robot
6af6e3a4f6 Merge "Create new RcsMessageQueryResultParcelable" 2019-04-24 06:12:47 +00:00
Xiao Ma
123f7f700e Merge "Add overlay tag for default dns servers." into qt-dev 
am: fdc8356a6f

Change-Id: I09fe5c1990cb5b1bfb7bd49a9e8fb874aee6085f
 2019-04-23 23:00:19 -07:00
TreeHugger Robot
eb90b66cb5 Merge "Run performInitialGrantsIfNecessaryAsync() on main thread." into qt-dev 2019-04-24 05:57:24 +00:00
Jackal Guo
efc894eeec Merge "Race condition while injecting ACTION_OUTSIDE" into qt-dev 2019-04-24 05:47:11 +00:00
Lorenzo Colitti
28c966eaa9 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 c7204f689d)
 2019-04-24 05:41:02 +00:00
Kevin Chyn
6620fce3db Merge "Post a notification when ACQUIRED_RECALIBRATE is received" into qt-dev 
am: 895664662b

Change-Id: I5028210278c1238591ec5b9e842fd7b2a0b73868
 2019-04-23 22:36:20 -07:00
Shuzhen Wang
6e9a902720 Merge "DngCreator: Assume square pixel centered at (x+0.5, y+0.5)" into qt-dev 
am: 5f01dcc5f3

Change-Id: I8ba569669290b4d964a38823652bb3cadb0518e4
 2019-04-23 22:11:37 -07:00
TreeHugger Robot
fdc8356a6f Merge "Add overlay tag for default dns servers." into qt-dev 2019-04-24 05:07:30 +00:00
Kevin Chyn
895664662b Merge "Post a notification when ACQUIRED_RECALIBRATE is received" into qt-dev 2019-04-24 04:56:10 +00:00
Svet Ganov
e572e48b16 Merge "Address API council feedback" into qt-dev 
am: f8c904958b

Change-Id: I64b2ee4e8e688743ca5c515328408998405aa0ba
 2019-04-23 21:51:03 -07:00
TreeHugger Robot
5f01dcc5f3 Merge "DngCreator: Assume square pixel centered at (x+0.5, y+0.5)" into qt-dev 2019-04-24 04:50:43 +00:00
TreeHugger Robot
f8c904958b Merge "Address API council feedback" into qt-dev 2019-04-24 04:29:32 +00:00
Android Build Merger (Role)
2522f53a48 Merge "Merge "Move HUN car notifications into SystemUI" into qt-dev am: 949266a388" into qt-dev-plus-aosp 2019-04-24 04:28:29 +00:00
Brad Stenning
e94dbb7d04 Merge "Move HUN car notifications into SystemUI" into qt-dev 
am: 949266a388

Change-Id: Id0ff2d9a137f791642675a3a02e7b87d0069e820
 2019-04-23 21:27:48 -07:00
Aaron Huang
280a223c28 Merge "Move NattKeepalivePacketData out of the framework" am: 833edcbb1b 
am: cab3f447ae

Change-Id: Idf7c25b6b553d8c0cc4ef2ea8193438480420fb4
 2019-04-23 21:26:03 -07:00
Aaron Huang
cab3f447ae Merge "Move NattKeepalivePacketData out of the framework" 
am: 833edcbb1b

Change-Id: I3c291d378ed3dc54199708fdc188a908ccb3ee08
 2019-04-23 21:17:26 -07:00
Seigo Nonaka
995bf1e3e6 Merge "Fix performance regression by fixing keys used in Typeface.Builder" into qt-dev 
am: 5f873a09a0

Change-Id: I1995dee390d20f18d223addaa6232765dfded8a5
 2019-04-23 21:16:08 -07:00
Aaron Huang
833edcbb1b Merge "Move NattKeepalivePacketData out of the framework" 2019-04-24 04:00:56 +00:00
TreeHugger Robot
949266a388 Merge "Move HUN car notifications into SystemUI" into qt-dev 2019-04-24 03:49:16 +00:00
TreeHugger Robot
5f873a09a0 Merge "Fix performance regression by fixing keys used in Typeface.Builder" into qt-dev 2019-04-24 03:35:15 +00:00
Xiao Ma
f69bf6338d Add overlay tag for default dns servers. 
Bug: 130324939
Test: m && flashall && verified dns servers resource has been changed.
Change-Id: Ic897d066567e7c826a18959e1dcc1260f82b4013
 2019-04-24 03:29:17 +00:00
Emilian Peev
6c0d305f35 Merge "Check and configure pixel format when locking canvas" into qt-dev 
am: f8d04b2d2f

Change-Id: I5a99fd6443d6c5dbd85b65a14297cc83a8bce34e
 2019-04-23 19:50:00 -07:00
TreeHugger Robot
f8d04b2d2f Merge "Check and configure pixel format when locking canvas" into qt-dev 2019-04-24 02:28:39 +00:00
Matt Pietal
c7ad0f52cc Merge "Sharesheet - Scrolling UI adjustments" into qt-dev 
am: c35533726d

Change-Id: I7fe474e9c3311e1d009ca419b3ac6883707a2c49
 2019-04-23 19:23:43 -07:00
Robert Snoeberger
208fd6731c Merge "Transition to bold when shrinking clock" into qt-dev 
am: 993e5dacd7

Change-Id: Iedd2231047baa4ff38537f560a9ac554f247699b
 2019-04-23 19:17:49 -07:00
Svet Ganov
2224cb827f Address API council feedback 
Test: manual

bug:130643623

Change-Id: I489f32858abfa4fe8eeda96cbb103d75e2a87551
 2019-04-24 02:14:48 +00:00
Hyundo Moon
08e1c031f5 Merge "Make MediaController#getSessionInfo() as @NonNull" into qt-dev 
am: 007bb68bdb

Change-Id: Iee3057e1d9db477461e2d341c46bad1ef0377cb4
 2019-04-23 19:10:59 -07:00
Shuzhen Wang
578e1637bd Merge "Camera: Relax BURST_CAPTURE FPS requirements" into qt-dev 
am: b9177522ff

Change-Id: Ib1da89bbfafa3f5c1231d14aa071f6e22c268da0
 2019-04-23 18:59:19 -07:00
TreeHugger Robot
c35533726d Merge "Sharesheet - Scrolling UI adjustments" into qt-dev 2019-04-24 01:56:52 +00:00
Yao Chen
3583bd2e8f Merge "Add encryption in incidentd." into qt-dev 
am: a35c2f1224

Change-Id: Ifb13a0ea562cdf1d5ada037c38b21094aaf7ad59
 2019-04-23 18:44:44 -07:00
Steve Elliott
36e25edae0 Merge "Initialize Global Actions Panel when one is available" into qt-dev 
am: 5acc240320

Change-Id: I8afee65f1cdf7e42c3eb2dba47d099b3ed3467f2
 2019-04-23 18:38:45 -07:00
TreeHugger Robot
993e5dacd7 Merge "Transition to bold when shrinking clock" into qt-dev 2019-04-24 01:34:32 +00:00
Hyundo Moon
007bb68bdb Merge "Make MediaController#getSessionInfo() as @NonNull" into qt-dev 2019-04-24 01:31:39 +00:00
Lucas Dupin
db88ab8d29 Merge "Fix click and long click lock behavior" into qt-dev 
am: 15ee32b208

Change-Id: I58636ae462e780e9914633507739cbd6f2cf6515
 2019-04-23 18:29:29 -07:00
TreeHugger Robot
b9177522ff Merge "Camera: Relax BURST_CAPTURE FPS requirements" into qt-dev 2019-04-24 01:19:09 +00:00