Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
565,320 Commits 3 Branches 0 Tags
4de3cb8fae860190372bdfc32e33827a933bc91c
Commit Graph

565320 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
4de3cb8fae Merge "Update OWNER for team's files under content" am: 1b2163d9e8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620579

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7bbf9b18386227c3ba8fe3a831ac1a246564dae5
 2021-03-05 21:23:24 +00:00
Treehugger Robot
1b2163d9e8 Merge "Update OWNER for team's files under content" 2021-03-05 18:07:37 +00:00
Treehugger Robot
ac569866d9 Merge "Don't crash if the MediaCodecList is null." am: f80c56df73 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556749

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf695842ec6461e65861f5d541ea6ff237a1bc8a
 2021-03-05 17:18:27 +00:00
Treehugger Robot
f80c56df73 Merge "Don't crash if the MediaCodecList is null." 2021-03-05 16:42:29 +00:00
Zoey Chen
18451a325d Merge "[Telephony] Remove the dead code setRadioCapability in ITelephony" am: d22eced34b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618843

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I40e0b44264ff86370861a17e801966e1d2ebcece
 2021-03-05 13:04:40 +00:00
Zoey Chen
d22eced34b Merge "[Telephony] Remove the dead code setRadioCapability in ITelephony" 2021-03-05 12:35:39 +00:00
Treehugger Robot
31444d7845 Merge "Set SAM according to TV's settings" am: db3769c465 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1310537

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I60758e5982232d79bd33066d21ee393ae7dd9d08
 2021-03-05 12:28:14 +00:00
Treehugger Robot
db3769c465 Merge "Set SAM according to TV's settings" 2021-03-05 11:55:58 +00:00
Remi NGUYEN VAN
e878fb157a Merge "Move NetworkState to Connectivity" am: d0355e1be2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620379

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie8eda98704327d894b59c335753739600b87f670
 2021-03-05 11:33:30 +00:00
Treehugger Robot
e91f7deefa Merge "Update NPMS to listen for all uid procstate changes." am: dfc3abdf72 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620663

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5596793757dff3d5e49a6b0c42b0935550f47abe
 2021-03-05 11:26:53 +00:00
Junyu Lai
6da7e8ca6c Merge "[FUI23] Remove getNetworkQuotaInfo" am: 0bb7932183 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614982

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9859af9354534b53233018d110c438212ec2017b
 2021-03-05 11:23:38 +00:00
Remi NGUYEN VAN
d0355e1be2 Merge "Move NetworkState to Connectivity" 2021-03-05 10:27:57 +00:00
Treehugger Robot
dfc3abdf72 Merge "Update NPMS to listen for all uid procstate changes." 2021-03-05 10:23:27 +00:00
Junyu Lai
0bb7932183 Merge "[FUI23] Remove getNetworkQuotaInfo" 2021-03-05 10:05:06 +00:00
Aaron Huang
3fe7534d30 Merge "Use NetworkCallback in BatteryStatsService to get connectivity change" am: 918e60b615 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574864

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If6fd08a8ba2bcbe4a955c245f49be517794f8a91
 2021-03-05 07:45:53 +00:00
Aaron Huang
918e60b615 Merge "Use NetworkCallback in BatteryStatsService to get connectivity change" 2021-03-05 07:03:51 +00:00
Sudheer Shanka
b5127c0713 Update NPMS to listen for all uid procstate changes. 
This is a temporary change until we can fix an issue
in AMS internally.

Bug: 177641226
Test: treehugger
Change-Id: I7d04b4116f8ecb7da8c3fb0b9229a8896b836811
Merged-In: I888764ff22fba92fe2cccf3d8442ed318a19ad2a
 2021-03-05 06:36:31 +00:00
Wei Sheng Shih
9571fc99b5 Merge "[RESTRICT AUTOMERGE]Fix launching app from work profile cannot show splash screen." am: cc1e7da83c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612037

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41a1dd3a78e3767137d8bcb0bb96c7215935fb43
 2021-03-05 06:18:48 +00:00
