Fabian Kozynski
c8672edd47
Merge "Fix dump Dependency"
2019-09-18 12:57:02 +00:00
Eran Messeri
f646df167a
Merge "KeyChain: Unify manual and programmatic key installation flows"
2019-09-18 12:16:58 +00:00
TreeHugger Robot
e02001e298
Merge "Marks app filtering interactions correctly"
2019-09-18 11:30:56 +00:00
Anna Trostanetski
03e5c28da9
[automerger skipped] Merge "Implement stats logging for Compatibility API." into stage-aosp-master am: 81e186ab99 am: 44b8ba5095
...
am: 28fa70f0e0 -s ours
am skip reason: change_id I80f07d0beb30c779c4bce70bebf2bb4ab22f6bfe with SHA1 01a2093248 is in history
Change-Id: I2e13e788bb58ac45356aa21c465662c10dd3f189
2019-09-18 04:07:49 -07: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
Anna Trostanetski
13cd9c0b1c
Merge "Implement stats logging for Compatibility API."
2019-09-18 10:32:47 +00:00
Alex Johnston
5c65fc9f80
Merge "Save password history length when requested quality is unspecified. Refactored code to remove duplication in writeToXml method in the DevicePolicyManagerService class."
2019-09-18 09:20:51 +00:00
Ryan Lin
a5cd980c37
Merge "Rename AccessibilityGestureInfo"
2019-09-18 08:53:06 +00:00
Chen Xu
627b3bffac
Merge "scrub unused telephony-common lib"
2019-09-18 06:46:04 +00:00
Cheonho Park
eba61578d3
Merge "Allow signing key rotation" into qt-qpr1-dev am: 8c0b496c97
...
am: f3bf40d91f
Change-Id: Id52bed7ab4e8c10f8df1a14db33842be5fb8b215
2019-09-17 22:35:47 -07: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
Chen Xu
8474c6b9b4
Merge "move IApnSourceService.aidl to android.service.carrier"
2019-09-18 04:06:44 +00:00
Jaegeuk Kim
b1a557c60f
Merge "IdleMaint: run more frequently during 3AM to 4AM" into qt-qpr1-dev am: 64c2d37df2
...
am: 42315b497f
Change-Id: I2b72673b2ca4c90650b5de12b889cdb0607f2179
2019-09-17 20:29:26 -07: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
6cc6909b30
Merge "Add isApplicationOnUicc API" am: 3dc68a9585 am: 2f3eb5d88f am: 5d7734c64e
...
am: 3b70d93efc
Change-Id: I65f26e60e79562b19cf4940bcbe64b73b92cba62
2019-09-17 19:59:35 -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
Jin Seok Park
0a2366d805
Merge "Add API to check if specified mime type is supported"
2019-09-18 02:34:40 +00: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
JW Wang
68c8910d5d
Remove a todo item
...
ObserverInternal#packages is a public final field which doesn't need a
getter.
Bug: 140598494
Test: atest PackageWatchdogTest
Change-Id: Ibe3e0b59bebe65b45147044f783a6c72e5bce258
2019-09-18 10:18:20 +08: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
9a416a8a61
[automerger skipped] Merge "Passing caller package name to setBluetoothTethering" into qt-qpr1-dev am: 27d33b157c -s ours
...
am: 2d2faf674d -s ours
am skip reason: change_id I2140398ad3bbc8076f729c843f0515c654553aaf with SHA1 560c3ac1dc is in history
Change-Id: I7f085ffd88b5e65b0645002d71496eb6a68264dc
2019-09-17 18:21:40 -07:00
Kweku Adams
d895ae2298
[automerger skipped] Merge "Enter quick doze with non-wakeup alarm." into qt-qpr1-dev am: 795ef47130
...
am: ae089b82bf -s ours
am skip reason: change_id I98bf4131b7b4a1006e37aa42bcbc7dda7e137d1d with SHA1 ecf98fb416 is in history
Change-Id: I6485554c2f88b21e911f49f728339c0734eac35d
2019-09-17 18:17:27 -07: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
lumark
3d3496076f
[automerger skipped] Merge "DO NOT MERGE Use realCallerId to check launch display for Bubbles" into qt-qpr1-dev am: fd20f775ac
...
am: 8684d86bad -s ours
am skip reason: subject contains skip directive
Change-Id: I07f8ab987685cf536abeb3dba0ba3b7ad27899d1
2019-09-17 18:05:47 -07:00
lumark
a6efc88add
[automerger skipped] DO NOT MERGE Use realCallerId to check launch display for Bubbles am: af0629a53a
...
am: 55f5540cb5 -s ours
am skip reason: subject contains skip directive
Change-Id: I6895fea5c7d73b0fc2c5aa786c7abf9f86fca933
2019-09-17 18:02:23 -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
TreeHugger Robot
eae6b54054
Merge "Add more system_server benchmarks"
2019-09-18 00:17:18 +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
c49dcd98b6
Merge "Add new onSmsStatusReportReceived() without message reference" am: e6901bc862 am: 79aaff47c6 am: 793c72e6f8
...
am: 3e812c1d12
Change-Id: I5fc06c6302da32ff250492fb4c870d0a2dafe562
2019-09-17 16:29:37 -07:00
Jaegeuk Kim
2391670ac9
Merge "Revert "IdleMaint: run more frequently during 3AM to 4AM""
2019-09-17 23:15:05 +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
Lucas Dupin
1b54c6cacc
Merge "Fix status bar flickering" into qt-qpr1-dev am: 89ebc7c1ad
...
am: 7654f1f956
Change-Id: I79487826b2043df089a2fb723172a7d64eec0e68
2019-09-17 16:06:45 -07:00
Brad Stenning
ef43c4c912
Merge "Adding scrim bubble to car's super_status_bar.xml" into qt-qpr1-dev am: 1c6c190919
...
am: 7f5aa900d2
Change-Id: Ie924bdad3b98d2b453b859b7fe3a73230136eebb
2019-09-17 16:03:37 -07:00
Yinglei Wang
aee3a9f714
Merge "Use -1 for ListView CollectionInfo"
2019-09-17 23:00:25 +00: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
Steven Moreland
feb275ecb9
Merge "HwBinder: don't rely on kernel headers." am: b0e6033182 am: 1201b1b438 am: c2af792f98
...
am: 0fbb9fb706
Change-Id: I4ce358173af397665b44c8a0943d34f301380ff7
2019-09-17 15:30:39 -07:00