Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
661,267 Commits 3 Branches 0 Tags
d47e88e58c640e4100f2c382cb4e33d40e852a2f
Commit Graph

661267 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
d47e88e58c Merge "Create EVENT_TRAFFIC_DESCRIPTORS_UPDATED" am: 35ac7e34ce 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1917117

Change-Id: Ic2639d45654cd0635fdaadcec5ca3de9e116fbd3
 2022-01-27 02:07:38 +00:00
Treehugger Robot
35ac7e34ce Merge "Create EVENT_TRAFFIC_DESCRIPTORS_UPDATED" 2022-01-27 01:49:59 +00:00
Hans Boehm
aca7bb4b9f Merge "Prefer WeakReference.refersTo() to get()" am: 63e3c2c709 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956816

Change-Id: I010f99e4de0cb60fecd6b6af38a17e695fc773e8
 2022-01-27 00:37:24 +00:00
Hans Boehm
63e3c2c709 Merge "Prefer WeakReference.refersTo() to get()" 2022-01-27 00:22:02 +00:00
Nathan Harold
145cbd8f52 Merge "Expose Constructor for ModemActivityInfoException" am: 5887444f2d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960939

Change-Id: Ia34ddf4ce1376667bb480859abc4e82d6330637b
 2022-01-26 22:21:25 +00:00
Nathan Harold
5887444f2d Merge "Expose Constructor for ModemActivityInfoException" 2022-01-26 22:00:07 +00:00
Nate(Qiang) Jiang
93be545cde Merge "Add OVERRIDE_WIFI_CONFIG permission to Shell for CTS" am: dbe634a784 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959813

Change-Id: I5b8abd45829d7547d094714442015c52ab0472e4
 2022-01-26 20:44:00 +00:00
Nate(Qiang) Jiang
dbe634a784 Merge "Add OVERRIDE_WIFI_CONFIG permission to Shell for CTS" 2022-01-26 20:30:20 +00:00
Eric Biggers
0a3cb5df0a Merge "UserDataPreparer: reboot to recovery if preparing user storage fails" am: 39d90b7a2d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959659

Change-Id: I98b2d5d6b918e28d3d7a9e69df0787d3145a5130
 2022-01-26 20:16:32 +00:00
Eric Biggers
39d90b7a2d Merge "UserDataPreparer: reboot to recovery if preparing user storage fails" 2022-01-26 19:44:31 +00:00
Elliott Hughes
2a4deb3988 Merge "usb: remove duplication in descriptor reading code." am: b612fc8f4f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954916

Change-Id: I195e564cf34893c80afd9a07c46ac5229203be72
 2022-01-26 19:26:58 +00:00
Elliott Hughes
b612fc8f4f Merge "usb: remove duplication in descriptor reading code." 2022-01-26 19:14:11 +00:00
Lajos Molnar
55b9fb04dd Merge "media: MediaCodec: add RGBA_1010102 and RGBA_F16 format support" am: 5cb80afc4e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960940

Change-Id: I3999ebba2c6bb466e3c2a96aafc714a8aba27045
 2022-01-26 18:44:16 +00:00
Lajos Molnar
5cb80afc4e Merge "media: MediaCodec: add RGBA_1010102 and RGBA_F16 format support" 2022-01-26 18:19:36 +00:00
Junyu Lai
89ed0021b2 Merge "[MS77] Remove hidden api dependencies from MultipathPolicyTracker" am: 679c6dbedb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958894

Change-Id: I95adf2bac5ac1079cdba9cd406f29ea827ed423d
 2022-01-26 17:32:04 +00:00
Junyu Lai
679c6dbedb Merge "[MS77] Remove hidden api dependencies from MultipathPolicyTracker" 2022-01-26 17:16:58 +00:00
Aaron Huang
18b7b7b386 Merge "Use public resouce in android.R package" am: c110082aef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956980

Change-Id: Ib37e4bb14b57af06366dc31ba36f6883a56d7fb3
 2022-01-26 15:17:11 +00:00