wilsonshih
27cc5ded70 [RESTRICT AUTOMERGE]Fix launching app from work profile cannot show splash screen. am: 413456e640 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612037

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1f38792a5c77161ed5b4ae7661af0443597c5bec
 2021-03-05 06:16:07 +00:00
Wei Sheng Shih
cc1e7da83c Merge "[RESTRICT AUTOMERGE]Fix launching app from work profile cannot show splash screen." 2021-03-05 05:55:56 +00:00
Treehugger Robot
1e1379b245 Merge "[FUI22] Support getAllNetworkStateSnapshot" am: 4c73e05c1d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614779

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I70cbeb9d2b5b4cb2d09d31444b5d60e887b7e8c2
 2021-03-05 05:53:33 +00:00
Remi NGUYEN VAN
ad5abee88b Merge "Replace user with debuggable check in ConnectivityService" am: 8773546980 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615085

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb729be68e810972506b1d8a3960dfc371a294b1
 2021-03-05 05:50:47 +00:00
Chalard Jean
b2bc755a59 Merge "Generalize some PANS methods" am: fcbc6ff6b1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612258

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7baa17a0f882ec21f766c9f7dc2c0694853fb467
 2021-03-05 05:47:57 +00:00
Treehugger Robot
6a95ca0b62 Merge "Make VCN network policy listener oneway" am: dd2877eabe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619899

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e9f4fa47f71f1c541af61e83737be2c8de92066
 2021-03-05 05:44:37 +00:00
Chiachang Wang
cef32a99c1 Merge "Have the DataConnectionStat started from BSS" am: db9b175a58 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607895

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f9e9d496c92e86609871c93a08b819b3704314f
 2021-03-05 05:37:43 +00:00
Janis Danisevskis
da3d7dae0e Merge "Keystore 2.0: Make VPN Keystore 2.0 ready." am: 421c5739ea 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569502

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97b24a5462f42773df919bd1d7acf9a9c5dcd43c
 2021-03-05 05:17:12 +00:00
Treehugger Robot
4c73e05c1d Merge "[FUI22] Support getAllNetworkStateSnapshot" 2021-03-05 05:16:43 +00:00
Yan Yan
b331ee3ff7 Merge "Revert "Use VERSION_CODES.S instead of VERSION_CODES.R + 1"" am: aef89adfdc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619903

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I435aebb51bd0bd0ed3eb68460eb864c1e78e1874
 2021-03-05 05:11:22 +00:00
Remi NGUYEN VAN
8773546980 Merge "Replace user with debuggable check in ConnectivityService" 2021-03-05 05:09:46 +00:00
Treehugger Robot
547c982b97 Merge "Fix CaptivePortalTest before R" am: 41dd05fdfb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618939

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I29443e1af761cca33185638e5bd84771e0bc9192
 2021-03-05 05:03:21 +00:00
SongFerng Wang
6035378f91 Merge "Improve AllowedNetworkTypesForReason and refactor PreferredNetworkType" am: b332627a15 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614985

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic767a18207a6f551ac49167c81c30e2f22793acf
 2021-03-05 05:00:15 +00:00
Joanne Chung
f01f6bc59f Update OWNER for team's files under content 
Update for AutofillOptions, ContentCaptureOptions, LocusId.

Bug: 177641730
Test: n/a
Change-Id: I88ed9b0e79255c42d57968882750733e414b7767
 2021-03-05 12:56:53 +08:00
Treehugger Robot
19c771ec4e Merge "Fix subject in self-signed certificates." am: a27ce04850 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619939

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6fe8bf267a7a8174ce9ef6e36408c3815b16b4eb
 2021-03-05 04:56:31 +00:00
