Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
430,513 Commits 3 Branches 0 Tags
e2a5cc4e4a7e343d0b923441c4e20fcbef002e78
Commit Graph

430513 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hyunyoung Song
e2a5cc4e4a Merge "Log various types of back gesture using StatsLog Bug: 135152789 Test: m statsd_testdrive -j31 Test: out/host/linux-x86/bin/statsd_testdrive 224" into qt-r1-dev am: fa38ed5296 
am: 2984f34075

Change-Id: I006eb3713e1c3acd935108e25fef2b4b3adf9fc9
 2019-08-12 16:45:52 -07:00
Hyunyoung Song
2984f34075 Merge "Log various types of back gesture using StatsLog Bug: 135152789 Test: m statsd_testdrive -j31 Test: out/host/linux-x86/bin/statsd_testdrive 224" into qt-r1-dev 
am: fa38ed5296

Change-Id: I3250c533571e6b371de81e75fc8094a5b3c59d8e
 2019-08-12 16:35:05 -07:00
Android Build Merger (Role)
56a3d8fb1b Merge "Merge "Using the keyguard fading away duration for the scrim" into qt-r1-dev am: 85224a5834 am: 7e5643525d" into qt-qpr1-dev-plus-aosp 2019-08-12 23:24:12 +00:00
Brad Ebinger
104e3af887 Merge "Prevent Infinite Recursion in Telecom Sessions" into qt-qpr1-dev 
am: 1ac5238f91

Change-Id: Ic3e17dbc7380a35281dbb13ef6d60c501fbd1135
 2019-08-12 16:23:08 -07:00
Selim Cinek
4f09418fe4 Merge "Using the keyguard fading away duration for the scrim" into qt-r1-dev am: 85224a5834 
am: 7e5643525d

Change-Id: I91a9854fdbadf853d31ad2c687062a0e91b060c1
 2019-08-12 16:23:06 -07:00
TreeHugger Robot
fa38ed5296 Merge "Log various types of back gesture using StatsLog Bug: 135152789 Test: m statsd_testdrive -j31 Test: out/host/linux-x86/bin/statsd_testdrive 224" into qt-r1-dev 2019-08-12 23:18:04 +00:00
Selim Cinek
781721a40f Merge "Using the keyguard fading away duration for the scrim" into qt-r1-dev am: 85224a5834 
am: c28d623253

Change-Id: Icd7a7bd08221d480b5e30b2a4165d90fb7b45619
 2019-08-12 16:13:15 -07:00
TreeHugger Robot
1ac5238f91 Merge "Prevent Infinite Recursion in Telecom Sessions" into qt-qpr1-dev 2019-08-12 23:08:04 +00:00
Selim Cinek
7e5643525d Merge "Using the keyguard fading away duration for the scrim" into qt-r1-dev 
am: 85224a5834

Change-Id: Ibf7ae797ee8f4ca739347c5b1143f080a1b86d5c
 2019-08-12 16:03:05 -07:00
Selim Cinek
c28d623253 Merge "Using the keyguard fading away duration for the scrim" into qt-r1-dev 
am: 85224a5834

Change-Id: I11aafc252dc733ef01cafd510b3a602aea803804
 2019-08-12 16:03:04 -07:00
TreeHugger Robot
85224a5834 Merge "Using the keyguard fading away duration for the scrim" into qt-r1-dev 2019-08-12 22:44:56 +00:00
Pengquan Meng
3ddda4234a Merge "Add timeout for displaying 5G icon" into qt-qpr1-dev 
am: 8a66dd0357

Change-Id: Ic9f6ec084e99e20fdc9cd1ea2955482709b59fa5
 2019-08-12 15:36:56 -07:00
Yuncheol Heo
0d5e62e558 Allow the vendor specific initialization of display_settings.xml. 
am: f646144ab2

Change-Id: I43816c145cbb9093449d5ede3ed283ad6c827d5f
 2019-08-12 15:32:18 -07:00
Pengquan Meng
8a66dd0357 Merge "Add timeout for displaying 5G icon" into qt-qpr1-dev 2019-08-12 22:24:58 +00:00
Brad Ebinger
72733f640b [automerger skipped] Merge "SurfaceControl: Fix captureLayers JNI" am: ce98a32755 -s ours am: 3c81a4c537 -s ours am: 8a382eda66 -s ours 
am: 3dec1113ad -s ours
am skip reason: change_id I43fa93eea7d79f5b773497e3bb65750866eca2cb with SHA1 fbc22c2b6d is in history

Change-Id: I9d11d4b6c5ffff3399f90cf21a45c30fd4ebaaec
 2019-08-12 12:07:18 -07:00
Pengquan Meng
0ac07b2b41 Add timeout for displaying 5G icon 
This change add an optional filed that allows carrier to change the
timeout.

System UI will show the 5G icon and start a timer with the timeout
from this config when the device connect to a 5G cell. System UI stop
displaying 5G icon when both the device disconnect from 5G cell and
the timer is expired.

