Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
705,617 Commits 3 Branches 0 Tags
eccf1db4f797ebd99505b684ed7aadf53cdaca7d
Commit Graph

705617 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zim
eccf1db4f7 Fix fd leak while bypassing transcoding in media APIs 
To call the media service while bypassing transcoding there are 4 file
descriptors involved:

A: The original file descriptor the app owns and is responsible for
closing
B: Dupe of A, to pass into the MediaStore API as an input to receive a
non-transoding fd
C: The output from the MediaStore API
D: Final fd owned by the media service, after C gets duped over binder
as part of setDataSource

We were leaking (B) and (C). Now we close them appropriately.

See I0124ec8fbd0471237e99bab321f903544f8fe1f8 for another 2 fd leak
fix in MediaProvider

Test: atest TranscodeTest
Test: Manual with 'adb shell lsof | grep <filename>'
Bug: 194828489
Bug: 179804072
Change-Id: I978257bbc4a8f6813b6e6a5ce22124257204f432
 2021-07-29 21:57:57 +01:00
Prabir Pradhan
d118e25cae Merge "InputManagerService: Do not remove input channel when disposing monitor" into sc-dev am: 2f13cca5a6 am: edf4d6c9f3 am: f570d4f87b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15405649

Change-Id: I8d7f467e5fe5de8f259539aaa5a045f37eca0dea
 2021-07-29 17:33:14 +00:00
Prabir Pradhan
f570d4f87b Merge "InputManagerService: Do not remove input channel when disposing monitor" into sc-dev am: 2f13cca5a6 am: edf4d6c9f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15405649

Change-Id: Ie3779cfd4a9626046048880398f7620397eb7ee5
 2021-07-29 17:16:14 +00:00
Prabir Pradhan
857ae4ddd7 Merge "InputManagerService: Do not remove input channel when disposing monitor" into sc-dev am: 2f13cca5a6 am: f80d266a62 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15405649

Change-Id: I4730a64fd93a8245d8db6f1f28bfd6da6f428355
 2021-07-29 17:15:28 +00:00
Prabir Pradhan
f80d266a62 Merge "InputManagerService: Do not remove input channel when disposing monitor" into sc-dev am: 2f13cca5a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15405649

Change-Id: I6ed2dc12858e40861ab24b403d58f931289b8aba
 2021-07-29 17:02:27 +00:00
Prabir Pradhan
edf4d6c9f3 Merge "InputManagerService: Do not remove input channel when disposing monitor" into sc-dev am: 2f13cca5a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15405649

Change-Id: Ic25aef1e439b4f9b653ccba7ecfe8f301dfbeff7
 2021-07-29 17:02:11 +00:00
Prabir Pradhan
2f13cca5a6 Merge "InputManagerService: Do not remove input channel when disposing monitor" into sc-dev 2021-07-29 16:42:11 +00:00
Songchun Fan
71c185e706 Merge "[pm] ignore partial progress update after off-incfs migration" into sc-dev am: 5ba5f1392f am: 17ce18debe am: 858074aecd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15405281

Change-Id: I56bf28d09fb2da213cba4ce0d84409a66d04dec6
 2021-07-29 16:32:30 +00:00
Songchun Fan
858074aecd Merge "[pm] ignore partial progress update after off-incfs migration" into sc-dev am: 5ba5f1392f am: 17ce18debe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15405281

Change-Id: Idabdc72bc154b20d6a37554ebdf76607b81b1e60
 2021-07-29 16:19:17 +00:00
Songchun Fan
d384e0ddda Merge "[pm] ignore partial progress update after off-incfs migration" into sc-dev am: 5ba5f1392f am: 3ecef3f34f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15405281

Change-Id: I38b289aa2ac440002aa5e1d401f79a796387ce86
 2021-07-29 16:18:19 +00:00
Matt Pietal
7f63fca20a Merge "Make sure SIM PIN screen shows" into sc-dev am: c3915dcbe9 am: 36be5bb8cc am: e7bf8bc02f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15409421

