Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
529,378 Commits 3 Branches 0 Tags
18503252ef5bb9ce3f3a2d70ff07e813ced4ed2e
Commit Graph

529378 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Hansson
18503252ef Merge "Make current-api-xml use generated current.txt" am: 3ab2ebfe26 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1488696

Change-Id: Iae67a72df5038a527b2b704fe171c352a70d9bd6
 2020-11-05 14:12:57 +00:00
Anton Hansson
3ab2ebfe26 Merge "Make current-api-xml use generated current.txt" 2020-11-05 13:52:54 +00:00
Anton Hansson
00febe2eb6 Make current-api-xml use generated current.txt 
Remove the dep on the monolithic current.txt so that it can be deleted.

Bug: 158465496
Test: m current-api-xml (same before and after)
Change-Id: I6d36801592a20cb9dc8f87c7d9d4babf0986c448
 2020-11-05 10:30:59 +00:00
Nikita Iashchenko
bce0208847 Merge "Import TLS handshake atom for Conscrypt" am: 97f35bbbef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484136

Change-Id: Ifb6e71163999d084ccc1f7e648d6caea21e8a0c7
 2020-11-05 10:19:49 +00:00
Nikita Iashchenko
97f35bbbef Merge "Import TLS handshake atom for Conscrypt" 2020-11-05 10:14:31 +00:00
Anton Hansson
dd64b2cbf9 Merge "Remove unused monolithic jars" am: fd4bcbd76a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486198

Change-Id: I34a339e974d9369662d23d32aa93e70677f2431f
 2020-11-05 10:08:44 +00:00
Anton Hansson
fd4bcbd76a Merge "Remove unused monolithic jars" 2020-11-05 09:50:23 +00:00
Paul Hu
d5ee31aba5 Merge "Replace Context @hide APIs" am: a1c0a06580 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1458063

Change-Id: I914ee12abdcba7c53fb868425592d6458a797e23
 2020-11-05 08:53:01 +00:00
Paul Hu
5e56187d53 Merge "Replace AppOpsManager @hide APIs" am: a80bc72775 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469126

Change-Id: I6222db7e8f966d7df17de9c46b5e26e715ecccf2
 2020-11-05 08:45:52 +00:00
Paul Hu
b8eb5b0ee1 Merge "Expose AppOpsManager#OPSTR_ACTIVATE_PLATFORM_VPN as system API" am: 01bec3bb2b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484021

Change-Id: I16d87836136f411e61756246817ed448d974bec4
 2020-11-05 08:37:59 +00:00
Paul Hu
a1c0a06580 Merge "Replace Context @hide APIs" 2020-11-05 08:05:09 +00:00
Paul Hu
a80bc72775 Merge "Replace AppOpsManager @hide APIs" 2020-11-05 08:03:55 +00:00
Paul Hu
01bec3bb2b Merge "Expose AppOpsManager#OPSTR_ACTIVATE_PLATFORM_VPN as system API" 2020-11-05 07:55:10 +00:00
James Mattis
d4313a6d0f Merge "Adding @IgnoreUpTo for testOemPrivate" am: df86206d82 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487452

Change-Id: I92bd7437dede4ae4a4bb27dfbf68a5ae74553811
 2020-11-05 05:24:33 +00:00
James Mattis
df86206d82 Merge "Adding @IgnoreUpTo for testOemPrivate" 2020-11-05 04:31:51 +00:00
Bill Yi
e666aa1e3d Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: 2c67d7f24a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487068

Change-Id: I2a77e6a9e5246800149980d33b19fca17fc687b6
 2020-11-05 03:13:30 +00:00
Bill Yi
c847e318a5 Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: f2d4156f5b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487068

Change-Id: I8a4f97f07e021357299d524adbd155a4ea453588
 2020-11-05 03:01:07 +00:00
Bill Yi
2c67d7f24a Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" 2020-11-05 01:06:53 +00:00
James Mattis
aad8075de9 Adding @IgnoreUpTo for testOemPrivate 
Adding @IgnoreUpTo for NetworkCapabilitiesTest.testOemPrivate so that
this test can run on previous releases.

Bug: 172400600
Bug: 171505922
Test: atest CtsNetTestCasesLatestSdk:NetworkCapabilitiesTest
Change-Id: Ibc728c986ad6faeed78c631ca2675956b95c6ac1
 2020-11-04 16:52:11 -08:00