Bug: 136107473
Test: build
Change-Id: I9720ec127865daa03fb2c23fbdd7d4ebf5e30e1b
 2019-08-12 12:00:25 -07:00
Brad Ebinger
3dec1113ad [automerger skipped] Merge "SurfaceControl: Fix captureLayers JNI" am: ce98a32755 -s ours am: 3c81a4c537 -s ours 
am: 8a382eda66 -s ours
am skip reason: change_id I43fa93eea7d79f5b773497e3bb65750866eca2cb with SHA1 fbc22c2b6d is in history

Change-Id: Iac7825da7163c0f2d0aebf808811922aeb0a2a21
 2019-08-12 11:55:00 -07:00
Brad Ebinger
8a382eda66 [automerger skipped] Merge "SurfaceControl: Fix captureLayers JNI" am: ce98a32755 -s ours 
am: 3c81a4c537 -s ours
am skip reason: change_id I43fa93eea7d79f5b773497e3bb65750866eca2cb with SHA1 fbc22c2b6d is in history

Change-Id: If8ff3a2ff8317a893d4c83c49a9cae8573726770
 2019-08-12 11:41:45 -07:00
Brad Ebinger
3c81a4c537 [automerger skipped] Merge "SurfaceControl: Fix captureLayers JNI" 
am: ce98a32755 -s ours
am skip reason: change_id I43fa93eea7d79f5b773497e3bb65750866eca2cb with SHA1 fbc22c2b6d is in history

Change-Id: I70e4eec7b690b80e5ec1bfb4610614030d508cb3
 2019-08-12 11:23:41 -07:00
Brad Ebinger
ce98a32755 Merge "SurfaceControl: Fix captureLayers JNI" 2019-08-12 17:46:33 +00:00
Yuncheol Heo
f646144ab2 Allow the vendor specific initialization of display_settings.xml. 
In hawk_md, I tried to copy the intial settings in vendor-init: ag/7309059
Later, I found that this way doesn't work in SELINUX, since vendor-init is
not allowed to access core_data_files: http://shortn/_h6LOOHBVCF
So, I'd like to add a hook that vendor can provide the intial display
settings.
This is a stop-gap solution until b/123226552 is resolved.

Bug: 137233447
Test: Check if /vendor/etc/display_settings.xml is copied into /data/system/.
Change-Id: Ib87219e62c3414f26d63f072a0e767287ddb156e
 2019-08-12 16:18:17 +00:00
Android Build Merger (Role)
cf0eed10ff Merge "Merge "Disable falsing manager when face-authed." into qt-r1-dev am: 9249d828a1 am: 7e715542f5" into qt-qpr1-dev-plus-aosp 2019-08-12 15:52:27 +00:00
Dave Mankoff
15e9e0c124 Merge "Disable falsing manager when face-authed." into qt-r1-dev am: 9249d828a1 
am: 7e715542f5

Change-Id: I256bfccd5883469a511cd303b211092386bd666c
 2019-08-12 08:51:44 -07:00
Dave Mankoff
227ccfd9e3 Merge "Disable falsing manager when face-authed." into qt-r1-dev am: 9249d828a1 
am: 5606325ee3

Change-Id: I4990045977816f0f8e7ad29d95a647a5d9ca3aa0
 2019-08-12 08:51:42 -07:00
Dave Mankoff
5606325ee3 Merge "Disable falsing manager when face-authed." into qt-r1-dev 
am: 9249d828a1

Change-Id: I6c153ec1809d07b2e5ede1738bacc48e57d7b9cc
 2019-08-12 08:41:34 -07:00
Dave Mankoff
7e715542f5 Merge "Disable falsing manager when face-authed." into qt-r1-dev 
am: 9249d828a1

Change-Id: Icfba07cedf942e13c2a5747890b253e6f6d588c0
 2019-08-12 08:41:30 -07:00
Dave Mankoff
9249d828a1 Merge "Disable falsing manager when face-authed." into qt-r1-dev 2019-08-12 15:17:39 +00:00
Sungsoo Lim
8cbdd3af0c Merge "Fix reference leak on TvInputHardwareManager" am: 8b578c9c92 am: c91d1ea7ed am: ec955bbf91 
am: e823655a9d

Change-Id: If72c520c079eaf5134beb1054caa12e0bc93172f
 2019-08-11 22:12:11 -07:00
Sungsoo Lim
e823655a9d Merge "Fix reference leak on TvInputHardwareManager" am: 8b578c9c92 am: c91d1ea7ed 
am: ec955bbf91

Change-Id: I2981fe6d00fcc270a31f5baed59d42e0a9eccedf
 2019-08-11 22:01:15 -07:00
