Commit Graph

434389 Commits

Author SHA1 Message Date
Bill Yi
b9a7546487 Import translations. DO NOT MERGE
Change-Id: Ic150afd4bb1846e8bc2c7e9285ff579498b2e5f4
Auto-generated-cl: translation import
2019-07-11 19:16:26 -07:00
Fedor Kudasov
95eab8ae45 Merge "Enable simplified version of RootRenderNode for host" 2019-07-10 19:56:18 +00:00
Lei Yu
99367a7ba0 Merge "Use old API to build NetworkTemplate" into qt-dev am: e5fdc968a0 am: 68178f853b
am: 05afaeead6

Change-Id: I590bea15ee77d85c682580e16405c96b060ecdcc
2019-07-10 11:55:01 -07:00
TreeHugger Robot
44a27da934 Merge "Remove icon name from NR dump" 2019-07-10 18:45:43 +00:00
Lei Yu
8be9f35881 Merge "Use old API to build NetworkTemplate" into qt-dev am: e5fdc968a0 am: fd80b569f9
am: 62e334fc0f

Change-Id: I09a693c0f48a33fc509d40e29d165709da646c89
2019-07-10 11:37:40 -07:00
Lei Yu
05afaeead6 Merge "Use old API to build NetworkTemplate" into qt-dev am: e5fdc968a0
am: 68178f853b

Change-Id: I047139864b9368b6a4226b850cdc56d8b8821950
2019-07-10 11:30:37 -07:00
Lei Yu
62e334fc0f Merge "Use old API to build NetworkTemplate" into qt-dev am: e5fdc968a0
am: fd80b569f9

Change-Id: I028536be6c63a9c0424d998e5dd6fe14bf75c71e
2019-07-10 11:18:29 -07:00
Jonathan Ward
9c289671af Merge "App that changes screen to multiple colors" am: bd09ce590c am: c32890e0bd am: 0f4d8fa630
am: 9a5af95e12

Change-Id: I7e92fa3364b6bf146810e14fd677421d1cf2af04
2019-07-10 11:16:25 -07:00
Lei Yu
68178f853b Merge "Use old API to build NetworkTemplate" into qt-dev
am: e5fdc968a0

Change-Id: I35702ae50d5274defd6974245bf1209ad3a0115f
2019-07-10 11:07:38 -07:00
Tarandeep Singh
ff0d28905f Merge "Remove PER_PROFILE_IME_ENABLED property" 2019-07-10 18:06:39 +00:00
Lei Yu
fd80b569f9 Merge "Use old API to build NetworkTemplate" into qt-dev
am: e5fdc968a0

Change-Id: I3fcf42d184015e52d064baf6efdd38150fbc2b9b
2019-07-10 11:05:19 -07:00
Jonathan Ward
9a5af95e12 Merge "App that changes screen to multiple colors" am: bd09ce590c am: c32890e0bd
am: 0f4d8fa630

Change-Id: I2958c510506e72fcb5ec976314cf8ee5442c8e8d
2019-07-10 11:02:52 -07:00
Jonathan Ward
0f4d8fa630 Merge "App that changes screen to multiple colors" am: bd09ce590c
am: c32890e0bd

Change-Id: Ia4ae5604481c6b699a848acd76f40bc5fd973bd2
2019-07-10 10:49:15 -07:00
a.lukianenko
d1ce8ebd20 Merge "Fixing 'No data transfer' mode in USB configuration" am: e8da6089ac am: 0df2517181 am: fb717b6ab2
am: c726e2058e

Change-Id: Ibe40e68ed21615d8fa12137ecc9e7774137fde5b
2019-07-10 10:34:23 -07:00
Lei Yu
e5fdc968a0 Merge "Use old API to build NetworkTemplate" into qt-dev 2019-07-10 17:27:58 +00:00
Jonathan Ward
c32890e0bd Merge "App that changes screen to multiple colors"
am: bd09ce590c

Change-Id: I209e0b256c583c7d5f7fc0546fa9257b8612d14b
2019-07-10 10:25:37 -07:00
a.lukianenko
c726e2058e Merge "Fixing 'No data transfer' mode in USB configuration" am: e8da6089ac am: 0df2517181
am: fb717b6ab2

Change-Id: I34846199e446031423b767aa66b1bd2987cf6d4c
2019-07-10 10:25:07 -07:00
Hongwei Wang
e4579b2a49 Merge "Fixes the PiP edge intersect for fling" 2019-07-10 17:17:17 +00:00
a.lukianenko
fb717b6ab2 Merge "Fixing 'No data transfer' mode in USB configuration" am: e8da6089ac
am: 0df2517181