Bill Yi
f2d4156f5b Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE 
Merged-In: Ic1e07d28a41eea2ce59cc21702dae95d61adc24e
Change-Id: Ibc69b3e372167485bb70ae3277222bbe8ef7ff27
 2020-11-04 13:57:54 -08:00
Mohammad Islam
afb34c51c2 Merge "Improve logging for why a staged session was reverted" am: 55103afd78 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486201

Change-Id: I06461e3778e20d8489ce5f030e0bbdc1b3a3abf1
 2020-11-04 21:56:22 +00:00
Mohammad Islam
55103afd78 Merge "Improve logging for why a staged session was reverted" 2020-11-04 21:49:57 +00:00
Grace Jia
25c392d7a1 Merge "Add missed information relative parameter and fields." am: 3014218c9e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1167604

Change-Id: I66bab73dc0c3fdf121f85345386377b24c3babe7
 2020-11-04 21:44:55 +00:00
Grace Jia
3014218c9e Merge "Add missed information relative parameter and fields." 2020-11-04 21:16:48 +00:00
Mohammad Samiul Islam
558f0c8842 Improve logging for why a staged session was reverted 
mFailureReason gets populated with actual reason when we try to resume
the staged session in checkpointing mode. But, if the device has a
native crash due to which the device reboots even before we attempt to
"resume" staged session, then it will never get populated.

As such, during boot loops that occur earlier than "resume" of staged
session, we end up logging nothing.

In this CL, we improve on the scenario by falling back to using
mNativeFailureReason if mFailureReason is empty. But this only works if
our staged session contains APEX package in it. For apk-only staged
sessions, we will still be logging blanks.

Bug: 163787002
Test: atest ApexRollbackTests#testReasonForRevertIsLoggedDuringBootloop
Change-Id: I5cd1733d66aa0b30855803b95eb9818dc81aa0d7
Merged-In: I5cd1733d66aa0b30855803b95eb9818dc81aa0d7
(cherry picked from commit a4cb493bdb)
 2020-11-04 19:15:42 +00:00
Benedict Wong
b655259440 Merge "Add NonNull annotation to getAllSubscriptionInfoList" am: e5e2388844 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1485142

Change-Id: I70f81584da85defea3d71d97c3a363af5b32f72d
 2020-11-04 19:06:42 +00:00
Benedict Wong
e5e2388844 Merge "Add NonNull annotation to getAllSubscriptionInfoList" 2020-11-04 18:40:53 +00:00
Benedict Wong
061b2f769d Add NonNull annotation to getAllSubscriptionInfoList 
This change marks getAllSubscriptionInfoList as NonNull; the method
already catches all exceptions, and returns an empty ArrayList if
something failed.

Test: atest FrameworksTelephonyTest
Change-Id: I7799d05f0f1f249fa5f4a47a3f4ff2c2691c75dc
 2020-11-04 18:40:41 +00:00
Bill Yi
7ff2eff0fa Merge "Merge rvc-release RP1A.201105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master 2020-11-04 18:18:23 +00:00
Brian Stack
07f2cba66d Merge "Remove erroneous logs in UWB RangingParamsTest" am: 04c894b6fa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487358

Change-Id: Ia9186a13c6cbc6e7f156257ce6470ba6f95387e0
 2020-11-04 17:19:16 +00:00
Jay Patel
e7b7656f74 Merge "Call setArcStatus(false) before standby" am: b43dd5007f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313995

Change-Id: I98a90788dfae899e2765841cd67fcad19a37aaf5
 2020-11-04 17:09:26 +00:00
Anton Hansson
e39d2d9f8c Merge "Dist merged jar instead of monolithic one" am: 7350b62384 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486197

Change-Id: Ib1f8c1d50a31021559bdee04115182a4d17f7006
 2020-11-04 17:06:05 +00:00
Anton Hansson
01091d8fe1 Merge "Restrict visibility of framework-module-common-defaults" am: 1de077e8fd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484099

Change-Id: Ica7f1973bb843a64f471461208bae8e0ac69fae3
 2020-11-04 16:40:33 +00:00
