Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
435,047 Commits 3 Branches 0 Tags
cb95d040fcfd2e7f910bd36df590ad190adc8676
Commit Graph

435047 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lucas Dupin
cb95d040fc Merge "Avoid going to SHADE_LOCKED when already in SHADE" into qt-qpr1-dev 
am: 01047d0372

Change-Id: I35947a507d4fbbb5254ce32eed33a94fc4b5720e
 2019-09-18 11:07:45 -07:00
Fabian Kozynski
97b5991f24 [automerger skipped] Merge "Use UnlockMethodCache#canSkipBouncer in user switcher" am: 63e2a95b87 am: 941d439465 -s ours 
am: 803f3e0a6f -s ours
am skip reason: change_id Idbff4fbabca962c632ff5d78b25418c0502db9a7 with SHA1 d2eb34b689 is in history

Change-Id: Ie8e9917a797a56e5bb9a498f0c2f7f49ab52ed36
 2019-09-18 10:51:50 -07:00
Lucas Dupin
01047d0372 Merge "Avoid going to SHADE_LOCKED when already in SHADE" into qt-qpr1-dev 2019-09-18 17:42:58 +00:00
Fabian Kozynski
803f3e0a6f [automerger skipped] Merge "Use UnlockMethodCache#canSkipBouncer in user switcher" am: 63e2a95b87 
am: 941d439465 -s ours
am skip reason: change_id Idbff4fbabca962c632ff5d78b25418c0502db9a7 with SHA1 d2eb34b689 is in history

Change-Id: I7081d25eb3e16e25cf36dab3d2f44ab820d44bcd
 2019-09-18 10:42:11 -07:00
Fabian Kozynski
941d439465 Merge "Use UnlockMethodCache#canSkipBouncer in user switcher" 
am: 63e2a95b87

Change-Id: Iba7f5c6c12c1b0e5e0dd07fa9a20850428bd5674
 2019-09-18 10:30:20 -07:00
Treehugger Robot
63e2a95b87 Merge "Use UnlockMethodCache#canSkipBouncer in user switcher" 2019-09-18 17:11:28 +00:00
Lucas Dupin
e7ff7be645 Avoid going to SHADE_LOCKED when already in SHADE 
It's not possible for the device to go to SHADE_LOCKED after you're
already unlocked, still it's possible that it would happen.

Added an extra condition to avoid it, and logs to catch the regression
if it happens again.

Fixes: 139259891
Test: pull down notification while authenticating
Change-Id: I5c2b81906fa444dfd07d040b81a527245d4130e6
 2019-09-18 10:38:34 -04:00
Anna Trostanetski
345a2b80c0 [automerger skipped] Merge "Implement stats logging for Compatibility API." am: 3cadf0d9ea -s ours am: 5cc97f9856 -s ours 
am: 62f7def277 -s ours
am skip reason: change_id I80f07d0beb30c779c4bce70bebf2bb4ab22f6bfe with SHA1 1516d5290c is in history

Change-Id: Ib66eb7ca5774fbf0c688822fb7c871ed5f71f72d
 2019-09-18 05:58:18 -07:00
Anna Trostanetski
62f7def277 [automerger skipped] Merge "Implement stats logging for Compatibility API." am: 3cadf0d9ea -s ours 
am: 5cc97f9856 -s ours
am skip reason: change_id I80f07d0beb30c779c4bce70bebf2bb4ab22f6bfe with SHA1 1516d5290c is in history

Change-Id: I581c6fb0d271188d248fbbe46ed9c420fac5916c
 2019-09-18 05:51:29 -07:00
Anna Trostanetski
5cc97f9856 [automerger skipped] Merge "Implement stats logging for Compatibility API." 
am: 3cadf0d9ea -s ours
am skip reason: change_id I80f07d0beb30c779c4bce70bebf2bb4ab22f6bfe with SHA1 1516d5290c is in history

Change-Id: I737b7e4ab97289c83bb616086753b2dcd9cb4724
 2019-09-18 05:45:37 -07:00
Anna Trostanetski
3cadf0d9ea Merge "Implement stats logging for Compatibility API." 2019-09-18 12:25:47 +00:00
Anna Trostanetski
28fa70f0e0 Merge "Implement stats logging for Compatibility API." into stage-aosp-master am: 81e186ab99 
am: 44b8ba5095

Change-Id: I0a7652cc97b7b50fc3797b26582b09caa0617a16
 2019-09-18 03:55:45 -07:00
Anna Trostanetski
44b8ba5095 Merge "Implement stats logging for Compatibility API." into stage-aosp-master 
am: 81e186ab99

Change-Id: I48e2e3cdc23cdfcc541a5912aec20435ebc4c0c8
 2019-09-18 03:42:49 -07:00