Change-Id: I86e2d7afdb9039e62441d064d9c678811d8934b7
2019-07-10 10:15:00 -07:00
Treehugger Robot
bd09ce590c Merge "App that changes screen to multiple colors" 2019-07-10 17:07:45 +00:00
a.lukianenko
0df2517181 Merge "Fixing 'No data transfer' mode in USB configuration"
am: e8da6089ac

Change-Id: I7f0e03ccebb65e0c9a483adffc4af980ff164a3b
2019-07-10 09:59:06 -07:00
Julia Reynolds
c4ced6544d Remove icon name from NR dump
While occasionally useful, the call to create the Resources
object can take long enough that threads waiting on
the notificationlist lock (that we hold while dump()-ing) will
ANR and crash system_process.

Test: none
Fixes: 134505821
Change-Id: I8c6246cb1debc2c3d548c300e76d9279e29e2d4f
2019-07-10 12:44:45 -04:00
Treehugger Robot
e8da6089ac Merge "Fixing 'No data transfer' mode in USB configuration" 2019-07-10 16:44:29 +00:00
Matt Pape
f3854661f4 Merge "Update Mainline rollback lifetime from 2 days to 14 days." into qt-dev am: 54c7c6927c am: 1e34c25e79
am: dfe3c57028

Change-Id: I78724d6c069239d909750c5e9aab7732a0c6c54d
2019-07-10 09:36:20 -07:00
Matt Pape
579b24ffd5 Merge "Update Mainline rollback lifetime from 2 days to 14 days." into qt-dev am: 54c7c6927c am: fa0a1bd282
am: 5d9374a6ae

Change-Id: Icc012e5a53bc68017394e4fcb2f55e1e90936152
2019-07-10 09:32:33 -07:00
Matt Pape
dfe3c57028 Merge "Update Mainline rollback lifetime from 2 days to 14 days." into qt-dev am: 54c7c6927c
am: 1e34c25e79

Change-Id: I579edc261fc3b951b7a3441eeed4e6cc05f634f3
2019-07-10 09:24:25 -07:00
Matt Pape
5d9374a6ae Merge "Update Mainline rollback lifetime from 2 days to 14 days." into qt-dev am: 54c7c6927c
am: fa0a1bd282

Change-Id: Ic16fd70eec81df0717bd9451e16be274f6de4b41
2019-07-10 09:18:32 -07:00
Matt Pape
1e34c25e79 Merge "Update Mainline rollback lifetime from 2 days to 14 days." into qt-dev
am: 54c7c6927c

Change-Id: I5260baff36b2fbf3791174926cb062d7e823d610
2019-07-10 09:11:29 -07:00
Matt Pape
fa0a1bd282 Merge "Update Mainline rollback lifetime from 2 days to 14 days." into qt-dev
am: 54c7c6927c

Change-Id: I24b040f5e4a02abebe929f805fbf4e667b29e92b
2019-07-10 09:09:24 -07:00
Nate Myren
1a8d1110c0 Merge "Permission flag updates now notify listeners" 2019-07-10 16:03:07 +00:00
Matt Pape
54c7c6927c Merge "Update Mainline rollback lifetime from 2 days to 14 days." into qt-dev 2019-07-10 15:50:56 +00:00
Mathew Inwood
2be379300d Merge "Add trackingBug to API used by chromium vebview." am: c25ad64386 am: 53507c3423 am: 737a7a0e4f
am: b6bb42b7b8

Change-Id: Idf261a366b38172a61649c0e72a51f99e6443840
2019-07-10 07:01:36 -07:00
Mathew Inwood
b6bb42b7b8 Merge "Add trackingBug to API used by chromium vebview." am: c25ad64386 am: 53507c3423
am: 737a7a0e4f

Change-Id: I20f16a26e566eaf55d11be09b8050e0185cf8f81
2019-07-10 06:50:15 -07:00
Mathew Inwood
737a7a0e4f Merge "Add trackingBug to API used by chromium vebview." am: c25ad64386
am: 53507c3423

Change-Id: Iaa8be1cd02acfb8b271179aba0a2ceef2cd87e56
2019-07-10 06:39:08 -07:00
Ahan Wu
a76efc56ee Merge "Merge "Fix wallpaper flicker issue while transiting from home to aod." into qt-dev am: 71682ae9c7 am: 9760cd265e" into qt-r1-dev-plus-aosp
am: 12a21ab442

