Tao Bao
7c8feecd92
Merge "Add a new API applyPayloadFd() of UpdateEngine" am: f4b0318d6f am: eca7403bcf
...
am: c009d8e067
2019-07-13 09:57:29 -07:00
Tao Bao
c009d8e067
Merge "Add a new API applyPayloadFd() of UpdateEngine" am: f4b0318d6f
...
am: eca7403bcf
2019-07-13 09:47:38 -07:00
Tao Bao
eca7403bcf
Merge "Add a new API applyPayloadFd() of UpdateEngine"
...
am: f4b0318d6f
2019-07-13 09:39:32 -07:00
Tao Bao
f4b0318d6f
Merge "Add a new API applyPayloadFd() of UpdateEngine"
2019-07-13 16:29:49 +00:00
Brad Ebinger
545a4c369e
Merge "Make RcsMessageStore a top level API" am: bac258f22e am: 53f6c34039
...
am: 36cc070c24
2019-07-12 15:23:16 -07:00
Brad Ebinger
36cc070c24
Merge "Make RcsMessageStore a top level API" am: bac258f22e
...
am: 53f6c34039
2019-07-12 15:01:58 -07:00
Brad Ebinger
53f6c34039
Merge "Make RcsMessageStore a top level API"
...
am: bac258f22e
2019-07-12 14:53:26 -07:00
Brad Ebinger
bac258f22e
Merge "Make RcsMessageStore a top level API"
2019-07-12 21:40:40 +00:00
Xiangyu/Malcolm Chen
dbb897ee22
Merge changes from topic "135105735" into qt-r1-dev
...
am: 896cdfa547
2019-07-12 10:43:52 -07:00
Xiangyu/Malcolm Chen
896cdfa547
Merge changes from topic "135105735" into qt-r1-dev
...
* changes:
Use new API to get mergedSubscriberIds based on grouping.
Provide @hide API to return merged IMSIs from grouping.
2019-07-12 17:19:48 +00:00
Michael Wright
d6bd615920
Merge "Read the high refresh rate blacklist from DeviceConfig." into qt-r1-dev
...
am: 6173ba7475
2019-07-11 20:52:21 -07:00
Brad Ebinger
0e93d73053
Add CAPABILITY_EMERGENCY_PREFERRED in PhoneAccount
...
Allow Telephony to mark a SIM PhoneAccount as
emergency preferred, meaning that Telecom will
override a user's PhoneAccount preference for
emergency calls if the PhoneAccount has the
CAPABILITY_EMERGENCY_PREFERRED capability.
Bug: 131203278
Test: Manual testing, Telecom/Telephony unit testing
Merged-In: If70d917cfb3d825f375d282012b8788d69a2f144
Change-Id: I88b8bbfa444f5445b2f0d6a1542c6406a19b240f
2019-07-11 17:55:37 -07:00
Treehugger Robot
f0d921c41a
Merge "Replace HashMap with ArrayMap for services"
2019-07-11 20:41:31 +00:00
Malcolm Chen
07fcb5bb24
Use new API to get mergedSubscriberIds based on grouping.
...
In addition, make mMergedSubscriberIds a list to fit usage of multi-SIM
devices.
Bug: 135105735
Bug: 137137221
Test: manual
Change-Id: I364262559789112f35b88f4c298463bf4af2e82a
2019-07-11 13:19:54 -07:00
Michael Wright
6a51b35a7d
Read the high refresh rate blacklist from DeviceConfig.
...
When available, we should read the high refresh rate blacklist from
DeviceConfig, and use the device's configured list as a default /
fallback. This lets us change the blacklist in the field in case we find
additional compatibility issues, or one of the developers fixes their
app and asks us to remove them from the blacklist.
Fixes: 132338514
Test: atest WmTests:HighRefreshRateBlacklistTest
Exempt-From-Owner-Approval: TBR
Merged-In: I984dab60eeafff01758ac38c3db6056b33f662a6
Change-Id: I984dab60eeafff01758ac38c3db6056b33f662a6
2019-07-11 16:26:35 +02:00
Andrew Lewis
17a248a7ec
Merge "Redact ISOBMFF boxes with 'free'" into qt-dev am: f68a201ebc
...
am: b8e0f62908
2019-07-11 06:38:34 -07:00
Andrew Lewis
b8e0f62908
Merge "Redact ISOBMFF boxes with 'free'" into qt-dev
...
am: f68a201ebc
2019-07-11 06:26:47 -07:00
Andrew Lewis
65ded6c655
Merge "Redact ISOBMFF boxes with 'free'" into qt-dev
...
am: f68a201ebc
2019-07-11 06:26:42 -07:00
Andrew Lewis
f68a201ebc
Merge "Redact ISOBMFF boxes with 'free'" into qt-dev
2019-07-11 13:10:59 +00:00
Treehugger Robot
5578077ad3
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master"
2019-07-11 03:52:58 +00:00
Andrew Lewis
4ec5fda3d6
Redact ISOBMFF boxes with 'free'
...
Test: atest MediaStore_Video_MediaTest android.os.RedactingFileDescriptorTest
Bug: 135499138
Change-Id: Idaa8ad30300d5427f91bb2543be3152881018cf6
2019-07-10 19:46:48 +01:00
Mathew Inwood
b6bb42b7b8
Merge "Add trackingBug to API used by chromium vebview." am: c25ad64386 am: 53507c3423
...
am: 737a7a0e4f
2019-07-10 06:50:15 -07:00
Mathew Inwood
737a7a0e4f
Merge "Add trackingBug to API used by chromium vebview." am: c25ad64386
...
am: 53507c3423
2019-07-10 06:39:08 -07:00
Mathew Inwood
53507c3423
Merge "Add trackingBug to API used by chromium vebview."
...
am: c25ad64386
2019-07-10 06:27:13 -07:00
Treehugger Robot
c25ad64386
Merge "Add trackingBug to API used by chromium vebview."
2019-07-10 12:59:59 +00:00
Steven Moreland
cdc0b2d3cd
Merge "AIDL it! IServiceManager" into stage-aosp-master am: 1c373c4361
...
am: 42762e7b4f
2019-07-09 15:36:56 -07:00
Steven Moreland
42762e7b4f
Merge "AIDL it! IServiceManager" into stage-aosp-master
...
am: 1c373c4361
2019-07-09 15:20:29 -07:00
Xin Li
626cac9fdf
DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
...
Bug: 136196576
Change-Id: I481d824726ae0260b42cd7a4acc1c6fce593c324
2019-07-09 15:13:36 -07:00
Steven Moreland
1c373c4361
Merge "AIDL it! IServiceManager" into stage-aosp-master
2019-07-09 21:49:26 +00:00
Svet Ganov
78de8a10cc
Merge "Update docs for UID_STATE" into qt-dev am: 261a2d62e2
...
am: f821b5df70
2019-07-09 11:08:44 -07:00
Svet Ganov
f3c177cc86
Merge "Update docs for UID_STATE" into qt-dev
...
am: 261a2d62e2
2019-07-09 11:01:30 -07:00
Svet Ganov
f821b5df70
Merge "Update docs for UID_STATE" into qt-dev
...
am: 261a2d62e2
2019-07-09 10:55:59 -07:00
TreeHugger Robot
261a2d62e2
Merge "Update docs for UID_STATE" into qt-dev
2019-07-09 17:25:49 +00:00
Fedor Kudasov
431d4415e0
Merge "Return NonNull and other imports" into stage-aosp-master am: ee24c6da27
...
am: 6619c84f7f
2019-07-09 07:46:55 -07:00
Fedor Kudasov
6619c84f7f
Merge "Return NonNull and other imports" into stage-aosp-master
...
am: ee24c6da27
2019-07-09 07:37:52 -07:00
Fedor Kudasov
c064c84b5f
Return NonNull and other imports
...
Change-Id: Ia38b13209b45d8228ac02f06663e4dc12be9de60
2019-07-09 14:19:04 +00:00
Fedor Kudasov
10fbf5b18a
Merge changes from topic "fix_master_build" am: 2e5319117a am: 8125047183
...
am: 95cc083588
2019-07-09 06:42:44 -07:00
Fedor Kudasov
95cc083588
Merge changes from topic "fix_master_build" am: 2e5319117a
...
am: 8125047183
2019-07-09 06:22:48 -07:00
Fedor Kudasov
8125047183
Merge changes from topic "fix_master_build"
...
am: 2e5319117a
2019-07-09 06:10:01 -07:00
Fedor Kudasov
2e5319117a
Merge changes from topic "fix_master_build"
...
* changes:
Revert "Cherry-pick the relevant parts of master change"
Revert "Remove providesRoutesToMostDestinations."
2019-07-09 09:32:23 +00:00
Fedor Kudasov
559e91e0ef
Revert "Cherry-pick the relevant parts of master change"
...
This reverts commit dd16d44fe8
2019-07-09 09:29:17 +00:00
Fedor Kudasov
e5cb0a2216
Revert "Remove providesRoutesToMostDestinations."
...
This reverts commit d85b09a06f
2019-07-09 09:23:25 +00:00
Neil Fuller
cc83885699
Merge "Switch widgets away from android.text.format.Time" am: db31e6d07a am: 8d96e17940
...
am: 19d4f4eb32
2019-07-09 02:05:28 -07:00
Neil Fuller
19d4f4eb32
Merge "Switch widgets away from android.text.format.Time" am: db31e6d07a
...
am: 8d96e17940
2019-07-09 01:56:25 -07:00
Neil Fuller
8d96e17940
Merge "Switch widgets away from android.text.format.Time"
...
am: db31e6d07a
2019-07-09 01:38:01 -07:00
Chalard Jean
c900f7e69b
Merge changes Ia43f8811,I7de4f672 am: 3ef04b8e3c am: cbaed4e7ba
...
am: 40b8170b09
2019-07-09 01:19:20 -07:00
Neil Fuller
db31e6d07a
Merge "Switch widgets away from android.text.format.Time"
2019-07-09 08:15:10 +00:00
Chalard Jean
40b8170b09
Merge changes Ia43f8811,I7de4f672 am: 3ef04b8e3c
...
am: cbaed4e7ba
2019-07-09 01:10:24 -07:00
Chalard Jean
cbaed4e7ba
Merge changes Ia43f8811,I7de4f672
...
am: 3ef04b8e3c
2019-07-09 00:56:57 -07:00
Svet Ganov
b83d9c1c2d
Specify the duration time base am: 6f672a3835
...
am: 947aeb09d9
2019-07-08 19:44:58 -07:00