Change-Id: I7ac084116c3230e1ed6f8f2ea141a1de3fa761c3
 2021-07-29 16:11:05 +00:00
Beverly Tai
9100782dc7 Merge "Rescan face when user preses empty space on LS" into sc-dev am: 866753754b am: 847acc3926 am: f388f15e9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15412658

Change-Id: I610cd16937a72cbfe1d347624eedfdafd1874429
 2021-07-29 16:10:43 +00:00
Beverly Tai
009113cb9e Merge "Don't setDeviceEntryIntent on AOD" into sc-dev am: 11f74e42a5 am: bc963b8701 am: 7e031eb4a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15412657

Change-Id: I61294f91d45347bb251a0e255cb4d6202357f858
 2021-07-29 16:10:27 +00:00
Yi Kong
eb3b16c398 Merge "Add TRIGGER_SHELL_PROFCOLLECT_UPLOAD permission" am: 6f1a606d73 am: 4d1b6559ba am: 120891e605 am: 1cebd1fc9e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1781187

Change-Id: I9f7bad4c1675a53b8453e38fd935dcb5cf7b4085
 2021-07-29 16:10:03 +00:00
Fiona Campbell
f6430ab878 Merge "Null check for logicaldisplay" into sc-dev am: fca58882db am: 951c4e101a am: f2436dd4c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15403077

Change-Id: I366be751ad1a8184dd6f6e1680a5af1c34d655c9
 2021-07-29 16:09:12 +00:00
Jing Ji
0ca30bc880 Merge "Fix NullPointerException in PhantomProcessList due to race condition" into sc-dev am: 8b872f5c71 am: 78a4470a84 am: 66bcf0ff3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15404738

Change-Id: I40054c46e01f99d84fe7aef7090cd9cb546d97b6
 2021-07-29 16:08:48 +00:00
TreeHugger Robot
dc690f455b [automerger skipped] Merge "Disable inline suggestions for afservice when talkback is enabled." into sc-dev am: fda724a5be am: 3bbce8d235 am: 671373ee9b -s ours 
am skip reason: Merged-In Ifb37ac2a164a4564b74c6ab80a0c31fbba3495df with SHA-1 364a5225be is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15401901

Change-Id: Id3b6ac12c389ff1cdc3df1176e4e5e49ad782eeb
 2021-07-29 16:08:34 +00:00
Chalard Jean
ee8e42aa2b Merge "Fix: ConnectivityManager methods crashing with SecurityException" into sc-dev am: 4e7b1128a4 am: c962260ff6 am: 4db9916a3d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15401698

Change-Id: I35009fefa95bdd57f3dbd2817486d29537fc0311
 2021-07-29 16:08:18 +00:00
Emilian Peev
510d5c03c9 Merge changes from topic "b194508189" into sc-dev am: e922ec31aa am: ad6a933594 am: a46c938337 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15376189

Change-Id: I46fa7856960670495b78abff270108fc3f77ff72
 2021-07-29 16:07:58 +00:00
TreeHugger Robot
7a1c03d4d1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 4947a81e8a -s ours am: dec3151deb -s ours am: 7b9c5ecb95 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15413710

Change-Id: I02f70133aba4f4ee0a565a89820a52f5b53e2e48
 2021-07-29 16:07:25 +00:00
TreeHugger Robot
117d107e25 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 2032a34d12 -s ours am: 1be8f48150 -s ours am: f8677fd7f4 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15413212

Change-Id: I74dc46579ba08085573086804c03a6ee38e5770b
 2021-07-29 16:07:00 +00:00
TreeHugger Robot
d273e7421d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 45c7e3679f -s ours am: a92b2e2e53 -s ours am: 61ca353bc2 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15405283

Change-Id: I8dd5a8104d6a74a24453ad60b723974f3cde4586
 2021-07-29 16:06:48 +00:00
Jayant Chowdhary
27353ab9b3 Merge "camera2: Add fwk-only tags for SCALER_CROP_REGION and metering regions." into sc-dev am: 782b4e9e08 am: b893159527 am: 5b9569da83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15349267