Change-Id: I23a3df01a3a24cedf4d6f86b3b90f665d977da96
2019-07-10 06:30:37 -07:00
Mathew Inwood
53507c3423 Merge "Add trackingBug to API used by chromium vebview."
am: c25ad64386

Change-Id: I45a07ef1d02e4c18dc63bc3333bb0fcf40aa9da5
2019-07-10 06:27:13 -07:00
Ahan Wu
29ced20e6b Merge "Fix wallpaper flicker issue while transiting from home to aod." into qt-dev am: 71682ae9c7 am: 49f5870f0c
am: f3cd104805

Change-Id: I736d2eb156b1583417710f6cbe7a69c56fc4d40b
2019-07-10 06:27:05 -07:00
Android Build Merger (Role)
12a21ab442 Merge "Merge "Fix wallpaper flicker issue while transiting from home to aod." into qt-dev am: 71682ae9c7 am: 9760cd265e" into qt-r1-dev-plus-aosp 2019-07-10 13:18:17 +00:00
Ahan Wu
f3cd104805 Merge "Fix wallpaper flicker issue while transiting from home to aod." into qt-dev am: 71682ae9c7
am: 49f5870f0c

Change-Id: Ib33b5da253df0e2aa7c27d71486629101c334546
2019-07-10 06:17:04 -07:00
Ahan Wu
7ab541e0b4 Merge "Fix wallpaper flicker issue while transiting from home to aod." into qt-dev am: 71682ae9c7
am: 9760cd265e

Change-Id: Ifc3714cf81596fb3e909139e1bae05b02b507000
2019-07-10 06:17:04 -07:00
Ahan Wu
9760cd265e Merge "Fix wallpaper flicker issue while transiting from home to aod." into qt-dev
am: 71682ae9c7

Change-Id: Ieb2b576e5178a2885c5c1df0eba41c2c4f6d50ae
2019-07-10 06:05:10 -07:00
Ahan Wu
49f5870f0c Merge "Fix wallpaper flicker issue while transiting from home to aod." into qt-dev
am: 71682ae9c7

Change-Id: I5a985cea550d81f944f3f690b036cf68d37e10c5
2019-07-10 06:05:09 -07:00
Treehugger Robot
c25ad64386 Merge "Add trackingBug to API used by chromium vebview." 2019-07-10 12:59:59 +00:00
TreeHugger Robot
71682ae9c7 Merge "Fix wallpaper flicker issue while transiting from home to aod." into qt-dev 2019-07-10 12:57:14 +00:00
Michael Wright
335ec4ddb3 Merge "Read the high refresh rate blacklist from DeviceConfig." 2019-07-10 10:09:31 +00:00
Chienyuan
4e89e6ffd1 [automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277 am: 9ac58f09c3 am: 181fb5b929 am: e6bf153855 am: 3aaf2811fc am: df484ced0b am: 2a547afdfa am: b36f88020e am: 60aad1a06f am: 5f70ebf52c am: eef665e68a
am: 5f336208d2

Change-Id: If66825aff6be1d7a5fe6a22058d4bbf0cc14eedb
2019-07-09 23:21:03 -07:00
Chienyuan
a65cfa6896 [automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277 am: 9ac58f09c3 am: 181fb5b929 am: e6bf153855 am: 3aaf2811fc am: df484ced0b am: 2a547afdfa am: b36f88020e am: 60aad1a06f am: 5f70ebf52c am: 991b628a09
am: 7983c807d5

Change-Id: I4f215cc3a3e71bc836fc28312a41525b3bc17e8a
2019-07-09 23:16:40 -07:00
Chienyuan
5f336208d2 [automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277 am: 9ac58f09c3 am: 181fb5b929 am: e6bf153855 am: 3aaf2811fc am: df484ced0b am: 2a547afdfa am: b36f88020e am: 60aad1a06f am: 5f70ebf52c
am: eef665e68a

Change-Id: If3081c613f3e5f4d4d9a90eadaa1ddf2a40cac95
2019-07-09 22:54:03 -07:00
Minchan Kim
3b0074ada6 Merge "skip reading vmallocinfo if not needed" into qt-r1-dev am: d8fd3f8e43
am: d8e489c7c3

Change-Id: I508ac8e8d8a3c751d9a0eff68837a68809beb268
2019-07-09 22:52:11 -07:00
Bill Yi
6d4ec5e675 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 2f5007db0a -s ours am: 7fd9a81f83 -s ours
am: 506d74247a -s ours
am skip reason: subject contains skip directive

Change-Id: I7c9d7f471ea5f8992dd1a7810b5390d3bfaf7b14
2019-07-09 22:48:51 -07:00