Bill Yi
b4df05315d [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8931739c16 -s ours am: eb16f029ee -s ours 
am: 000a882ba3 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie050b98a20156ea1f9a6514771ce4b99f45737be
 2019-08-11 22:01:10 -07:00
Android Build Merger (Role)
8b5ab1e375 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8931739c16 -s ours am: a6e7345636 -s ours am: e8b96c4515 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-08-12 04:52:42 +00:00
Sungsoo Lim
ec955bbf91 Merge "Fix reference leak on TvInputHardwareManager" am: 8b578c9c92 
am: c91d1ea7ed

Change-Id: Ie6488ec655be821bbb17c44796a4f49583471888
 2019-08-11 21:51:43 -07:00
Bill Yi
61ad55abaf [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8931739c16 -s ours am: a6e7345636 -s ours 
am: e8b96c4515 -s ours
am skip reason: subject contains skip directive

Change-Id: If566354c93dd7e8d13bd88e30fddd574097b1ed6
 2019-08-11 21:51:39 -07:00
Bill Yi
000a882ba3 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8931739c16 -s ours 
am: eb16f029ee -s ours
am skip reason: subject contains skip directive

Change-Id: I6a695b9f3f33b26f480d94195bafc08cf823f6c0
 2019-08-11 21:51:38 -07:00
Bill Yi
adac5c7476 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8931739c16 -s ours am: a6e7345636 -s ours 
am: 70ed26b986 -s ours
am skip reason: subject contains skip directive

Change-Id: I985da4431c28dd4f64059d1e95e04df0f330e5ba
 2019-08-11 21:51:37 -07:00
Bill Yi
70ed26b986 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8931739c16 -s ours 
am: a6e7345636 -s ours
am skip reason: subject contains skip directive

Change-Id: Iccd8a20d4268b2de81f006ed55daaa2c4d64237f
 2019-08-11 21:41:42 -07:00
Bill Yi
e8b96c4515 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8931739c16 -s ours 
am: a6e7345636 -s ours
am skip reason: subject contains skip directive

Change-Id: I1d5193e298818d94425d28492caaafcf4d6ea295
 2019-08-11 21:41:39 -07:00
Sungsoo Lim
c91d1ea7ed Merge "Fix reference leak on TvInputHardwareManager" 
am: 8b578c9c92

Change-Id: I7fb3e249c5ae0102d61783b6bd2e70a823297a94
 2019-08-11 21:32:00 -07:00
Bill Yi
eb16f029ee [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: 8931739c16 -s ours
am skip reason: subject contains skip directive

Change-Id: Id4e3cf77ac0c63458cb1c773f97199f702815dda
 2019-08-11 21:31:53 -07:00
Bill Yi
a6e7345636 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: 8931739c16 -s ours
am skip reason: subject contains skip directive

Change-Id: I968bb1d6987ac3baab44a20b642ef4196026a408
 2019-08-11 21:31:51 -07:00
Sungsoo Lim
8b578c9c92 Merge "Fix reference leak on TvInputHardwareManager" 2019-08-12 04:02:56 +00:00
TreeHugger Robot
8931739c16 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-08-12 04:00:48 +00:00
Bill Yi
5de36290c4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 
am: d47951389d -s ours
am skip reason: subject contains skip directive

Change-Id: Id40f9931776211a914c0cdf6431d988bda44ddd2
 2019-08-11 19:20:40 -07:00
Kyeongkab.Nam
741db323d9 Merge "Fix a lock issue in AudioPortEventHandler" am: 0985eea389 am: 41c9e7092e am: 4b98ce6898 
am: bb3c59e776

Change-Id: I8b84cbaceae238201ef65cfd4168def364e66d4e
 2019-08-11 19:09:26 -07:00
Kyeongkab.Nam
bb3c59e776 Merge "Fix a lock issue in AudioPortEventHandler" am: 0985eea389 am: 41c9e7092e 
am: 4b98ce6898

Change-Id: I5223b955c9641018fd9dd88aca62782f62fa54df
 2019-08-11 18:59:23 -07:00
Kyeongkab.Nam
4b98ce6898 Merge "Fix a lock issue in AudioPortEventHandler" am: 0985eea389 
am: 41c9e7092e

Change-Id: I27966dd0d709e66a624ee1fc1b5045132a24385b
 2019-08-11 18:49:12 -07:00
TreeHugger Robot
d47951389d Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2019-08-12 01:47:33 +00:00
Kyeongkab.Nam
41c9e7092e Merge "Fix a lock issue in AudioPortEventHandler" 
am: 0985eea389

Change-Id: If2113f4150e35c7aeb1751181dab8aa2ea05dee4
 2019-08-11 18:38:44 -07:00
Treehugger Robot
0985eea389 Merge "Fix a lock issue in AudioPortEventHandler" 2019-08-12 01:22:58 +00:00
Selim Cinek
72cd9a7358 Using the keyguard fading away duration for the scrim 
Previously we were using a fixed duration and as a result the
scrims duration was much shorter right after boot when the
fading away duration takes 2 seconds. We're now always using
the fading away duration which simplifies also the bypass
transition.

Fixes: 138305791
Test: atest SystemUITests
Change-Id: I2eba68c75c9777ab1ba6ffadadafed3836eb74e3
 2019-08-09 18:01:27 -07:00