Change-Id: I7af66c634780a4434554c6ca1b2b7a63786bf457
 2021-07-29 16:06:23 +00:00
TreeHugger Robot
216e71046b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: d9b15ede54 -s ours am: eda519f73e -s ours am: 39393b2487 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15404424

Change-Id: I63255df5e94264d8694f70f19d20172cc1c688dc
 2021-07-29 16:06:03 +00:00
TreeHugger Robot
5448935584 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 4f1a07092f -s ours am: 6e6d10775a -s ours am: 256f5023f2 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15404426

Change-Id: Id7738b8623aba4b07dfc95c87834959e845065d2
 2021-07-29 16:05:21 +00:00
TreeHugger Robot
8a7040345d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: cceb790eb1 -s ours am: 2362e37dd7 -s ours am: e991a776d3 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15405282

Change-Id: Ice9120ebd297c3866527ecf49c3dad2de434259a
 2021-07-29 16:04:54 +00:00
Bill Yi
6bedcd747c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82ab2911a3 -s ours am: 83a7344207 -s ours am: ed839b28b9 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15413210

Change-Id: Ia25759380bb0cbfbdd9fd8987fa6471dfcdd999f
 2021-07-29 16:04:29 +00:00
Rahul Sabnis
413b8abf9e Merge "Require calls to BluetoothA2dp#setBufferLengthMillis to pass a non-negative value" into sc-dev am: 7a3cb23bf9 am: 7d712166f8 am: 97fcfce7b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15404294

Change-Id: I696d3081913130b62df082de4ca26c359f9e453d
 2021-07-29 16:04:16 +00:00
Chris Tate
7862f20d13 Merge "Consistent reporting of failure conditions" into sc-dev am: e833132601 am: d5a0d8d038 am: b0a0f75039 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15273601

Change-Id: I728f60dd0e9973c020f5f373a9ad09609f2b2f0f
 2021-07-29 16:03:57 +00:00
Songchun Fan
3ecef3f34f Merge "[pm] ignore partial progress update after off-incfs migration" into sc-dev am: 5ba5f1392f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15405281

Change-Id: Ic6c357c98ccab6b221dc4cfd18371c318b9e2fb6
 2021-07-29 16:03:37 +00:00
Lyn Han
760423f3df [automerger skipped] Add logs to ensure that QS / NPVC clip bounds match am: 0f8dfa5326 am: 114cdf294d -s ours am: 9db51dd791 -s ours 
am skip reason: skipped by user lynhan

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15390009

Change-Id: I53ab321754bcf52ec89b6f6324e87b491a8ba6d2
 2021-07-29 16:03:32 +00:00
Songchun Fan
17ce18debe Merge "[pm] ignore partial progress update after off-incfs migration" into sc-dev am: 5ba5f1392f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15405281

Change-Id: I7de2383476383a6987e3c9872961400d326c177b
 2021-07-29 16:03:30 +00:00
Winson Chiu
a6a5161e53 Merge "Add generic import support for Codegen" 2021-07-29 16:01:39 +00:00
Winson
d336704eae Add generic import support for Codegen 
Supports any kind of DataClass or NonNull-type annotations instead of
enforcing the Android framework package.

Bug: 195012034

Test: manual, generate for DomainVerificationInfo, verify no change
Test: manual, generate for mainline class, verify no internal import

Change-Id: I0360281aa20b7f2c6e75dec88a92b810fa69b9b7
 2021-07-29 16:00:36 +00:00
Beth Thibodeau
604e5b4e80 Merge "Reduce height of expanded media controls" 2021-07-29 15:57:50 +00:00
Matt Pietal
e7bf8bc02f Merge "Make sure SIM PIN screen shows" into sc-dev am: c3915dcbe9 am: 36be5bb8cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15409421

Change-Id: Ia3f20c75ac5a58abcce8382f11585010695a9037
 2021-07-29 15:57:49 +00:00
