Xin Li
40e0a0cb2b
[automerger skipped] Merge "DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history" into stage-aosp-master am: abaa7ead61 -s ours am: 6fbf8171af am: bf397e95fd
...
am: 089a3dc2c2 -s ours
am skip reason: subject contains skip directive
Change-Id: I9d706bd29d70848cd1d7a9c807353b32749eabfc
2019-08-26 13:21:35 -07:00
Xin Li
04e7cc0ee7
[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history am: bf9040d4f9 -s ours am: 377c17d1ea am: db21ccd28a
...
am: 5b74ad6a0f -s ours
am skip reason: subject contains skip directive
Change-Id: Ie46c2fbbeccf7e3bbe0430c6bc09f7286338801c
2019-08-26 12:39:36 -07:00
TreeHugger Robot
3f97f28037
Merge "Add OWNERS for media TV"
2019-08-26 19:20:27 +00:00
Xin Li
089a3dc2c2
[automerger skipped] Merge "DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history" into stage-aosp-master am: abaa7ead61 -s ours am: 6fbf8171af
...
am: bf397e95fd
Change-Id: I4f3111425ed9952206abf947f2b09f753bd39549
2019-08-26 12:18:31 -07:00
Yi Kong
e9fb00f9a3
[automerger skipped] Fix android-cloexec-pipe clang-tidy warning am: 9b00f181da -s ours am: 62e3c16301 -s ours am: db8ab235e2 -s ours
...
am: 3b66d7608c -s ours
am skip reason: change_id Iee772b5c3ed5e2af481e479dab19030f8419290a with SHA1 1fa946a2f2 is in history
Change-Id: I3784e80a3d011e435b4bd9f158a0ffdf5aea7635
2019-08-26 12:12:39 -07:00
Roshan Pius
137d28f2f4
[automerger skipped] Merge "NetworkStackClient: Refactor network stack process interaction" into qt-dev-plus-aosp am: 9f480e0b8a am: 50d95f3217 -s ours
...
am: 50217d590e -s ours
am skip reason: change_id I673581b0067b9a3f72dd68a3ab622c18183ebd2e with SHA1 f061a709b6 is in history
Change-Id: Ib3c0f4bbfcfef0a5fa92644ace80922ebdafb94c
2019-08-26 12:09:26 -07:00
Jared Henderson
a1ef1ea27f
Merge "Update Xbox BT controller mapping to support upcoming controller firmware update" am: 87700db4ef am: 7f1e92a654 am: b2cfc86e8b am: 37f8b552d3
...
am: 71b94722cb
Change-Id: If3d23854ba967939d61d095c0358b678ddcb68ac
2019-08-26 12:05:53 -07:00
Anna Trostanetski
67e1b54cad
Merge "Revert "Always apply compat changes to system apps."" am: 612c2c731d am: a105206a92 am: 9b42b7095d am: 6f5669ed78
...
am: 997b46ab36
Change-Id: I80f2950ddab8f8ec9aed0699c3e89ac862c1de72
2019-08-26 12:02:51 -07:00
Jay Patel
3a4aff83cf
Merge "Fix AVR compatibility." am: 9e4df4985a am: babd85e24d am: 4088527e0c am: 77c749611d
...
am: 44117eac73
Change-Id: If152556b4a2e4d8a175819be8131b5de69fe9cdd
2019-08-26 11:58:48 -07:00
Da Xing
e929d54210
[automerger skipped] Merge "DO NOT MERGE Crash app on foreground service notification error." am: 2eb5d0c183 -s ours am: 392130fee5 -s ours am: ec2c5c2e18 am: 2476002005
...
am: 28f41e7ea2 -s ours
am skip reason: subject contains skip directive
Change-Id: Ie876e8894ec5183d4fbb7ca4947e8460552e3208
2019-08-26 11:54:46 -07:00
Jack Yu
ac79d54b0b
[automerger skipped] Merge changes from topic "null_callback" am: 5ce391b313 am: 54e83aca93 am: e0afc80afb -s ours am: 3dba92b05c -s ours
...
am: 33b44ef558 -s ours
am skip reason: change_id Ica0b7b810ffd5416ffd1b2b61f7ebc4af0dcb8ce with SHA1 09ef1cb126 is in history
Change-Id: I01a99724861f35881a1b8005ccc05d98e332299f
2019-08-26 11:49:19 -07:00
Jack Yu
2c8887842c
[automerger skipped] Added debug messages and watchdog am: 594931f5d9 am: 75db0a70dd am: 966c2eb20d -s ours am: 1cf83928e5 -s ours
...
am: 64be6a44b4 -s ours
am skip reason: change_id I52dd126fddc1b1e8b18d5388a92aabaa3e2e48d5 with SHA1 36e2bfbaad is in history
Change-Id: Icfe8e4bc8a96e6aae26dcdbb3864d0ddd5e8f3bc
2019-08-26 11:49:04 -07:00
Xin Li
5b74ad6a0f
[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history am: bf9040d4f9 -s ours am: 377c17d1ea
...
am: db21ccd28a
Change-Id: Id06af92773fca6805509f766803d58d1026cc466
2019-08-26 11:36:46 -07:00
Yi Kong
3b66d7608c
[automerger skipped] Fix android-cloexec-pipe clang-tidy warning am: 9b00f181da -s ours am: 62e3c16301 -s ours
...
am: db8ab235e2 -s ours
am skip reason: change_id Iee772b5c3ed5e2af481e479dab19030f8419290a with SHA1 1fa946a2f2 is in history
Change-Id: I1f2e6cf5dcc20f60dd1f3be9223530db75612174
2019-08-26 11:33:55 -07:00
Roshan Pius
50217d590e
[automerger skipped] Merge "NetworkStackClient: Refactor network stack process interaction" into qt-dev-plus-aosp am: 9f480e0b8a
...
am: 50d95f3217 -s ours
am skip reason: change_id I673581b0067b9a3f72dd68a3ab622c18183ebd2e with SHA1 f061a709b6 is in history
Change-Id: Ib22c279b83105b8e61c05c15b06d902c1938fd43
2019-08-26 11:33:20 -07:00
Jared Henderson
71b94722cb
Merge "Update Xbox BT controller mapping to support upcoming controller firmware update" am: 87700db4ef am: 7f1e92a654 am: b2cfc86e8b
...
am: 37f8b552d3
Change-Id: Ica57750d5733f10a7ad69de83215c9c99a2613ca
2019-08-26 11:32:39 -07:00
Anna Trostanetski
997b46ab36
Merge "Revert "Always apply compat changes to system apps."" am: 612c2c731d am: a105206a92 am: 9b42b7095d
...
am: 6f5669ed78
Change-Id: I8b2b979c4f83139b0b6d589c06ddd0fb30808cc8
2019-08-26 11:31:52 -07:00
Jay Patel
44117eac73
Merge "Fix AVR compatibility." am: 9e4df4985a am: babd85e24d am: 4088527e0c
...
am: 77c749611d
Change-Id: Iab1720aa3db4602795a703aa12729e0c5cb1d635
2019-08-26 11:31:19 -07:00
Da Xing
28f41e7ea2
[automerger skipped] Merge "DO NOT MERGE Crash app on foreground service notification error." am: 2eb5d0c183 -s ours am: 392130fee5 -s ours am: ec2c5c2e18
...
am: 2476002005
Change-Id: Ie6cc66a3525379678a9362e9e31990adc85bc6e8
2019-08-26 11:30:35 -07:00
Jack Yu
33b44ef558
[automerger skipped] Merge changes from topic "null_callback" am: 5ce391b313 am: 54e83aca93 am: e0afc80afb -s ours
...
am: 3dba92b05c -s ours
am skip reason: change_id Ica0b7b810ffd5416ffd1b2b61f7ebc4af0dcb8ce with SHA1 09ef1cb126 is in history
Change-Id: Ib78d52fc87527346ebb96de70b4eff4c52b46b4f
2019-08-26 11:28:18 -07:00
Jack Yu
64be6a44b4
[automerger skipped] Added debug messages and watchdog am: 594931f5d9 am: 75db0a70dd am: 966c2eb20d -s ours
...
am: 1cf83928e5 -s ours
am skip reason: change_id I52dd126fddc1b1e8b18d5388a92aabaa3e2e48d5 with SHA1 36e2bfbaad is in history
Change-Id: I279add54ba84fd71c6b32788f14a551a31d6c779
2019-08-26 11:28:03 -07:00
Bo Hu
000fab8430
Merge "View Renderer: remove emulator hack"
2019-08-26 17:47:27 +00:00
TreeHugger Robot
6ffb81d821
Merge "Fix getting target SDK version for uid in PermissionManagerService."
2019-08-26 17:42:09 +00:00
Makoto Onuki
3cad27c294
Merge "Move DeviceIdle to the JS apex"
2019-08-26 17:40:10 +00:00
Oscar Shu
cf65493f1e
Merge changes from topics "macRandWhitelist", "paranoidSsidOptIn"
...
* changes:
[Mac rand] recording when the randomized mac is last changed
[MAC rand] add feature flag for aggressive mode per SSID
2019-08-26 17:11:49 +00:00
Pengquan Meng
2099cbac8e
resolve merge conflicts of 8f843170a4 to qt-qpr1-dev-plus-aosp
...
am: 8c1e4e80b1
Change-Id: Ice5bf7947d6539761fc1fb28121eccddb491aa08
2019-08-26 09:41:18 -07:00
Mathieu Chartier
5834544053
Merge "Add phenotype property for profiling system server"
2019-08-26 16:37:25 +00:00
TreeHugger Robot
43ea8ce596
Merge "Skip some duplicated tasks when booting from non-system user."
2019-08-26 16:22:57 +00:00
Ryan Mitchell
11fef4e7d4
Merge "Fix security issue in DynamicRefTable::load."
2019-08-26 16:06:34 +00:00
TreeHugger Robot
007ecbb859
Merge "Revert "Delete FalsingManager tests that are very flaky.""
2019-08-26 14:32:03 +00:00
bohu
677595fdc7
View Renderer: remove emulator hack
...
BUG: 139998916
Change-Id: Icae145fe19f37da71ea30eabbe57c011dddeae66
2019-08-26 13:13:01 +00:00
Pengquan Meng
8c1e4e80b1
resolve merge conflicts of 8f843170a4 to qt-qpr1-dev-plus-aosp
...
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I52368e2d4d0585bb4a3b9401f6b268408952fcc6
2019-08-26 00:18:52 -07:00
Bill Yi
6f9af93503
Merge "Import translations. DO NOT MERGE"
2019-08-26 04:38:17 +00:00
TreeHugger Robot
06f32dc333
Merge "Fix that Bluetooth device should not duplicate in the list"
2019-08-26 03:39:48 +00:00
Roshan Pius
845465c8e4
[automerger skipped] Merge "NetworkStackClient: Refactor network stack process interaction" into qt-qpr1-dev-plus-aosp
...
am: b402c73c4d -s ours
am skip reason: change_id I673581b0067b9a3f72dd68a3ab622c18183ebd2e with SHA1 7e6f5f5e08 is in history
Change-Id: I44b41fac6c90895ee796b1f363c2ae65213303c6
2019-08-25 20:33:51 -07:00
TreeHugger Robot
b402c73c4d
Merge "NetworkStackClient: Refactor network stack process interaction" into qt-qpr1-dev-plus-aosp
2019-08-26 03:12:07 +00:00
Jimmy Chen
9d4f41f27c
Merge "wifi: common name support in PPS-MO profile"
2019-08-26 02:00:59 +00:00
Bill Yi
8bd25aff2f
[automerger skipped] Import translations. DO NOT MERGE am: 8e24ea2b4c -s ours
...
am: 7c761462a6 -s ours
am skip reason: subject contains skip directive
Change-Id: I7b77a3fa16845d90f8a678be3b656d0a56f2ea86
2019-08-25 07:19:26 -07:00
Bill Yi
7c761462a6
[automerger skipped] Import translations. DO NOT MERGE
...
am: 8e24ea2b4c -s ours
am skip reason: subject contains skip directive
Change-Id: I2b9ce480ada705dafe132ddfd993bfdcc73c8664
2019-08-25 07:07:36 -07:00
Bill Yi
8e24ea2b4c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I360dde2e3d4eb2abc98c8bd3163ff8d9f7e41112
2019-08-25 01:08:16 -07:00
Bill Yi
86bddb6b61
Import translations. DO NOT MERGE
...
Change-Id: I1b367d8c64b9e83c549950410c306a04d0f68c72
Auto-generated-cl: translation import
2019-08-25 00:19:04 -07:00
Robert Shih
56c4d1520e
Merge "Add statsd atom for Legacy DRM usage"
2019-08-25 04:28:31 +00:00
Bill Yi
2524ed33c6
Merge "Import translations. DO NOT MERGE"
2019-08-24 20:59:18 +00:00
TreeHugger Robot
f05b3e95ee
Merge "Added flag to toggle acquire messages on keyguard"
2019-08-24 10:47:49 +00:00
TreeHugger Robot
4222abd060
Merge "Handles null outInfo in deleteSystemPackageLI"
2019-08-24 10:45:46 +00:00
TreeHugger Robot
2941abbc9b
Merge "Revert "The source of subtree chagnes should be the viewParent""
2019-08-24 10:41:25 +00:00
TreeHugger Robot
4c30dd52a9
Merge "Import translations. DO NOT MERGE"
2019-08-24 10:37:32 +00:00
TreeHugger Robot
254ebf6127
Merge "AttestedKeyPair: Address API review comments"
2019-08-24 10:31:29 +00:00
TreeHugger Robot
aaab0a09f1
Merge "Import translations. DO NOT MERGE"
2019-08-24 10:20:31 +00:00
Nagaraja
49ba074773
Merge "Added Part & Addr Constants." am: f5d5de8a0f am: 633db92447 am: 40efe816dd am: e83d4f6c7d
...
am: f7db1c403e
Change-Id: I2acd0021601741c9a7975f900d5d8ea36c4124cf
2019-08-24 01:44:24 -07:00