Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
423,531 Commits 3 Branches 0 Tags
1b027edda124a35060952ca7026d0385f853d3a2
Commit Graph

94328 Commits

Author SHA1 Message Date
Adrian Roos
1b027edda1 Merge "AM: make isHighEndGfx TestApi" into qt-dev 
am: 2ac934280c

Change-Id: Ib531628ddd2fe1f4f5231f3892740b5dcbcfaf0d
 2019-07-16 09:30:05 -07:00
TreeHugger Robot
2ac934280c Merge "AM: make isHighEndGfx TestApi" into qt-dev 2019-07-16 16:11:19 +00:00
Adrian Roos
5af40871ea AM: make isHighEndGfx TestApi 
Bug: 136784434
Test: n/a
Change-Id: Ie26de8dcf64a02b7757d4f705485cdcb7470f511
 2019-07-15 12:05:54 +02: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
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
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
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
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
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
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
f3c177cc86 Merge "Update docs for UID_STATE" into qt-dev 
am: 261a2d62e2

Change-Id: I259b70dc290ee1dccfb5768496e362965a75dadf
 2019-07-09 11:01:30 -07:00
TreeHugger Robot
261a2d62e2 Merge "Update docs for UID_STATE" into qt-dev 2019-07-09 17:25:49 +00: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
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
Neil Fuller
19d4f4eb32 Merge "Switch widgets away from android.text.format.Time" am: db31e6d07a 
am: 8d96e17940

Change-Id: I497266b9a4805b356ebab6deca215020627cfd6e
 2019-07-09 01:56:25 -07:00
Neil Fuller
8d96e17940 Merge "Switch widgets away from android.text.format.Time" 
am: db31e6d07a

Change-Id: I550b2c7ac5e3e5b07eda51c190c354e5236a561e
 2019-07-09 01:38:01 -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

Change-Id: I61c1649e4dd6ae7f9e522fede22f678863ee603f
 2019-07-09 01:10:24 -07:00
Chalard Jean
cbaed4e7ba Merge changes Ia43f8811,I7de4f672 
am: 3ef04b8e3c

Change-Id: Ifcacd81d343a29b17fdb79f4c8b54c89a293a2b8
 2019-07-09 00:56:57 -07:00
Svet Ganov
7922ef60fc Specify the duration time base 
am: 6f672a3835

Change-Id: I55a7866ab35c6c652b378ced6cea8c63c1a14016
 2019-07-08 19:32:25 -07:00
Kyeongkab.Nam
bcc56339bb Add a new API applyPayloadFd() of UpdateEngine 
Due to the restriction of Treble, update_engine cannot access to OTA
packages located on non-core domain area.
(e.g. /data/vendor/upgrade/xxx.zip)
To solve such problem, update_engine needs to accept a file descriptor
(FD) of OTA package file instead of its URI. Accordingly, UpdateEngine
also needs to add a new interface of applyPayload which accepts FD.

Test: Manual update
Bug: 130209137
Change-Id: Ic924445c4abf27fd7dc111c74b972ac7ff9ffa6b
 2019-07-09 11:21:57 +09:00
Steven Moreland
e17de65051 AIDL it! IServiceManager 
Bug: 135768100
Test: boot
Change-Id: I7f8b5d07d4937804e8b0838936f8984ca7d08efa
(cherry picked from commit 7b152971e4)
 2019-07-09 01:54:41 +00:00
Svet Ganov
6f672a3835 Specify the duration time base 
Test: N/A

Bug: 128316830

Change-Id: Idd8f1aaf1a8e0013c01fdf4d668f9d5e81101559
 2019-07-08 16:40:45 -07:00
Svet Ganov
05fcd228b5 Update docs for UID_STATE 
Test: N/A

Bug: 128919932

Change-Id: Ibac690db3b58293082f762800bbbff0f832a16b2
 2019-07-08 16:30:48 -07:00
Chalard Jean
d85b09a06f Remove providesRoutesToMostDestinations. 
This function is not used any more.

Test: FrameworksNetTests
Change-Id: Ia43f8811cb9d575e16735b0f4b76d91e7cd42ebc
 2019-07-08 20:36:33 +09:00
Chalard Jean
dd16d44fe8 Cherry-pick the relevant parts of master change 
I566437e4fe10e1346858149120c50b3c20ca073f to avoid a conflict

Test: atest FrameworksNetTests
Change-Id: I7de4f67234bf97d58bddffa22272c7670398f56d
 2019-07-08 20:25:45 +09:00
Nikita Ioffe
0ad641f9f6 Merge "Rename ApexInfo.package{Name,Path} to module{Name,Path}" into stage-aosp-master 
am: 6a36ad8b7e

Change-Id: Idabee06e646addd278b0f47224da9a6401a81036
 2019-07-04 08:48:49 -07:00
Nikita Ioffe
f585ed0459 Use ApexInfo.moduleName 
See another CL in the topic

Bug: 132428457
Test: builds
Change-Id: I87ba3fb539d0761c515adc8e2d2acc8dfc5e6a9a
Merged-In: If0bd3d368c7373ab0028211a8a4246a9821893af
 2019-07-04 15:46:08 +00:00
Adrian Roos
bee24f79f7 Merge "WM: implicitly exclude all edges for pre-Q immersive sticky apps" into qt-dev 
am: 8ef731c232

Change-Id: Ie23184e62d410cff170232d15720b22d53f7e6df
 2019-07-04 08:07:23 -07:00
TreeHugger Robot
8ef731c232 Merge "WM: implicitly exclude all edges for pre-Q immersive sticky apps" into qt-dev 2019-07-04 14:35:42 +00:00
Adrian Roos
019a52b4ad WM: implicitly exclude all edges for pre-Q immersive sticky apps 
Bug: 135522625
Test: atest DisplayContentTests
Change-Id: Ibe6c2c6d269b15c2e79ac0241b93e42c44a167c9
Exempt-From-Owner-Approval: TBR
 2019-07-04 14:35:34 +00:00
Mathew Inwood
7bcc174a0e Add trackingBug to API used by chromium vebview. 
Bug: 136728678
Test: m
Change-Id: Ia7ff4b258ac24d6ebd165be3f294fc1500cc7fb6
 2019-07-04 11:42:48 +01:00
Louis Chang
d75d59e276 Merge "Avoid making post state to RESUMED for a PAUSING activity" into qt-dev 
am: ae80cf399a

Change-Id: I555a5a142e9edb6b6242a831561754082b750b54
 2019-07-03 16:40:13 -07:00
Nikita Ioffe
b4eee2a17d Rename ApexInfo.package{Name,Path} to module{Name,Path} 
This should resolve the confusion between internal name of APEXes that
comes from apex_manifest.json and packageName that comes from
AndroidManifest.xml.

Follow-up CLs:
* Rename package to module for all apexservice binder APIs.
* Rename package to module in apexd codebase.

Test: atest apexservice_test
Test: atest CtsStagedInstallHostTestCases
Bug: 132428457
Change-Id: If0bd3d368c7373ab0028211a8a4246a9821893af
Merged-In: If0bd3d368c7373ab0028211a8a4246a9821893af
(cherry picked from commit ec67395d7d)
 2019-07-03 14:27:01 +01:00