Beverly Tai
f388f15e9f Merge "Rescan face when user preses empty space on LS" into sc-dev am: 866753754b am: 847acc3926 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15412658

Change-Id: I132b09d6652670477d5bd00877dbb4f67a808bae
 2021-07-29 15:57:32 +00:00
Beverly Tai
7e031eb4a9 Merge "Don't setDeviceEntryIntent on AOD" into sc-dev am: 11f74e42a5 am: bc963b8701 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15412657

Change-Id: I3782ab1b20ef6e8d50fe507f28dfb20bb9d370bf
 2021-07-29 15:57:19 +00:00
Yi Kong
1cebd1fc9e Merge "Add TRIGGER_SHELL_PROFCOLLECT_UPLOAD permission" am: 6f1a606d73 am: 4d1b6559ba am: 120891e605 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1781187

Change-Id: I207db80e60ef7e41b3245baafa38638fc573fd3e
 2021-07-29 15:56:28 +00:00
Fiona Campbell
f2436dd4c1 Merge "Null check for logicaldisplay" into sc-dev am: fca58882db am: 951c4e101a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15403077

Change-Id: I097f7bd60043cd22a81f1f529f0d8767dad2dae2
 2021-07-29 15:56:09 +00:00
Jing Ji
66bcf0ff3b Merge "Fix NullPointerException in PhantomProcessList due to race condition" into sc-dev am: 8b872f5c71 am: 78a4470a84 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15404738

Change-Id: I06976fec253803c0196adb0678c8f9dbb2d63260
 2021-07-29 15:55:58 +00:00
TreeHugger Robot
671373ee9b Merge "Disable inline suggestions for afservice when talkback is enabled." into sc-dev am: fda724a5be am: 3bbce8d235 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15401901

Change-Id: Ib03271288342fd47baf1f489623a026958d8f50c
 2021-07-29 15:55:35 +00:00
Chalard Jean
4db9916a3d Merge "Fix: ConnectivityManager methods crashing with SecurityException" into sc-dev am: 4e7b1128a4 am: c962260ff6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15401698

Change-Id: I2fb4b4703f855e2bf63173bf48ff3ec2d1db5225
 2021-07-29 15:55:11 +00:00
Emilian Peev
a46c938337 Merge changes from topic "b194508189" into sc-dev am: e922ec31aa am: ad6a933594 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15376189

Change-Id: Ic338630df439bdf40baf85a48bd795b073bc6e38
 2021-07-29 15:54:30 +00:00
TreeHugger Robot
7b9c5ecb95 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 4947a81e8a -s ours am: dec3151deb -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15413710

Change-Id: Ifdcabd008527cd14fc61eb2cc95ca4a849ec6622
 2021-07-29 15:53:59 +00:00
TreeHugger Robot
f8677fd7f4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 2032a34d12 -s ours am: 1be8f48150 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15413212

Change-Id: Ie6b310978e2e3949d4e232f417e6a25f5ef7e972
 2021-07-29 15:53:51 +00:00
TreeHugger Robot
61ca353bc2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 45c7e3679f -s ours am: a92b2e2e53 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15405283

Change-Id: I24ef0ea1b0fd410dc553c4911f2c930c0ba0e722
 2021-07-29 15:53:42 +00:00
Jayant Chowdhary
5b9569da83 Merge "camera2: Add fwk-only tags for SCALER_CROP_REGION and metering regions." into sc-dev am: 782b4e9e08 am: b893159527 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15349267

Change-Id: I50d9de6fbad5b3c5d2ffed842c80ff690fd1340d
 2021-07-29 15:53:15 +00:00
TreeHugger Robot
39393b2487 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: d9b15ede54 -s ours am: eda519f73e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15404424

Change-Id: Iec5c91db9a35cc5066cada4148d850c02e08e1aa
 2021-07-29 15:53:02 +00:00
TreeHugger Robot
256f5023f2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 4f1a07092f -s ours am: 6e6d10775a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15404426

Change-Id: I13ecd00d300f2f1beb559adc30cbe3317645d738
 2021-07-29 15:52:56 +00:00