Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
428,297 Commits 3 Branches 0 Tags
7c8feecd929e1aa7e05829ca709cc5ed6f18b185
Commit Graph

104459 Commits

Author SHA1 Message Date
Tao Bao
7c8feecd92 Merge "Add a new API applyPayloadFd() of UpdateEngine" am: f4b0318d6f am: eca7403bcf 
am: c009d8e067

Change-Id: I1f464891e522c58bfc0aa958a5fed1e00bbc01d2
 2019-07-13 09:57:29 -07:00
Tao Bao
c009d8e067 Merge "Add a new API applyPayloadFd() of UpdateEngine" am: f4b0318d6f 
am: eca7403bcf

Change-Id: I39b71250baaf7796af4fca4d875ed338a3985f96
 2019-07-13 09:47:38 -07:00
Tao Bao
eca7403bcf Merge "Add a new API applyPayloadFd() of UpdateEngine" 
am: f4b0318d6f

Change-Id: I771090d681ca565392a9aaeb8ecd60026b572ae3
 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

Change-Id: Iaf09d213817a8df251e1d846bd50d7a571960b5c
 2019-07-12 15:23:16 -07:00
Brad Ebinger
36cc070c24 Merge "Make RcsMessageStore a top level API" am: bac258f22e 
am: 53f6c34039

Change-Id: Id6eba925aef3a1af812039372bf5e2e87fcbb35e
 2019-07-12 15:01:58 -07:00
Brad Ebinger
53f6c34039 Merge "Make RcsMessageStore a top level API" 
am: bac258f22e

Change-Id: If235ead8a75dc080e1e129d83bf7f24c3c996d8c
 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

Change-Id: Ie661fdc8a29645fa1b319cf1db8a896a8d21deae
 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

Change-Id: Ifcbac79c98889f3b0f1463537f5e179164e8075a
 2019-07-11 20:52:21 -07:00
TreeHugger Robot
6173ba7475 Merge "Read the high refresh rate blacklist from DeviceConfig." into qt-r1-dev 2019-07-12 03:22:35 +00: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
Beverly
189c662b0e Merge "Adjust window rounded corners" into qt-r1-dev 
am: dcba632b41

Change-Id: Icbd2513a96469ae187f2624a289982261478d475
 2019-07-11 13:34:06 -07: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
TreeHugger Robot
dcba632b41 Merge "Adjust window rounded corners" into qt-r1-dev 2019-07-11 20:01:41 +00: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

Change-Id: Icacc228d3e473e2f1fea2ff68753064bf4f6ccd6
 2019-07-11 06:38:34 -07:00
Andrew Lewis
b8e0f62908 Merge "Redact ISOBMFF boxes with 'free'" into qt-dev 
am: f68a201ebc

Change-Id: I26ca8aac1b2c29e536f8d798ada3d3b269d6dc1e
 2019-07-11 06:26:47 -07:00
Andrew Lewis
65ded6c655 Merge "Redact ISOBMFF boxes with 'free'" into qt-dev 
am: f68a201ebc

Change-Id: I4755c6f884958dce01e06aa5a889f06e035f1f1c
 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
Daniel Sandler
ea28adf7de Merge "Q card." into qt-dev am: 13de667fa6 
am: 59fdc5ca76

Change-Id: Ia448d7b73d88f69ab53b0cd888bd25c242aa6d4f
 2019-07-10 21:31:55 -07:00
Daniel Sandler
69a42c8217 Merge "Q card." into qt-dev 
am: 13de667fa6

Change-Id: I844b8a49d78988b4bf5cffbce04c9b4b4e3469ca
 2019-07-10 21:21:31 -07:00
Daniel Sandler
59fdc5ca76 Merge "Q card." into qt-dev 
am: 13de667fa6

Change-Id: Ia30df6e52c78381860782b282125d9deef9511b5
 2019-07-10 21:21:30 -07: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
Beverly
72dbd11ccd Adjust window rounded corners 
Test: manual
Fixes: 136652290
Change-Id: I969b00528e269da16021387cb8298e05aeeb63ab
 2019-07-10 14:00:17 -04:00
