Android Build Merger (Role)
17bcc8bc4b
Merge "Merge "apply empty transaction in startActivitySync" into qt-dev am: f928b661d9 am: 5cd874d792 am: 5d138b1d12" into qt-qpr1-dev-plus-aosp
2019-08-14 09:01:03 +00:00
Prabir Pradhan
fd79695947
Merge "apply empty transaction in startActivitySync" into qt-dev am: f928b661d9 am: 5cd874d792
...
am: 5d138b1d12
2019-08-14 02:00:38 -07:00
Prabir Pradhan
a47f176420
Merge "apply empty transaction in startActivitySync" into qt-dev am: f928b661d9 am: 5cd874d792
...
am: fa6f50e13d
2019-08-14 02:00:18 -07:00
Prabir Pradhan
5d138b1d12
Merge "apply empty transaction in startActivitySync" into qt-dev am: f928b661d9
...
am: 5cd874d792
2019-08-14 01:53:22 -07:00
Prabir Pradhan
fa6f50e13d
Merge "apply empty transaction in startActivitySync" into qt-dev am: f928b661d9
...
am: 5cd874d792
2019-08-14 01:53:13 -07:00
Prabir Pradhan
5cd874d792
Merge "apply empty transaction in startActivitySync" into qt-dev
...
am: f928b661d9
2019-08-14 01:40:41 -07:00
TreeHugger Robot
f928b661d9
Merge "apply empty transaction in startActivitySync" into qt-dev
2019-08-14 06:42:05 +00:00
Wei Wang
cfecc72b28
Merge "ThermalService: add event log when temperature changed" into qt-qpr1-dev
...
am: a046613c02
2019-08-13 20:58:27 -07:00
Wei Wang
a046613c02
Merge "ThermalService: add event log when temperature changed" into qt-qpr1-dev
2019-08-14 03:41:44 +00:00
Brad Ebinger
ce95274ae6
Merge "Modify RCS UCE APIs to use AIDL Interfaces." am: 4204a6017e am: c64c204f59 am: 7e3661be1e
...
am: a33d1aed85
2019-08-13 17:32:54 -07:00
Brad Ebinger
a33d1aed85
Merge "Modify RCS UCE APIs to use AIDL Interfaces." am: 4204a6017e am: c64c204f59
...
am: 7e3661be1e
2019-08-13 17:21:23 -07:00
Lucas Dupin
a035bd1356
Merge "Fix double auth issue" into qt-qpr1-dev
...
am: 07d866a10e
2019-08-13 16:53:02 -07:00
Brad Ebinger
7e3661be1e
Merge "Modify RCS UCE APIs to use AIDL Interfaces." am: 4204a6017e
...
am: c64c204f59
2019-08-13 16:51:51 -07:00
Brad Ebinger
c64c204f59
Merge "Modify RCS UCE APIs to use AIDL Interfaces."
...
am: 4204a6017e
2019-08-13 16:34:41 -07:00
TreeHugger Robot
07d866a10e
Merge "Fix double auth issue" into qt-qpr1-dev
2019-08-13 23:10:04 +00:00
Felipe Leme
b27cd42b1a
Merge "Don't start intelligence services that are not provided by the OEM." into qt-qpr1-dev
...
am: 4e8070890a
2019-08-13 15:50:33 -07:00
Brad Ebinger
4204a6017e
Merge "Modify RCS UCE APIs to use AIDL Interfaces."
2019-08-13 22:46:18 +00:00
TreeHugger Robot
4e8070890a
Merge "Don't start intelligence services that are not provided by the OEM." into qt-qpr1-dev
2019-08-13 21:52:56 +00:00
Wei Wang
d878389077
ThermalService: add event log when temperature changed
...
Bug: 126562025
Test: Use emul_temp to test event log
Change-Id: I4271d226f106cfd61960f858429de8042fb5a7c8
(cherry picked from commit d295b27c3a
2019-08-13 21:14:33 +00:00
Vagdevi Kondeti
2f382ec54b
Merge "[AT&T] Add key to show 4g for 3g RAT." into qt-r1-dev am: d7a23cc714
...
am: 0ee63991f8
2019-08-13 12:23:57 -07:00
Vagdevi Kondeti
360363dcf7
Merge "[AT&T] Add key to show 4g for 3g RAT." into qt-r1-dev am: d7a23cc714
...
am: 0e3973b1b0
2019-08-13 12:14:29 -07:00
Vagdevi Kondeti
0ee63991f8
Merge "[AT&T] Add key to show 4g for 3g RAT." into qt-r1-dev
...
am: d7a23cc714
2019-08-13 12:07:32 -07:00
Vagdevi Kondeti
0e3973b1b0
Merge "[AT&T] Add key to show 4g for 3g RAT." into qt-r1-dev
...
am: d7a23cc714
2019-08-13 12:07:31 -07:00
Vagdevi Kondeti
d7a23cc714
Merge "[AT&T] Add key to show 4g for 3g RAT." into qt-r1-dev
2019-08-13 18:57:29 +00:00
Miguel de Dios
b6e5cbe925
Merge "bootanimation: Change bootanim ioprio to highest in IOPRIO_CLASS_RT" into qt-r1-dev am: f64c698ec7
...
am: 961d48ab5c
2019-08-13 11:26:59 -07:00
Miguel de Dios
d0f297fc6a
Merge "bootanimation: Change bootanim ioprio to highest in IOPRIO_CLASS_RT" into qt-r1-dev am: f64c698ec7
...
am: ccdc532426
2019-08-13 11:24:51 -07:00
Pinyao Ting
ba45d8a844
Merge "fixes a security vulnerability in slice provider" into qt-qpr1-dev
...
am: 69018b0325
2019-08-13 11:20:04 -07:00
Miguel de Dios
ccdc532426
Merge "bootanimation: Change bootanim ioprio to highest in IOPRIO_CLASS_RT" into qt-r1-dev
...
am: f64c698ec7
2019-08-13 11:13:49 -07:00
Miguel de Dios
961d48ab5c
Merge "bootanimation: Change bootanim ioprio to highest in IOPRIO_CLASS_RT" into qt-r1-dev
...
am: f64c698ec7
2019-08-13 11:13:41 -07:00
Pinyao Ting
69018b0325
Merge "fixes a security vulnerability in slice provider" into qt-qpr1-dev
2019-08-13 18:04:29 +00:00
Brad Ebinger
1c3d8399ed
[automerger skipped] Merge "Prevent Infinite Recursion in Telecom Sessions" am: 8dec6de25a am: 4bccabef90 am: 7d6a9dc4e8
...
am: bbbe4b1c3913f23a8580
2019-08-13 11:01:28 -07:00
Brad Ebinger
bbbe4b1c39
Merge "Prevent Infinite Recursion in Telecom Sessions" am: 8dec6de25a am: 4bccabef90
...
am: 7d6a9dc4e8
2019-08-13 10:49:23 -07:00
TreeHugger Robot
f64c698ec7
Merge "bootanimation: Change bootanim ioprio to highest in IOPRIO_CLASS_RT" into qt-r1-dev
2019-08-13 17:45:57 +00:00
Brad Ebinger
7d6a9dc4e8
Merge "Prevent Infinite Recursion in Telecom Sessions" am: 8dec6de25a
...
am: 4bccabef90
2019-08-13 10:37:21 -07:00
Brad Ebinger
4bccabef90
Merge "Prevent Infinite Recursion in Telecom Sessions"
...
am: 8dec6de25a
2019-08-13 10:25:44 -07:00
Lucas Dupin
7a0e5bcdd3
Fix double auth issue
...
This was a regression from a security fix b/135289187
Test: reach, auth, swipe up
Test: reach, auth, ait for timeout, reach again
Fixes: 138851575
Change-Id: Icd457dc79cb6f86a7cbb22a78ee80ebfbb4380a7
Merged-In: Icd457dc79cb6f86a7cbb22a78ee80ebfbb4380a7
2019-08-13 17:21:03 +00:00
Brad Ebinger
8dec6de25a
Merge "Prevent Infinite Recursion in Telecom Sessions"
2019-08-13 17:10:53 +00:00
Mark Chien
4e8eeb93c9
Merge "Don't allow upstream if entitlement don't know any downstream" am: 161814ffb1 am: 538bc0fe4f am: 5d2bb5b544
...
am: 4fbf46cdc5
2019-08-13 03:13:44 -07:00
Mark Chien
4fbf46cdc5
Merge "Don't allow upstream if entitlement don't know any downstream" am: 161814ffb1 am: 538bc0fe4f
...
am: 5d2bb5b544
2019-08-13 03:07:28 -07:00
Mark Chien
5d2bb5b544
Merge "Don't allow upstream if entitlement don't know any downstream" am: 161814ffb1
...
am: 538bc0fe4f
2019-08-13 03:01:31 -07:00
Mark Chien
538bc0fe4f
Merge "Don't allow upstream if entitlement don't know any downstream"
...
am: 161814ffb1
2019-08-13 02:49:09 -07:00
Mark Chien
161814ffb1
Merge "Don't allow upstream if entitlement don't know any downstream"
2019-08-13 09:36:16 +00:00
Android Build Merger (Role)
cf553766dd
Merge "Merge "Freezing screen when dismiss pip if orientation is going to change." into qt-r1-dev am: 41b006d8d6 am: 366a6e9995" into qt-qpr1-dev-plus-aosp
2019-08-13 04:52:09 +00:00
wilsonshih
c87cd28a3d
Merge "Freezing screen when dismiss pip if orientation is going to change." into qt-r1-dev am: 41b006d8d6
...
am: 366a6e9995
2019-08-12 21:51:24 -07:00
wilsonshih
c8f1c61a62
Merge "Freezing screen when dismiss pip if orientation is going to change." into qt-r1-dev am: 41b006d8d6
...
am: 669b8963f6
2019-08-12 21:51:20 -07:00
wilsonshih
669b8963f6
Merge "Freezing screen when dismiss pip if orientation is going to change." into qt-r1-dev
...
am: 41b006d8d6
2019-08-12 21:41:53 -07:00
wilsonshih
366a6e9995
Merge "Freezing screen when dismiss pip if orientation is going to change." into qt-r1-dev
...
am: 41b006d8d6
2019-08-12 21:41:45 -07:00
TreeHugger Robot
41b006d8d6
Merge "Freezing screen when dismiss pip if orientation is going to change." into qt-r1-dev
2019-08-13 04:09:12 +00:00
markchien
426311bcb5
Don't allow upstream if entitlement don't know any downstream
...
In case tethering donwstream is setup but don't ask EntitlementManager
to run provisioning. Cellular upstream should not be allowed if
EntilementManager don't have any donwstream record.
Bug: 134649258
Test: -build, flash, boot
-manual test with carrier SIM
Change-Id: I609722c79f0a45a1c2164d39721ef5883e436feb
2019-08-13 02:28:41 +00:00
Leland Miller
433441998b
Merge "Add documentation for Locked Messages" am: 3e85da2d89 am: 332f0a4ae8 am: 568f8bff01
...
am: 6d4e65a34b
2019-08-12 19:04:44 -07:00