Aaron Huang
c110082aef Merge "Use public resouce in android.R package" 2022-01-26 15:01:32 +00:00
Junyu Lai
dbaa056d90 [MS77] Remove hidden api dependencies from MultipathPolicyTracker 
Test: atest MultipathPolicyTrackerTest
Bug: 204830222
Change-Id: Ife7c06279ca0a5f08873196e353b33b98929e64c
 2022-01-26 14:47:48 +00:00
Aaron Huang
845cbd1a71 Merge "Make ipsec resource as SystemApi" am: 16c6cfd630 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956979

Change-Id: I2c60500702804b9848c8779ce7f17103559145ad
 2022-01-26 13:59:15 +00:00
Aaron Huang
16c6cfd630 Merge "Make ipsec resource as SystemApi" 2022-01-26 13:47:14 +00:00
Treehugger Robot
1adb855b0e Merge "[MS74] Expose NetworkTemplate#matches" am: 05e7864df4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960186

Change-Id: Icd61dbba3f56d223602ea0277fb6c5a78b3c1ae5
 2022-01-26 11:47:19 +00:00
Treehugger Robot
05e7864df4 Merge "[MS74] Expose NetworkTemplate#matches" 2022-01-26 11:33:29 +00:00
Nate Jiang
a6e72cf3e2 Add OVERRIDE_WIFI_CONFIG permission to Shell for CTS 
Bug: 216433840
Test: build
Change-Id: I18500abe0e98030bd291aca536f6a70b0f6acafd
 2022-01-26 03:00:50 -08:00
Oli Lan
fc32e33bbf Merge "Add olilan to ClipboardService owners." am: 3864f5fdf7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959340

Change-Id: If50e5f430ef4b2767992e496e6e839dcb3e73e38
 2022-01-26 10:52:31 +00:00
Treehugger Robot
c51c0c971f Merge "[MS78.1] Fix NetworkIdentity#Builder crashing on 5G NSA networks" am: e73b1c2270 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958896

Change-Id: I73bb693292510b92fa8858c1e599ea26ab892e0e
 2022-01-26 10:47:26 +00:00
Oli Lan
3864f5fdf7 Merge "Add olilan to ClipboardService owners." 2022-01-26 10:45:47 +00:00
Treehugger Robot
e73b1c2270 Merge "[MS78.1] Fix NetworkIdentity#Builder crashing on 5G NSA networks" 2022-01-26 10:32:38 +00:00
Junyu Lai
8935abc14a [MS78.1] Fix NetworkIdentity#Builder crashing on 5G NSA networks 
Test: atest NetworkIdentityTest
Fix: 216193400
Change-Id: Iaeae0c66f222ae8730439c5aedf5d5818855875d
 2022-01-26 07:35:47 +00:00
Treehugger Robot
84f8974ecc Merge "Remplace NetworkIdentity.OEM_* with NetworkTemplate.OEM_MANAGED_*" am: 6f39fc9ee7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958663

Change-Id: Ied5b2ff81e58d699c8f681553f5ed2e7ce8b27f9
 2022-01-26 05:10:58 +00:00
Treehugger Robot
6f39fc9ee7 Merge "Remplace NetworkIdentity.OEM_* with NetworkTemplate.OEM_MANAGED_*" 2022-01-26 05:04:54 +00:00
Treehugger Robot
ebbe31525c Merge "[Settings] Add more code reviewers" am: 709add03c2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958909

Change-Id: Ic3c49f45ce5e03662f7a2f72f2786080603ad709
 2022-01-26 05:04:17 +00:00
Lajos Molnar
eb9ed7ff5d Merge "media: MediaCodecInfo: Unhide COLOR_FormatYUVP010" am: 32c80f0b44 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960659

Change-Id: I1e6f0260eceb32cc68c1222b94587a8985270ee9
 2022-01-26 05:03:54 +00:00
Treehugger Robot
709add03c2 Merge "[Settings] Add more code reviewers" 2022-01-26 04:47:10 +00:00
Lajos Molnar
32c80f0b44 Merge "media: MediaCodecInfo: Unhide COLOR_FormatYUVP010" 2022-01-26 04:46:20 +00:00
Treehugger Robot
c5c8269604 Merge "[MS71] Remove remaining dependencies in SettingsLib" am: 018ba8116f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960185