Dan Sandler
8c7b8cbd39 Q card. 
(Goodbye, hypno-P and your '90s tech magazine color palette.)

Bug: 123903304
Test: adb shell am start -n android/com.android.internal.app.PlatLogoActivity
Test: adb shell am start -c com.android.internal.category.PLATLOGO -a android.intent.action.MAIN
Test: adb shell am start -n com.android.egg/.paint.PaintActivity # still works
Change-Id: I4865024a14b6a78e7a043c56d2330b5f9dd214c6
Merged-In: I4865024a14b6a78e7a043c56d2330b5f9dd214c6
 2019-07-10 17:21:30 +00:00
Mathew Inwood
b6bb42b7b8 Merge "Add trackingBug to API used by chromium vebview." am: c25ad64386 am: 53507c3423 
am: 737a7a0e4f

Change-Id: I20f16a26e566eaf55d11be09b8050e0185cf8f81
 2019-07-10 06:50:15 -07:00
Mathew Inwood
737a7a0e4f Merge "Add trackingBug to API used by chromium vebview." am: c25ad64386 
am: 53507c3423

Change-Id: Iaa8be1cd02acfb8b271179aba0a2ceef2cd87e56
 2019-07-10 06:39:08 -07:00
Mathew Inwood
53507c3423 Merge "Add trackingBug to API used by chromium vebview." 
am: c25ad64386

Change-Id: I45a07ef1d02e4c18dc63bc3333bb0fcf40aa9da5
 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

Change-Id: Ib1abcd696eb043072bacfd74aefae8951586f866
 2019-07-09 15:36:56 -07:00
Steven Moreland
42762e7b4f Merge "AIDL it! IServiceManager" into stage-aosp-master 
am: 1c373c4361

Change-Id: Ic4fd51c924e7046395cacc7776422c0c185ce9cf
 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

Change-Id: Ia293f2ea0fb56d8b03eadbedb831895fdb3e80bd
 2019-07-09 11:08:44 -07:00
Svet Ganov
f3c177cc86 Merge "Update docs for UID_STATE" into qt-dev 
am: 261a2d62e2

Change-Id: I259b70dc290ee1dccfb5768496e362965a75dadf
 2019-07-09 11:01:30 -07:00
Svet Ganov
f821b5df70 Merge "Update docs for UID_STATE" into qt-dev 
am: 261a2d62e2

Change-Id: Ibdca805d9105e60955b8258409752f13305b57ed
 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

Change-Id: I2b5f7da15051c57b2050b78100b69e87ebbaf989
 2019-07-09 07:46:55 -07:00
Fedor Kudasov
6619c84f7f Merge "Return NonNull and other imports" into stage-aosp-master 
am: ee24c6da27

Change-Id: Ic584b85e710fbb2486cab27861adedd97789f73b
 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

Change-Id: I3f5ec7c9b170e5f168a300a86364559ea88e0c93
 2019-07-09 06:42:44 -07:00
Fedor Kudasov
95cc083588 Merge changes from topic "fix_master_build" am: 2e5319117a 
am: 8125047183

Change-Id: I07f171aa63d97debebfb0a7d86cd0ef53a986d29
 2019-07-09 06:22:48 -07:00
Fedor Kudasov
8125047183 Merge changes from topic "fix_master_build" 
am: 2e5319117a

Change-Id: If49999e7ce6149e847a678b03ccf8b4549f8365b
 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.

Reason for revert: multiple build breakages b/137069068

Change-Id: If48bfa2d2cab0877a053743b3ec53820d0c4ed6b
 2019-07-09 09:29:17 +00:00
Fedor Kudasov
e5cb0a2216 Revert "Remove providesRoutesToMostDestinations." 
This reverts commit d85b09a06f.

Reason for revert: multiple build breakages b/137069068

Change-Id: I60a4f71e13fe82f970b177a07c0b58439cbc64ff
 2019-07-09 09:23:25 +00:00