Brad Ebinger
b81ca0dc24 Merge "Parse params needed for SipDelegate routing" am: 9a13fb1dbf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1616689

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3d5ceb7b6d830e684d3b159e6f50bc8b41b70728
 2021-03-05 04:48:44 +00:00
Chalard Jean
fcbc6ff6b1 Merge "Generalize some PANS methods" 2021-03-05 04:48:39 +00:00
Tianjie Xu
853862f7b0 Merge "Don't throw runtime exceptions in ResumeOnRebootServiceProvider" am: 8ad97c0d63 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608534

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id7977a64ae425335c5f54c98065b75ccfb12fe1f
 2021-03-05 04:46:02 +00:00
Brad Ebinger
a0f85ebf75 Merge "Define new permission to perform IMS RCS Reg actions and integrate ACCESS_IMS_SINGLE_REGISTRATION into APIS" am: ca282c8cbf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596514

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie6d700bd7ac66bc6ffe2792ba67cebd15c826906
 2021-03-05 04:41:41 +00:00
Tianjie Xu
dc579c1960 Merge "Add a unittest to cover the retry of load escrow data" am: b13ad07770 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614001

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I649a0d2d392078c4f0c515c68e8998b2d0bebf22
 2021-03-05 04:37:56 +00:00
Christian Wailes
19fbe0bf82 Merge "Add ZYGOTE_OWNERS to fd_utils.* files." am: 61fb950795 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615638

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06e3ae0ba0ba4a708bfb554286403e6103ce26f2
 2021-03-05 04:34:42 +00:00
Christian Wailes
a534c95087 Merge changes I04ac8fba,Ia0a8548f am: db6628bb7d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615382

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97994a12e2fb41db137b299c4e73cf02a1827871
 2021-03-05 04:31:56 +00:00
Treehugger Robot
dd2877eabe Merge "Make VCN network policy listener oneway" 2021-03-05 04:25:22 +00:00
Chiachang Wang
db9b175a58 Merge "Have the DataConnectionStat started from BSS" 2021-03-05 02:59:33 +00:00
Janis Danisevskis
421c5739ea Merge "Keystore 2.0: Make VPN Keystore 2.0 ready." 2021-03-05 02:57:34 +00:00
Yan Yan
aef89adfdc Merge "Revert "Use VERSION_CODES.S instead of VERSION_CODES.R + 1"" 2021-03-05 02:30:21 +00:00
Treehugger Robot
41dd05fdfb Merge "Fix CaptivePortalTest before R" 2021-03-05 02:28:55 +00:00
SongFerng Wang
b332627a15 Merge "Improve AllowedNetworkTypesForReason and refactor PreferredNetworkType" 2021-03-05 01:59:53 +00:00
Treehugger Robot
a27ce04850 Merge "Fix subject in self-signed certificates." 2021-03-05 01:16:54 +00:00
Brad Ebinger
9a13fb1dbf Merge "Parse params needed for SipDelegate routing" 2021-03-05 01:11:02 +00:00
Tianjie Xu
8ad97c0d63 Merge "Don't throw runtime exceptions in ResumeOnRebootServiceProvider" 2021-03-05 00:26:57 +00:00
Yan Yan
713ec685cb Revert "Use VERSION_CODES.S instead of VERSION_CODES.R + 1" 
This reverts commit 7f13ec417e.

Reason for revert:
1. The BUILD_VERSIONS.S is 1000, and thus it will prevent
   the code from requiring new algorithms on devices whose
   first sdk is 31 (e.g. cuttlefish), though these devices
   should be treated as first launched with SDK S.
2. It will break #testValidationForAlgosAddedInS, because
   the test code is using BUILD_VERSIONS.R to gate the test,
   which is inconsistent with the implementation.

Bug: 181887451
Test: atest IpSecAlgorithmTest
Change-Id: I5cd717c5ebd6086ae5cf9abf76311ae4fca0c6e9
 2021-03-05 00:15:15 +00:00