Anna Trostanetski
81e186ab99 Merge "Implement stats logging for Compatibility API." into stage-aosp-master 2019-09-18 10:35:21 +00:00
Cheonho Park
f3bf40d91f Merge "Allow signing key rotation" into qt-qpr1-dev 
am: 8c0b496c97

Change-Id: I94d38d4e27c789d2e0bb18e1a8253b06a78a57b1
 2019-09-17 22:19:02 -07:00
Cheonho Park
8c0b496c97 Merge "Allow signing key rotation" into qt-qpr1-dev 2019-09-18 05:04:12 +00:00
Jaegeuk Kim
42315b497f Merge "IdleMaint: run more frequently during 3AM to 4AM" into qt-qpr1-dev 
am: 64c2d37df2

Change-Id: Idf3bdcbbd443c2c6185a63da8a09f6275c29b5f2
 2019-09-17 20:17:27 -07:00
Hyungjun Park
3b70d93efc Merge "Add isApplicationOnUicc API" am: 3dc68a9585 am: 2f3eb5d88f 
am: 5d7734c64e

Change-Id: I8b620acbebe8081630a7f0b2f2fa739066b7c30b
 2019-09-17 19:45:26 -07:00
Hyungjun Park
5d7734c64e Merge "Add isApplicationOnUicc API" am: 3dc68a9585 
am: 2f3eb5d88f

Change-Id: I2deb2fbfba218f50a24656ec9e9f636335749a34
 2019-09-17 19:31:36 -07:00
Jaegeuk Kim
64c2d37df2 Merge "IdleMaint: run more frequently during 3AM to 4AM" into qt-qpr1-dev 2019-09-18 02:28:03 +00:00
Hyungjun Park
2f3eb5d88f Merge "Add isApplicationOnUicc API" 
am: 3dc68a9585

Change-Id: I995d6b61d43a39ad5e52c99e62ac292540a0be7e
 2019-09-17 19:17:24 -07:00
Treehugger Robot
3dc68a9585 Merge "Add isApplicationOnUicc API" 2019-09-18 02:00:54 +00:00
markchien
2d2faf674d [automerger skipped] Merge "Passing caller package name to setBluetoothTethering" into qt-qpr1-dev 
am: 27d33b157c -s ours
am skip reason: change_id I2140398ad3bbc8076f729c843f0515c654553aaf with SHA1 560c3ac1dc is in history

Change-Id: Id0e53f87347acda2879c566ce2a231fd2d217530
 2019-09-17 18:09:37 -07:00
Kweku Adams
ae089b82bf Merge "Enter quick doze with non-wakeup alarm." into qt-qpr1-dev 
am: 795ef47130

Change-Id: I0c45525e4d7ff55de632b8d98a4e8aa993ea86d6
 2019-09-17 17:58:41 -07:00
TreeHugger Robot
27d33b157c Merge "Passing caller package name to setBluetoothTethering" into qt-qpr1-dev 2019-09-18 00:56:12 +00:00
lumark
8684d86bad Merge "DO NOT MERGE Use realCallerId to check launch display for Bubbles" into qt-qpr1-dev 
am: fd20f775ac

Change-Id: I64fe036ab20d99d606d49a32127f60a49aa57784
 2019-09-17 17:53:53 -07:00
lumark
55f5540cb5 DO NOT MERGE Use realCallerId to check launch display for Bubbles 
am: af0629a53a

Change-Id: Ibf73e916e439fd8746b46339953c2bcda2d1536c
 2019-09-17 17:53:43 -07:00
TreeHugger Robot
795ef47130 Merge "Enter quick doze with non-wakeup alarm." into qt-qpr1-dev 2019-09-18 00:26:34 +00:00
TreeHugger Robot
fd20f775ac Merge "DO NOT MERGE Use realCallerId to check launch display for Bubbles" into qt-qpr1-dev 2019-09-18 00:21:23 +00:00
Jaegeuk Kim
8975f78fff IdleMaint: run more frequently during 3AM to 4AM 
This patch makes IdleMaint trigger multiple times between
3AM and 4AM, if device is idle and power is not low. This
will not trigger until next 3AM.

Bug: 128594671
Change-Id: Id6596be44ff96d39f77fb21dca52c35952f2cf7e
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
 2019-09-17 23:31:22 +00:00
Taesu Lee
3e812c1d12 Merge "Add new onSmsStatusReportReceived() without message reference" am: e6901bc862 am: 79aaff47c6 
am: 793c72e6f8

Change-Id: Idb5fe0c42619faf0a161de4c9591a0139043183a
 2019-09-17 16:10:00 -07:00
Taesu Lee
793c72e6f8 Merge "Add new onSmsStatusReportReceived() without message reference" am: e6901bc862 
am: 79aaff47c6

