Hongwei Wang
a7c3590f94
Merge "Enables back gesture nav in screen pinning" into qt-r1-dev
...
am: f8108f81cc
2019-08-14 14:30:56 -07:00
Hongwei Wang
f8108f81cc
Merge "Enables back gesture nav in screen pinning" into qt-r1-dev
2019-08-14 20:50:57 +00:00
Kevin Hufnagle
634aeea4b2
Merge "docs: Added desc. of launcher app criteria in Q" into qt-dev am: a5e5c177d1
...
am: ae80734298
2019-08-14 13:34:50 -07:00
Kevin Hufnagle
81fc14bb79
Merge "docs: Added desc. of launcher app criteria in Q" into qt-dev am: a5e5c177d1
...
am: 5f38478989
2019-08-14 13:32:06 -07:00
Android Build Merger (Role)
2d944788b5
Merge "Merge "docs: Correct sensor runtime permission documentation" into qt-dev am: 119f1220cd am: 6710441150" into qt-r1-dev-plus-aosp
2019-08-14 20:26:21 +00:00
Brian Duddie
6ce9876d91
Merge "docs: Correct sensor runtime permission documentation" into qt-dev am: 119f1220cd
...
am: 6710441150
2019-08-14 13:25:41 -07:00
Brian Duddie
6b15b773a3
Merge "docs: Correct sensor runtime permission documentation" into qt-dev am: 119f1220cd
...
am: 7eeb6f60f9
2019-08-14 13:23:37 -07:00
Kevin Hufnagle
ae80734298
Merge "docs: Added desc. of launcher app criteria in Q" into qt-dev
...
am: a5e5c177d1
2019-08-14 13:23:33 -07:00
Kevin Hufnagle
5f38478989
Merge "docs: Added desc. of launcher app criteria in Q" into qt-dev
...
am: a5e5c177d1
2019-08-14 13:16:39 -07:00
Brian Duddie
6710441150
Merge "docs: Correct sensor runtime permission documentation" into qt-dev
...
am: 119f1220cd
2019-08-14 13:10:45 -07:00
Brian Duddie
7eeb6f60f9
Merge "docs: Correct sensor runtime permission documentation" into qt-dev
...
am: 119f1220cd
2019-08-14 13:09:45 -07:00
Kevin Hufnagle
a5e5c177d1
Merge "docs: Added desc. of launcher app criteria in Q" into qt-dev
2019-08-14 19:22:11 +00:00
Brian Duddie
119f1220cd
Merge "docs: Correct sensor runtime permission documentation" into qt-dev
2019-08-14 17:32:05 +00:00
Adrian Roos
f0c2d88a24
Merge "API: Explicitly track incompatibilities with previous API versions" am: 5f76164a65 am: 5f00bf12f4
...
am: 285725f7b0
2019-08-14 08:26:54 -07:00
Adrian Roos
285725f7b0
Merge "API: Explicitly track incompatibilities with previous API versions" am: 5f76164a65
...
am: 5f00bf12f4
2019-08-14 08:18:14 -07:00
Adrian Roos
5f00bf12f4
Merge "API: Explicitly track incompatibilities with previous API versions"
...
am: 5f76164a65
2019-08-14 08:11:37 -07:00
Adrian Roos
5f76164a65
Merge "API: Explicitly track incompatibilities with previous API versions"
2019-08-14 14:39:18 +00:00
Chiachang Wang
5e994ea02c
Merge "Get resource based on subId for multi-SIM" am: 55752cf8d4 am: 2afb11fbc8
...
am: 2b7f2fbb5b
2019-08-14 04:54:59 -07:00
Chiachang Wang
2b7f2fbb5b
Merge "Get resource based on subId for multi-SIM" am: 55752cf8d4
...
am: 2afb11fbc8
2019-08-14 04:39:23 -07:00
Chiachang Wang
2afb11fbc8
Merge "Get resource based on subId for multi-SIM"
...
am: 55752cf8d4
2019-08-14 04:30:57 -07:00
Chiachang Wang
55752cf8d4
Merge "Get resource based on subId for multi-SIM"
2019-08-14 10:56:27 +00:00
Android Build Merger (Role)
a761c84624
Merge "Merge "apply empty transaction in startActivitySync" into qt-dev am: f928b661d9 am: d8006ca972" into qt-r1-dev-plus-aosp
2019-08-14 08:53:56 +00:00
Prabir Pradhan
5bf60055d4
Merge "apply empty transaction in startActivitySync" into qt-dev am: f928b661d9
...
am: d8006ca972
2019-08-14 01:53:30 -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
5cd874d792
Merge "apply empty transaction in startActivitySync" into qt-dev
...
am: f928b661d9
2019-08-14 01:40:41 -07:00
Prabir Pradhan
d8006ca972
Merge "apply empty transaction in startActivitySync" into qt-dev
...
am: f928b661d9
2019-08-14 01:39:18 -07:00
TreeHugger Robot
f928b661d9
Merge "apply empty transaction in startActivitySync" into qt-dev
2019-08-14 06:42:05 +00:00
Chiachang Wang
5f8ac27d79
Get resource based on subId for multi-SIM
...
The resource loading is done based on the last SIM to come up
which is not a deterministic design. Thus, update the way to get
the resource based on the subId.
Test: atest FrameworksNetTests
Test: manually test with avoid bad wifi feature supported sim
Bug: 138956509
Change-Id: Ib5b085d97103889600773d269e03b939c29ca47d
2019-08-14 13:56:37 +08: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
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
Brad Ebinger
4204a6017e
Merge "Modify RCS UCE APIs to use AIDL Interfaces."
2019-08-13 22:46:18 +00: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
d7a23cc714
Merge "[AT&T] Add key to show 4g for 3g RAT." into qt-r1-dev
2019-08-13 18:57:29 +00:00
Brian Duddie
0fcaef12c0
docs: Correct sensor runtime permission documentation
...
The ACTIVITY_RECOGNITION permission applies to TYPE_STEP_DETECTOR, not
TYPE_GEOMAGNETIC_ROTATION_VECTOR.
Bug: 139363621
Test: n/a, comment update only
Change-Id: Ibce74be1e704ded04ae710988d0e03df43ab1cf9
2019-08-13 18:48:26 +00: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
Hongwei Wang
c0cc6218aa
Enables back gesture nav in screen pinning
...
Bug: 138969972
Test: Back gesture in screen pinning mode
Change-Id: I0ddb7a6e7978e7ec82d7949048e75147c5ece3c8
2019-08-13 10:50:43 -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
Brad Ebinger
8dec6de25a
Merge "Prevent Infinite Recursion in Telecom Sessions"
2019-08-13 17:10:53 +00: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
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
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
6d4e65a34b
Merge "Add documentation for Locked Messages" am: 3e85da2d89 am: 332f0a4ae8
...
am: 568f8bff01
2019-08-12 18:43:35 -07:00
