Joel Galenson
b7fe2bab9d
Merge "Ensure we do not set seInfoTargetSdkVersion to 0." into pi-dev am: 52ae06af4d
...
am: ecb54b0d3d
2018-04-12 09:20:29 -07:00
Joel Galenson
ecb54b0d3d
Merge "Ensure we do not set seInfoTargetSdkVersion to 0." into pi-dev
...
am: 52ae06af4d
2018-04-12 09:10:31 -07:00
Rohan Shah
29a955a440
Merge "[Notif] Use OK instead of DONE for blocking helper" into pi-dev am: 3dee3d19c2
...
am: c480082eff
2018-04-12 09:09:34 -07:00
Rohan Shah
c480082eff
Merge "[Notif] Use OK instead of DONE for blocking helper" into pi-dev
...
am: 3dee3d19c2
2018-04-12 09:01:00 -07:00
TreeHugger Robot
52ae06af4d
Merge "Ensure we do not set seInfoTargetSdkVersion to 0." into pi-dev
2018-04-12 15:53:03 +00:00
TreeHugger Robot
3dee3d19c2
Merge "[Notif] Use OK instead of DONE for blocking helper" into pi-dev
2018-04-12 15:47:30 +00:00
Amin Shaikh
241be4b11c
Merge changes I6358cfe3,I00b20bd7 into pi-dev am: ef85bbfe4d
...
am: 32845a5e36
2018-04-12 08:17:33 -07:00
Amin Shaikh
32845a5e36
Merge changes I6358cfe3,I00b20bd7 into pi-dev
...
am: ef85bbfe4d
2018-04-12 08:08:40 -07:00
Rohan Shah
8319f2db3d
Merge "[Notif] Allow locking importance on notification" into pi-dev am: 8e7f23a74c
...
am: 0c91614746
2018-04-12 08:08:13 -07:00
Rohan Shah
0c91614746
Merge "[Notif] Allow locking importance on notification" into pi-dev
...
am: 8e7f23a74c
2018-04-12 07:58:28 -07:00
TreeHugger Robot
ef85bbfe4d
Merge changes I6358cfe3,I00b20bd7 into pi-dev
...
* changes:
Fix status icon tint in QQS.
Fix QQS side padding for icons and tiles.
2018-04-12 14:55:55 +00:00
Adrian Roos
d5a59ba94b
Merge "ScreenDecorations: Only draw cutout if requested" into pi-dev am: 819fffaf1d
...
am: a525b0796e
2018-04-12 07:54:11 -07:00
Rohan Shah
8e7f23a74c
Merge "[Notif] Allow locking importance on notification" into pi-dev
2018-04-12 14:49:11 +00:00
Adrian Roos
a525b0796e
Merge "ScreenDecorations: Only draw cutout if requested" into pi-dev
...
am: 819fffaf1d
2018-04-12 07:42:59 -07:00
TreeHugger Robot
819fffaf1d
Merge "ScreenDecorations: Only draw cutout if requested" into pi-dev
2018-04-12 14:35:33 +00:00
richard chou
aa6043a3c5
Merge "Reset SIM state if the subscription/slot is no longer active." into pi-dev am: f6840a17ff
...
am: e7e1f44364
2018-04-12 06:52:17 -07:00
richard chou
e7e1f44364
Merge "Reset SIM state if the subscription/slot is no longer active." into pi-dev
...
am: f6840a17ff
2018-04-12 06:42:08 -07:00
TreeHugger Robot
f6840a17ff
Merge "Reset SIM state if the subscription/slot is no longer active." into pi-dev
2018-04-12 13:32:35 +00:00
Android Build Merger (Role)
8dffe42cb9
Merge "Merge "Clean up APIs before declaring API 28." into pi-dev am: fb10508cfa am: b129fadef8"
2018-04-12 12:47:09 +00:00
Wale Ogunwale
cbb04c868d
Merge "Clean up APIs before declaring API 28." into pi-dev am: fb10508cfa
...
am: b129fadef8
2018-04-12 05:45:08 -07:00
Jason Chang
bf0dffad8a
Merge "[SettingsLib] Update Utils APIs usage"
2018-04-12 12:44:04 +00:00
Wale Ogunwale
b129fadef8
Merge "Clean up APIs before declaring API 28." into pi-dev
...
am: fb10508cfa
2018-04-12 05:33:09 -07:00
Wale Ogunwale
fb10508cfa
Merge "Clean up APIs before declaring API 28." into pi-dev
2018-04-12 12:19:56 +00:00
Jorim Jaggi
0763ed2670
Merge "Fix issue with leaked preserved surface" into pi-dev am: 682ca4122d
...
am: 2545afe577
2018-04-12 04:35:35 -07:00
Jorim Jaggi
2545afe577
Merge "Fix issue with leaked preserved surface" into pi-dev
...
am: 682ca4122d
2018-04-12 04:27:09 -07:00
Jorim Jaggi
682ca4122d
Merge "Fix issue with leaked preserved surface" into pi-dev
2018-04-12 11:14:55 +00:00
Henry Liu
2521e0b423
Merge "Fix [kv-4] PerformBackupTask possible NPE/Wrong package report." into pi-dev am: b30a1b0668
...
am: cfc04c80b9
2018-04-12 04:03:04 -07:00
Henry Liu
cfc04c80b9
Merge "Fix [kv-4] PerformBackupTask possible NPE/Wrong package report." into pi-dev
...
am: b30a1b0668
2018-04-12 03:53:54 -07:00
TreeHugger Robot
b30a1b0668
Merge "Fix [kv-4] PerformBackupTask possible NPE/Wrong package report." into pi-dev
2018-04-12 10:38:23 +00:00
Chong Zhang
ba07cc25b6
Merge "Fix missing video caps for HEIC type encoders" into pi-dev am: 773791a94c
...
am: 26bedfe43e
2018-04-12 03:26:50 -07:00
Kweku Adams
10b250777d
Merge "Cleaning up frameworks protos." into pi-dev am: 4738c7d0ab
...
am: 65b24cf8e9
2018-04-12 03:17:56 -07:00
Chong Zhang
26bedfe43e
Merge "Fix missing video caps for HEIC type encoders" into pi-dev
...
am: 773791a94c
2018-04-12 03:13:29 -07:00
Kweku Adams
65b24cf8e9
Merge "Cleaning up frameworks protos." into pi-dev
...
am: 4738c7d0ab
2018-04-12 03:08:37 -07:00
TreeHugger Robot
773791a94c
Merge "Fix missing video caps for HEIC type encoders" into pi-dev
2018-04-12 09:59:28 +00:00
TreeHugger Robot
4738c7d0ab
Merge "Cleaning up frameworks protos." into pi-dev
2018-04-12 09:55:45 +00:00
Milo Sredkov
3c144f4ae1
Merge "Allow extra height for the smartreply buttons" into pi-dev am: 85678bfbbd
...
am: a17a7cefaf
2018-04-12 01:20:16 -07:00
Adrian Roos
c41b32baac
ScreenDecorations: Only draw cutout if requested
...
Change-Id: I149e9f7d8b1ec7164e717f713731c618cf2772c0
Fixes: 77798197
Test: set config_fillMainBuiltInDisplayCutout=false, verify no soft cutout gets drawn.
2018-04-12 10:13:48 +02:00
Andreas Gampe
76229c0b87
Merge "Revert "Greylist methods with varargs and intrinsics"" into pi-dev am: 5ca4d29089
...
am: eaa0bb2c7f
2018-04-12 01:07:41 -07:00
Milo Sredkov
a17a7cefaf
Merge "Allow extra height for the smartreply buttons" into pi-dev
...
am: 85678bfbbd
2018-04-12 01:06:13 -07:00
Andreas Gampe
eaa0bb2c7f
Merge "Revert "Greylist methods with varargs and intrinsics"" into pi-dev
...
am: 5ca4d29089
2018-04-12 00:56:11 -07:00
Milo Sredkov
85678bfbbd
Merge "Allow extra height for the smartreply buttons" into pi-dev
2018-04-12 07:51:54 +00:00
TreeHugger Robot
5ca4d29089
Merge "Revert "Greylist methods with varargs and intrinsics"" into pi-dev
2018-04-12 07:40:37 +00:00
Sungsoo Lim
3d1b7ee8b2
Merge "Fix possible NPE in MediaSessionManager" into pi-dev am: ed01dfba3e
...
am: ae93c58779
2018-04-12 00:13:37 -07:00
Sungsoo Lim
ae93c58779
Merge "Fix possible NPE in MediaSessionManager" into pi-dev
...
am: ed01dfba3e
2018-04-12 00:02:42 -07:00
TreeHugger Robot
ed01dfba3e
Merge "Fix possible NPE in MediaSessionManager" into pi-dev
2018-04-12 06:51:52 +00:00
Chen Xu
d500c00b27
Merge "Change getGroupIdLevel1() to use subId from TelephonyManager Instance" am: 18fe1cb2e1 am: a8df607460
...
am: 03fb807d3a
2018-04-11 23:38:50 -07:00
Chen Xu
03fb807d3a
Merge "Change getGroupIdLevel1() to use subId from TelephonyManager Instance" am: 18fe1cb2e1
...
am: a8df607460
2018-04-11 23:28:58 -07:00
Kevin Chyn
8499c25dbc
Merge "Use a protected receiver for the keyguard delayed actions" into pi-dev am: 08d79be6bd
...
am: aaf08cf76e
2018-04-11 23:28:46 -07:00
richard chou
3e7c7ca8e4
Reset SIM state if the subscription/slot is no longer active.
...
Reset the cached SIM state if the subscription and associated slot is not active.
Bug: 77702165
Bug: 75499020
Test: Nova team An-Cheng verified it manually.
Change-Id: Ic5adfbe637d29bd7e12e277e9d89d4ad56350adf
2018-04-12 06:28:32 +00:00
Kevin Chyn
aaf08cf76e
Merge "Use a protected receiver for the keyguard delayed actions" into pi-dev
...
am: 08d79be6bd
2018-04-11 23:20:09 -07:00