Change-Id: Ic2afea7122025166a2462e6345dd6f3cc0980f83
 2019-09-17 15:54:46 -07:00
Lucas Dupin
7654f1f956 Merge "Fix status bar flickering" into qt-qpr1-dev 
am: 89ebc7c1ad

Change-Id: I0fb3b62248e139ca30f3981588278c04b3471dd5
 2019-09-17 15:54:40 -07:00
Brad Stenning
7f5aa900d2 Merge "Adding scrim bubble to car's super_status_bar.xml" into qt-qpr1-dev 
am: 1c6c190919

Change-Id: I1a601ca6a55d8c66faf17a670a50cbd5458bbe8a
 2019-09-17 15:48:30 -07:00
Taesu Lee
79aaff47c6 Merge "Add new onSmsStatusReportReceived() without message reference" 
am: e6901bc862

Change-Id: I47b4ad0a13930b4a4080d8a8ac0f0cf657ea91a0
 2019-09-17 15:48:04 -07:00
Lucas Dupin
89ebc7c1ad Merge "Fix status bar flickering" into qt-qpr1-dev 2019-09-17 22:46:13 +00:00
Treehugger Robot
e6901bc862 Merge "Add new onSmsStatusReportReceived() without message reference" 2019-09-17 22:28:35 +00:00
Brad Stenning
1c6c190919 Merge "Adding scrim bubble to car's super_status_bar.xml" into qt-qpr1-dev 2019-09-17 22:23:57 +00:00
Steven Moreland
0fbb9fb706 Merge "HwBinder: don't rely on kernel headers." am: b0e6033182 am: 1201b1b438 
am: c2af792f98

Change-Id: I51ca55f7d8990d182cdef32cc551b5781fdc7575
 2019-09-17 15:11:41 -07:00
Steven Moreland
c2af792f98 Merge "HwBinder: don't rely on kernel headers." am: b0e6033182 
am: 1201b1b438

Change-Id: I6f83405794e747a505b75b6c4277e901e5ac6639
 2019-09-17 15:04:53 -07:00
Steven Moreland
1201b1b438 Merge "HwBinder: don't rely on kernel headers." 
am: b0e6033182

Change-Id: If06f30f1b6f4ee62fd2277b8c1aeeffa9fdd0ae8
 2019-09-17 14:58:30 -07:00
Steven Moreland
b0e6033182 Merge "HwBinder: don't rely on kernel headers." 2019-09-17 21:49:31 +00:00
Winson Chung
2f8f814501 Merge "Skip updating exclusion rects unless one is set" into qt-qpr1-dev 
am: 4b15467f5f

Change-Id: I7eedaaddd5b2c843cb9f019440085bb9ceed9d25
 2019-09-17 13:57:33 -07:00
Winson Chung
4b15467f5f Merge "Skip updating exclusion rects unless one is set" into qt-qpr1-dev 2019-09-17 20:44:25 +00:00
Kevin Hufnagle
4e23edb962 Merge "docs: Fixed contradictory info in IntentFilter" into qt-dev am: 1fe99017eb am: 1e8492c744 
am: b8f9986a1c

Change-Id: I1aa78fc869d814bf57c7a4faa7ce17c4beb28a87
 2019-09-17 12:44:19 -07:00
Kevin Hufnagle
4d53ea94c7 Merge "docs: Fixed contradictory info in IntentFilter" into qt-dev am: 1fe99017eb am: 1e8492c744 
am: 85bd2c62cb

Change-Id: Ic7beb1eabce4ce8b241a11163b637000c4df4270
 2019-09-17 12:37:20 -07:00
Kevin Hufnagle
85bd2c62cb Merge "docs: Fixed contradictory info in IntentFilter" into qt-dev am: 1fe99017eb 
am: 1e8492c744

Change-Id: Idbc73307a0c3f4a937a2a964667f01b28aa274ce
 2019-09-17 12:32:20 -07:00
Kevin Hufnagle
b8f9986a1c Merge "docs: Fixed contradictory info in IntentFilter" into qt-dev am: 1fe99017eb 
am: 1e8492c744

Change-Id: I666adc700cc68ccb9982713cafd97d8792579bd9
 2019-09-17 12:32:09 -07:00
Kevin Hufnagle
1e8492c744 Merge "docs: Fixed contradictory info in IntentFilter" into qt-dev 
am: 1fe99017eb

Change-Id: I13ba0297750b5b375f4874640b14b4955d17eeaa
 2019-09-17 12:19:12 -07:00
Kevin Hufnagle
1fe99017eb Merge "docs: Fixed contradictory info in IntentFilter" into qt-dev 2019-09-17 18:54:20 +00:00