Change-Id: Iae112ed739993ac72b85b90ec48b061344ca119f
 2022-01-26 03:43:21 +00:00
Junyu Lai
118781f2a2 Merge "[MS75] Replace TrafficStats data units with DataUnit class" am: 03740ec6c2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960399

Change-Id: I2a80c943e5f33e678fd479f3aa8f9fc8ed86901e
 2022-01-26 03:42:12 +00:00
Treehugger Robot
018ba8116f Merge "[MS71] Remove remaining dependencies in SettingsLib" 2022-01-26 03:11:40 +00:00
Junyu Lai
03740ec6c2 Merge "[MS75] Replace TrafficStats data units with DataUnit class" 2022-01-26 03:01:10 +00:00
Bonian Chen
87076fb2bb [Settings] Add more code reviewers 
Add more code reviwers to help.

Bug: 0
Test: build pass
Change-Id: I4bcb44a1bff8a381d3ff79a8eedffcab6848b62f
 2022-01-26 10:52:23 +08:00
Lajos Molnar
79ad8fe8a7 media: MediaCodec: add RGBA_1010102 and RGBA_F16 format support 
Due to existing naming conventions these become
COLOR_Format32bitABGR2101010 and COLOR_Format64bitABGRFloat.

Bug: 197651595
Test: build
Change-Id: I9ce6177ec9d2a73ab9faa67c1d7c7d42fc9a35f7
 2022-01-25 16:41:06 -08:00
Gopalakrishnan Nallasamy
721eaa785c media: MediaCodecInfo: Unhide COLOR_FormatYUVP010 
Bug: 206456921
Test: atest android.media.cts.ImageReaderDecoderTest
Change-Id: I73ce2b459b59a8b8713889cf00739c9e9d28cd03
 2022-01-25 16:40:27 -08:00
Maciej Żenczykowski
014410f260 Merge "Use libnetworkstats instead of libnetdbpf" am: 5e9d341c13 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958142

Change-Id: Ife5a0d39de3aedc9af2065304689fec5cb588ded
 2022-01-26 00:05:12 +00:00
Maciej Żenczykowski
5e9d341c13 Merge "Use libnetworkstats instead of libnetdbpf" 2022-01-25 23:52:06 +00:00
Hyunho Shin
cdb03e5cda Merge "Add new publish trigger type" am: 8bf02e51dc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959005

Change-Id: I39ad6a54991cd17f1b243121801bd9958f0c9633
 2022-01-25 23:19:15 +00:00
Hyunho Shin
8bf02e51dc Merge "Add new publish trigger type" 2022-01-25 23:00:15 +00:00
Nathan Harold
10fc628397 Expose Constructor for ModemActivityInfoException 
ModemActivityInfoException is a SystemApi but the constructor
is not. There's a longstanding need to expose it for testing.

Bug: 186152174
Test: make update-api && make offline-sdk-docs
Change-Id: I609b4a893e2f4fad54d29e09234da08a45efac78
 2022-01-25 12:51:11 -08:00
Eric Biggers
5256365e65 UserDataPreparer: reboot to recovery if preparing user storage fails 
StorageManager.prepareUserStorage() can throw an exception if a
directory cannot be encrypted, for example due to already being
nonempty.  In this case, usage of the directory must not be allowed to
proceed.  UserDataPreparer currently handles this by deleting the user's
directories, but the error is still ultimately suppressed and starting
the user is still allowed to proceed.

The correct behavior in this case is to reboot into recovery to ask the
user to factory reset the device.  This is already what happens when
'init' fails to encrypt a directory with the system DE policy.  However,
this was overlooked for the user directories.  Start doing this.

Bug: 164488924
Change-Id: Ib5e91d2510b25780d7a161b91b5cee2f6f7a2e54
 2022-01-25 19:06:36 +00:00
Eric Biggers
e4b491a38a Merge "StorageManagerService: don't ignore failures to prepare user storage" am: 362f5eaf81 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959519

Change-Id: If953173de9ce7a72380b418540eb5afe5eefac0d
 2022-01-25 19:02:36 +00:00
Eric Biggers
362f5eaf81 Merge "StorageManagerService: don't ignore failures to prepare user storage" 2022-01-25 18:47:44 +00:00