Brian Stack
04c894b6fa Merge "Remove erroneous logs in UWB RangingParamsTest" 2020-11-04 16:38:36 +00:00
Jay Patel
b43dd5007f Merge "Call setArcStatus(false) before standby" 2020-11-04 16:26:27 +00:00
Anton Hansson
7350b62384 Merge "Dist merged jar instead of monolithic one" 2020-11-04 15:51:30 +00:00
Anton Hansson
1de077e8fd Merge "Restrict visibility of framework-module-common-defaults" 2020-11-04 15:49:55 +00:00
vichang
cf0dc89869 Merge "Add app compat config from ICU4J" am: 6d5fbc8434 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481306

Change-Id: I155c8b08527e28efabef100c7105210b84ddbeec
 2020-11-04 12:32:26 +00:00
vichang
6d5fbc8434 Merge "Add app compat config from ICU4J" 2020-11-04 12:28:57 +00:00
Eran Messeri
b0c59d4b6b Merge "DO NOT MERGE: Introduce DPMS shim for active DO/PO check" am: 817969762e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486196

Change-Id: I01d19bd923e65dda0e939eb1a03102e505ce45f8
 2020-11-04 12:28:00 +00:00
Eran Messeri
9e6305e3b0 DO NOT MERGE: Introduce DPMS shim for active DO/PO check am: bdd52cb48b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486196

Change-Id: I79e090d92c5bf17993f8e4f710581675eb72f2a9
 2020-11-04 12:24:40 +00:00
Eran Messeri
817969762e Merge "DO NOT MERGE: Introduce DPMS shim for active DO/PO check" 2020-11-04 11:56:33 +00:00
daren.liao
ab378a865a Call setArcStatus(false) before standby 
[Description]
DisableDevice is called before standby.
If clearDeviceInfoList() is called before <Terminate ARC> is received,
CEC can't get device info & portId of AVR
And thus enableAudioReturnChannel is not success.

Therefore, we call setArcStatus(false) earlier
before RequestArcTerminationAction and receives <Terminate ARC>

Note that we don't use SetArcTransmissionStateAction since it is not
safe to create too many Actions during standby process

Bug: 137344668
Bug: 157184079

Change-Id: Ic67b31ce7d9b1dc0c3c578f87fdd782fcc797d3e
 2020-11-04 19:52:27 +09:00
Eran Messeri
bdd52cb48b DO NOT MERGE: Introduce DPMS shim for active DO/PO check 
Introduce a shim into DevicePolicyManagerInternal &
DevicePolicyManagerService so that NetworkStatsAccessTest would not
diverge from internal development branches.

The DevicePolicyManagerService refactoring on the internal branch
removed isActiveAdminWithPolicy in favour of isActiveDeviceOwner and
isActiveProfileOwner.

These methods are being made available in AOSP for
NetworkStatsAccessTest.

Bug: 170459325
Test: atest NetworkStatsAccessTest
Change-Id: Ic7e0898989fb8222aaba2b35436765c04eb3250c
 2020-11-04 10:07:06 +00:00
Allen Su
e9fd3958f6 Merge "[IMS]Add bitrate and bandwidth into ImsStreamMediaProfile" am: 15075fcca0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478280

Change-Id: I02a791584a66c1d1571046c5ab026423e2d3aadc
 2020-11-04 08:26:49 +00:00
Allen Su
15075fcca0 Merge "[IMS]Add bitrate and bandwidth into ImsStreamMediaProfile" 2020-11-04 07:53:42 +00:00
Bill Yi
5611c0299e Merge rvc-release RP1A.201105.002 to stage-aosp-master - DO NOT MERGE 
Merged-In: I921086d2b5b3a9a0a5b8d78109d28cccf6ff26fd
Change-Id: I5be609d7b7a0dc28486895c4ab772720eb7fe10a
 2020-11-03 22:27:18 -08:00
Brian Stack
484581193b Remove erroneous logs in UWB RangingParamsTest 
Bug: 170323306
Test: atest UwbManagerTests
Change-Id: I6de1f98dbbd822bdbe04a5a0985c7e0139a85e2d
 2020-11-03 20:07:31 -08:00
Treehugger Robot
86d811e556 Merge "Add UWB Tests to verify Builders and Parcels" am: 84afc97ad7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1472364

Change-Id: I009835caafb24114526a4483f2e306cabe0efb3f
 2020-11-04 01:55:18 +00:00
Treehugger Robot
84afc97ad7 Merge "Add UWB Tests to verify Builders and Parcels" 2020-11-04 01:10:22 +00:00