James Lin
643a1ff260
Merge "[RCS] Add carrier config "use_rcs_sip_options_bool" for check if SIP OPTIONS is supported"
2019-09-28 05:21:39 +00:00
TreeHugger Robot
312565f1be
Merge "Stop LockSettingsService from calling DevicePolicyManager directly"
2019-09-28 04:49:43 +00:00
jungshik
716ebd4dd0
Merge "Use NotoSansMyanmar (pure Unicode) fonts" am: b44f88b3c9 am: 47d023fb40 am: b5ccb7e1b9
...
am: 62b7c9e758
Change-Id: Ie51dda8d500849044f9010a799e16c635c0ccf78
2019-09-27 20:33:20 -07:00
Suprabh Shukla
a7d8de1c83
[automerger skipped] Merge "DO NOT MERGE revoke certain app-ops on suspend" into pi-dev am: 0e8f1fa5e9 -s ours am: c6a2982b86 -s ours am: 2fa2bae0fe -s ours am: 553b0cc110 -s ours
...
am: 8010b32072 -s ours
am skip reason: subject contains skip directive
Change-Id: I46259a86affb60f08acf93be3cc717c6b7232ac0
2019-09-27 20:31:17 -07:00
Suprabh Shukla
81acd40f21
[automerger skipped] Merge "Merge "DO NOT MERGE revoke certain app-ops on suspend" into qt-dev am: b036952896 am: 1e7e924881 am: 5918a560d1" into qt-qpr1-dev-plus-aosp
...
am: f5425a61c6 -s ours
am skip reason: subject contains skip directive
Change-Id: Ibfa270ba01cf763a4dec6c013a31b24f3d055650
2019-09-27 20:30:28 -07:00
Suprabh Shukla
783f182dda
[automerger skipped] Merge "DO NOT MERGE revoke certain app-ops on suspend" into pi-dev am: 0e8f1fa5e9 -s ours am: c6a2982b86 -s ours am: 2fa2bae0fe -s ours am: 7b0406196e -s ours
...
am: 94a7c3f1d5 -s ours
am skip reason: subject contains skip directive
Change-Id: I7a8b411d4f1fc258dc1ccb3a925cf8d449094db7
2019-09-27 20:29:45 -07:00
Suprabh Shukla
a3d4453254
[automerger skipped] Merge "DO NOT MERGE revoke certain app-ops on suspend am: 873e19f63f am: 53ca466732 am: 16acbaac55" into qt-qpr1-dev-plus-aosp
...
am: 73775b6d8e -s ours
am skip reason: subject contains skip directive
Change-Id: Idf7bc0b6fe2f48fb8b1b7bfb6ec804cd40ffc468
2019-09-27 20:29:00 -07:00
Suprabh Shukla
ad9c9552a5
[automerger skipped] Merge "DO NOT MERGE revoke certain app-ops on suspend" into qt-dev am: b036952896 am: 1e7e924881 am: bc34cefb47
...
am: 31705030b5 -s ours
am skip reason: subject contains skip directive
Change-Id: I903ffa978b34aa7c8da7ce5a71612ea3c59bb060
2019-09-27 20:28:14 -07:00
Suprabh Shukla
34a64d6915
[automerger skipped] DO NOT MERGE revoke certain app-ops on suspend am: 873e19f63f am: 53ca466732 am: 15c374d84b
...
am: 1ea52041e2 -s ours
am skip reason: subject contains skip directive
Change-Id: I10360b433b151fb2feceae1e21338bd656d5e5e7
2019-09-27 20:27:18 -07:00
jungshik
62b7c9e758
Merge "Use NotoSansMyanmar (pure Unicode) fonts" am: b44f88b3c9 am: 47d023fb40
...
am: b5ccb7e1b9
Change-Id: Ibc72c60e7f1568a45c6cea80d406f5d29fa61079
2019-09-27 20:12:58 -07:00
Suprabh Shukla
8010b32072
[automerger skipped] Merge "DO NOT MERGE revoke certain app-ops on suspend" into pi-dev am: 0e8f1fa5e9 -s ours am: c6a2982b86 -s ours am: 2fa2bae0fe -s ours
...
am: 553b0cc110 -s ours
am skip reason: change_id Ie95555856afdd56728125f7e60b6a78cf9fc0e58 with SHA1 873e19f63f is in history
Change-Id: Iece6fe6fae35e640abc0dda425953170eec3f310
2019-09-27 20:07:53 -07:00
Android Build Merger (Role)
f5425a61c6
Merge "Merge "DO NOT MERGE revoke certain app-ops on suspend" into qt-dev am: b036952896 am: 1e7e924881 am: 5918a560d1" into qt-qpr1-dev-plus-aosp
2019-09-28 03:04:39 +00:00
Suprabh Shukla
243fc4e057
Merge "DO NOT MERGE revoke certain app-ops on suspend" into qt-dev am: b036952896 am: 1e7e924881
...
am: 5918a560d1
Change-Id: Id2f2c868270d990f465b9d3948c235eef3544dc5
2019-09-27 20:03:53 -07:00
Suprabh Shukla
94a7c3f1d5
[automerger skipped] Merge "DO NOT MERGE revoke certain app-ops on suspend" into pi-dev am: 0e8f1fa5e9 -s ours am: c6a2982b86 -s ours am: 2fa2bae0fe -s ours
...
am: 7b0406196e -s ours
am skip reason: change_id Ie95555856afdd56728125f7e60b6a78cf9fc0e58 with SHA1 873e19f63f is in history
Change-Id: I534e1f1785e663f940c23670030b4828ded9fe4a
2019-09-27 20:03:30 -07:00
Android Build Merger (Role)
73775b6d8e
Merge "DO NOT MERGE revoke certain app-ops on suspend am: 873e19f63f am: 53ca466732 am: 16acbaac55" into qt-qpr1-dev-plus-aosp
2019-09-28 02:59:58 +00:00
Suprabh Shukla
05b7882dfb
DO NOT MERGE revoke certain app-ops on suspend am: 873e19f63f am: 53ca466732
...
am: 16acbaac55
Change-Id: If63d8f69689f1b75c75533830b7132490dc9946d
2019-09-27 19:59:19 -07:00
jungshik
b5ccb7e1b9
Merge "Use NotoSansMyanmar (pure Unicode) fonts" am: b44f88b3c9
...
am: 47d023fb40
Change-Id: I920fd37942467469f332092e8f279fce870bd8be
2019-09-27 19:58:58 -07:00
Suprabh Shukla
31705030b5
Merge "DO NOT MERGE revoke certain app-ops on suspend" into qt-dev am: b036952896 am: 1e7e924881
...
am: bc34cefb47
Change-Id: I416a941d9cb539c9277249ca96f6ab81c4e3204c
2019-09-27 19:58:25 -07:00
Suprabh Shukla
7b0406196e
[automerger skipped] Merge "DO NOT MERGE revoke certain app-ops on suspend" into pi-dev am: 0e8f1fa5e9 -s ours am: c6a2982b86 -s ours
...
am: 2fa2bae0fe -s ours
am skip reason: change_id Ie95555856afdd56728125f7e60b6a78cf9fc0e58 with SHA1 873e19f63f is in history
Change-Id: I55df6847fd9adecf7ac243cc398f71c83b09215d
2019-09-27 19:52:49 -07:00
Suprabh Shukla
1ea52041e2
DO NOT MERGE revoke certain app-ops on suspend am: 873e19f63f am: 53ca466732
...
am: 15c374d84b
Change-Id: Icd0fc56768f47f6152cd022edb1752aa3bb3a4ad
2019-09-27 19:52:40 -07:00
jungshik
47d023fb40
Merge "Use NotoSansMyanmar (pure Unicode) fonts"
...
am: b44f88b3c9
Change-Id: I1bf0297ccfb4a67654df24520c8e98d119d58d28
2019-09-27 19:52:17 -07:00
Suprabh Shukla
553b0cc110
[automerger skipped] Merge "DO NOT MERGE revoke certain app-ops on suspend" into pi-dev am: 0e8f1fa5e9 -s ours am: c6a2982b86 -s ours
...
am: 2fa2bae0fe -s ours
am skip reason: change_id Ie95555856afdd56728125f7e60b6a78cf9fc0e58 with SHA1 873e19f63f is in history
Change-Id: I19af5ee7f83feb9790ecff4a65972432248e390e
2019-09-27 19:51:31 -07:00
Suprabh Shukla
bc34cefb47
Merge "DO NOT MERGE revoke certain app-ops on suspend" into qt-dev am: b036952896
...
am: 1e7e924881
Change-Id: Ib09287a80e7fb68ac5e2533d3858120561cee6e0
2019-09-27 19:49:14 -07:00
Suprabh Shukla
5918a560d1
Merge "DO NOT MERGE revoke certain app-ops on suspend" into qt-dev am: b036952896
...
am: 1e7e924881
Change-Id: I7ba614a192b4aaaa36cc5cd7153cd654c1161505
2019-09-27 19:49:03 -07:00
Suprabh Shukla
15c374d84b
DO NOT MERGE revoke certain app-ops on suspend am: 873e19f63f
...
am: 53ca466732
Change-Id: I9487bfaf93255ca485ce8eacf940cc9748b39859
2019-09-27 19:44:46 -07:00
Suprabh Shukla
16acbaac55
DO NOT MERGE revoke certain app-ops on suspend am: 873e19f63f
...
am: 53ca466732
Change-Id: I5f7456bc746affacbb949a9883484dfb8aaf7234
2019-09-27 19:44:44 -07:00
jungshik
b44f88b3c9
Merge "Use NotoSansMyanmar (pure Unicode) fonts"
2019-09-28 02:40:04 +00:00
Suprabh Shukla
2fa2bae0fe
[automerger skipped] Merge "DO NOT MERGE revoke certain app-ops on suspend" into pi-dev am: 0e8f1fa5e9 -s ours
...
am: c6a2982b86 -s ours
am skip reason: change_id Ie95555856afdd56728125f7e60b6a78cf9fc0e58 with SHA1 873e19f63f is in history
Change-Id: I8c9e309eae92633cb6193f147f81d109cc812d7c
2019-09-27 19:38:34 -07:00
Suprabh Shukla
1e7e924881
Merge "DO NOT MERGE revoke certain app-ops on suspend" into qt-dev
...
am: b036952896
Change-Id: Ieb5d9cc6e8aee976069c7ebd0b8d01db9982d886
2019-09-27 19:31:55 -07:00
Suprabh Shukla
53ca466732
DO NOT MERGE revoke certain app-ops on suspend
...
am: 873e19f63f
Change-Id: I2447a90e4935e53fc0d55510bb50938fdaea23fa
2019-09-27 19:31:51 -07:00
Suprabh Shukla
c6a2982b86
[automerger skipped] Merge "DO NOT MERGE revoke certain app-ops on suspend" into pi-dev
...
am: 0e8f1fa5e9 -s ours
am skip reason: subject contains skip directive
Change-Id: I53678027aa329651d6d6c9652aee847ee36b9b30
2019-09-27 19:31:47 -07:00
TreeHugger Robot
94960e78bc
Merge "Informative error messages, update README"
2019-09-28 02:24:36 +00:00
Shuo Qian
f31d7e8edf
Merge "Integrate the active emergency session listener in TelephonyRegistry"
2019-09-28 02:18:54 +00:00
TreeHugger Robot
0e8f1fa5e9
Merge "DO NOT MERGE revoke certain app-ops on suspend" into pi-dev
2019-09-28 02:15:10 +00:00
TreeHugger Robot
b036952896
Merge "DO NOT MERGE revoke certain app-ops on suspend" into qt-dev
2019-09-28 02:08:05 +00:00
Bowgo Tsai
a1e6b2f2c4
Merge "Add /system_ext sepolicy support to SELinuxMMAC.java" am: 62031438a7 am: 5d0a0f151e am: ad6781d72a
...
am: 52c185db07
Change-Id: I9e7bf92a7653c777fb07cc8a28d9354c16c5c06f
2019-09-27 18:47:00 -07:00
Stan Iliev
56c5604e46
Merge changes from topic "textureview_readback" am: fc733e1d5e am: 7b5a8dfe4a am: bf35d178c5
...
am: 79e7d0807c
Change-Id: I3118b4677fe777f075f0890b156ca9afb79b5502
2019-09-27 18:44:47 -07:00
Nataniel Borges
f527648cef
Merge changes from topic "flicker-rotation" am: f2a739d5f0 am: 7b5f4f1261 am: 657f31a8d6
...
am: 0c5984e048
Change-Id: I6c9b8eb6f0efd9f005ab6d95b4b6bab835d2a91b
2019-09-27 18:43:23 -07:00
Nataniel Borges
f983e82b0e
New FlickerTests: Start app warm and cold at both 0 and 90 degrees am: d051c3b767 am: 4a77093a0d am: f6cfdd9582
...
am: 5ae09e51d7
Change-Id: I0294f04ffbcd9a8c83eb8d3037e3bac5da9a190e
2019-09-27 18:43:15 -07:00
Nataniel Borges
4d2e983754
New FlickerTests: Start IME alongside the app (0 and 90 degrees) am: 4bfe816030 am: af3a5e4969 am: 89170f532d
...
am: 691a0cf3a5
Change-Id: Iba4d40832d4fce45ec205ec290effb7dab2b6daa
2019-09-27 18:43:07 -07:00
Nataniel Borges
31787eb741
New FlickerTests: Start IME tests with app rotated by 90 degrees am: 89888bf124 am: 679b4f29a1 am: 0f41a6c7bc
...
am: 56c9bffabe
Change-Id: I598cb9c93b120a12d52bdf92e01e5d54f99c927f
2019-09-27 18:42:59 -07:00
Anna Trostanetski
eb4087d89b
Merge "Rate limit non statsd logs." am: e8e6390829 am: c1abc25905 am: 5912d35e17
...
am: fc8a18878a
Change-Id: Ia88d7f04944c5eece96df1942f8633f379b3780a
2019-09-27 18:42:12 -07:00
Bill Yi
7a7adab37f
[automerger skipped] Import translations. DO NOT MERGE am: 2a80fcd6a9 -s ours
...
am: cede11baff -s ours
am skip reason: subject contains skip directive
Change-Id: I2f05cb3ade4feb2f3706f69109f286c16494ecb9
2019-09-27 18:41:29 -07:00
Lorenzo Colitti
ce949d4dfb
Merge "Properly test TrafficController permissions on package updates." am: 0e45bfabfe am: e21f0cf185 am: 2673ecc9cd
...
am: 0df404502a
Change-Id: If94f4e0d7816adc978d95d2c1d8458fcd138447d
2019-09-27 18:40:44 -07:00
Kevin Chyn
316f7c2ed0
Merge changes from topic "face_slice_update-qt-qpr1-dev" into qt-qpr1-dev am: b61c1bb3ee
...
am: 1f75fa9b74
Change-Id: Ic5d8899f8211c61a6ee4eda56d288e3d1a3d1619
2019-09-27 18:38:14 -07:00
Bowgo Tsai
52c185db07
Merge "Add /system_ext sepolicy support to SELinuxMMAC.java" am: 62031438a7 am: 5d0a0f151e
...
am: ad6781d72a
Change-Id: Iddb8fc97bd0755817750e0e8db8a985499a4e89a
2019-09-27 18:17:53 -07:00
Bowgo Tsai
ad6781d72a
Merge "Add /system_ext sepolicy support to SELinuxMMAC.java" am: 62031438a7
...
am: 5d0a0f151e
Change-Id: I7093b2c74871ec1e6cf5933d86a1b5d17db83fcb
2019-09-27 18:04:44 -07:00
Bowgo Tsai
5d0a0f151e
Merge "Add /system_ext sepolicy support to SELinuxMMAC.java"
...
am: 62031438a7
Change-Id: Id09ffdb7f16a5b7886632ccf31a96ecc6243c9a7
2019-09-27 17:51:43 -07:00
Treehugger Robot
62031438a7
Merge "Add /system_ext sepolicy support to SELinuxMMAC.java"
2019-09-28 00:28:57 +00:00
TreeHugger Robot
08e59efeb6
Merge changes from topic "drag surface stuck"
...
* changes:
Fix drag surface would be stuck (1/2)
Revert "Fix drag and drop (3/3)"
Revert "Fix drag and drop (2/3)"
Revert "Fix drag and drop (1/3)"
2019-09-28 00:08:43 +00:00