drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
691,285 Commits 1 Branch 0 Tags
Commit Graph

7399 Commits

Author SHA1 Message Date
TreeHugger Robot
e35d11225a Merge "Prevent exfiltration of system files via user image settings." into sc-dev am: be7735efcb am: 5b62c51502 am: 8c10a6aa0d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071224

Change-Id: I100fd497b19a8cad113c7d9320c1e64212502896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 15:25:20 +00:00
TreeHugger Robot
8c10a6aa0d Merge "Prevent exfiltration of system files via user image settings." into sc-dev am: be7735efcb am: 5b62c51502 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071224

Change-Id: I892a79e6b627eb1e8e58007613a5855b7e74250a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 15:06:37 +00:00
TreeHugger Robot
5b62c51502 Merge "Prevent exfiltration of system files via user image settings." into sc-dev am: be7735efcb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071224

Change-Id: Ib7bf62ea0ad68e3a104d426f7f1d912597cc471e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 14:46:51 +00:00
Bill Yi
68effaa6f6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I092ef891748827f6351a5849153883e8227aff93
 2022-03-23 17:24:58 +00:00
Bill Yi
24cc3cd739 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-03-18 02:22:56 +00:00
Eric Biggers
071a3b1820 Merge "Remove support for converting from FDE to FBE" am: 855ec2d31a am: 6a72370d4b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2027583

Change-Id: I07ed4132c24152febfa4c2ae323594452953f043
 2022-03-17 22:42:57 +00:00
Eric Biggers
855ec2d31a Merge "Remove support for converting from FDE to FBE" 2022-03-17 21:59:32 +00:00
Etienne Ruffieux
520a6e5a9b Merge "[API Review] Replace usage of getUuids by new SystemApi" am: e2b00d3a7d am: 1de1157d4e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2020438

Change-Id: Ie10cd534ac9a245903c1674445ef9eb17de97daf
 2022-03-17 10:59:16 +00:00
Etienne Ruffieux
e2b00d3a7d Merge "[API Review] Replace usage of getUuids by new SystemApi" 2022-03-17 09:44:51 +00:00
SongFerng Wang
be4ecfc58e Merge "Add the API to get the AudioLocation" am: 919194578b am: 78d86dc33b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2027930

Change-Id: I4293eb1b67ae754b0b5515309267651b9355a708
 2022-03-17 04:59:47 +00:00
Eric Biggers
bf9e19c56c Remove support for converting from FDE to FBE 
Devices that launched with Android 10 or later require FBE (File Based
Encryption) from the beginning, so there's no need to support converting
to FBE after the fact anymore.  This was only ever a developer option,
so it probably wasn't used much.  And in any case, it's not used
anymore, as isConvertibleToFBE() is hard-coded to return false.  Besides
the fact that FBE has been required for several releases now, this
functionality was only ever available on devices that use FDE (Full Disk
Encryption), but FDE support has been removed from Android.

Therefore, remove this unused code.

Bug: 208476087
Change-Id: I1f56c8e05fb3fba09aab4bf5f8609b0f552b8999
 2022-03-16 23:17:11 +00:00
SongFerngWang
b35ca2b570 Add the API to get the AudioLocation 
1.Add the API(getAudioLocation) to get the AudioLocation of LE audio
device at LeAudioProfile.
2.Add LeAudio summary state

Bug: 218626547
Test: build pass
Change-Id: I3655d1771f0ee9d60f65406e83b42e40307bd4f3
Merged-In: I3655d1771f0ee9d60f65406e83b42e40307bd4f3
 2022-03-16 18:09:27 +08:00
Bill Yi
25428584e9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9fa842399c47ca95eac200eef8ef6cb551a43c3d
 2022-03-15 21:26:02 +00:00
Bill Yi
7976100417 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2bb145b5f9fdec5ed9ba1268fdceae843b6919b3
 2022-03-15 21:08:52 +00:00
Etienne Ruffieux
facf209f74 [API Review] Replace usage of getUuids by new SystemApi 
Bug: 223253153
Test: build
Tag: #feature
Change-Id: I8b75a774cb05863b340de0fff83130e7ab9d3891
 2022-03-10 16:13:57 +00:00
SongFerng Wang
254ef629f5 Merge "[LE] Connect and disconnect both LE headsets" am: ececa85c9e am: 0567e66c2c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2010675

Change-Id: I649095997f69f04a211030140c087d78ba5a5bc7
 2022-03-10 08:01:00 +00:00
SongFerng Wang
ececa85c9e Merge "[LE] Connect and disconnect both LE headsets" 2022-03-10 07:08:29 +00:00
SongFerngWang
d936b5bc7a [LE] Connect and disconnect both LE headsets 
Disconnect the LE headset from settings page, only one
side(L or R) is disconnected.

Bug: 206049683
Test: build pass
Change-Id: I8c9c808b830947ab8d8510042827e55f85faa781
 2022-03-09 04:49:26 +08:00
Treehugger Robot
4f64366984 Merge "Update @RequiresApi declarations for T to be 33." am: 5c72552e39 am: dff79a4bf5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2015637

Change-Id: Ia15ef2e2121f5a8b2ab16f5f36af5d25812d83e9
 2022-03-08 18:53:18 +00:00
Michael Wright
06ce6c0299 Update @RequiresApi declarations for T to be 33. 
Lint assumes that the next API is going to be the previous API level +
1. This means that for things in development, when bumping the API level
for a prior release (e.g. bumping for SC-V2 while T is in development),
anything targeting the in-development API now needs to bump their
@RequireSdk levels by one.

Bug: 204295952
Test: N/A
Merged-In: I3c69d71f2f2ac75ce1ec3af7c63fa4d25bd9aebe
Change-Id: I3c69d71f2f2ac75ce1ec3af7c63fa4d25bd9aebe
 2022-03-08 17:56:30 +01:00
Oli Lan
bfb1cd5fd2 Prevent exfiltration of system files via user image settings. 
This is a backport of ag/17005706.

This adds mitigations to prevent system files being exfiltrated
via the settings content provider when a content URI is provided
as a chosen user image.

The mitigations are:

1) Copy the image to a new URI rather than the existing takePictureUri
prior to cropping.

2) Only allow a system handler to respond to the CROP intent.

Bug: 187702830
Test: build and check functionality
Merged-In: Idf1ab60878d619ee30505d71e8afe31d8b0c0ebe
Change-Id: Ieee3f2d8057e648bde52a91463d517abb47f37eb
 2022-03-03 16:56:18 +00:00
Treehugger Robot
c094181aa0 Merge "Fix LicenseHtmlGeneratorFromXml miss files header" am: 0239107ed5 am: 1a480d9759 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2005491

Change-Id: I09f2aeaf28db214e28afc557e7611013487b43dd
 2022-03-02 22:31:53 +00:00
Treehugger Robot
1a480d9759 Merge "Fix LicenseHtmlGeneratorFromXml miss files header" am: 0239107ed5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2005491

Change-Id: Iad2d1f493d8f7185d7a8a4015dbbbae2bdc4959e
 2022-03-02 22:09:56 +00:00
Chaohui Wang
c5dcbc29ad Fix LicenseHtmlGeneratorFromXml miss files header 
Bug: 219375421
Test: Robolectric
Change-Id: I71d24e843e7c5c0c0c5ca6ce9b4e6da08b79f757
 2022-03-02 11:18:09 -08:00
Rahul Sabnis
a5d87a885b Merge "Make BluetoothHeadset APIs used by Telecom into System APIs" am: c3c651dd07 am: 9a9f985fd2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1932883

Change-Id: Ia2abdf8e49958e089c9ee15816512ae87940b2eb
 2022-02-25 23:41:16 +00:00
Rahul Sabnis
9a9f985fd2 Merge "Make BluetoothHeadset APIs used by Telecom into System APIs" am: c3c651dd07 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1932883

Change-Id: I6357b00fff28a1c00796d16c9717f990686fe27d
 2022-02-25 23:11:44 +00:00
Rahul Sabnis
90e758afed Make BluetoothHeadset APIs used by Telecom into System APIs 
Tag: #feature
Bug: 195156304
Test: Manual
Merged-In: I13d6f553f5b9d6ca7c2ae9a42450875b16cd1490
Change-Id: I13d6f553f5b9d6ca7c2ae9a42450875b16cd1490
 2022-02-24 11:24:48 -08:00
Bill Yi
06353761e6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ifd2cb8d5654d6e38e20c8f66747b0ac4cc2f83c5
 2022-02-23 07:37:11 +00:00
Bill Yi
96cc0364fe Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib57a5a1930646bfb5521b4df294e4c0cc628fbb7
 2022-02-23 07:32:21 +00:00
Bill Yi
0a164b2648 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I917d6b1b9669eba73490411b8e10415a2e6b8253
 2022-02-23 07:22:32 +00:00
Treehugger Robot
5300854f32 Merge "Settingslib: create OWNERS file for tests/integ/devicestate" am: 7db2d81ae0 am: a682f1bab2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1993250

Change-Id: I15fa3f686853a1a725c64a3ff16d6399f52ffa6f
 2022-02-22 18:32:29 +00:00
Treehugger Robot
a682f1bab2 Merge "Settingslib: create OWNERS file for tests/integ/devicestate" am: 7db2d81ae0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1993250

Change-Id: I9597d001044f9d7d190a3ccd22fb0eb166a7edad
 2022-02-22 18:11:27 +00:00
Christian Göllner
24e8867ae2 Settingslib: create OWNERS file for tests/integ/devicestate 
Add alexflo@ and chrisgollner@
Bug: n/a
Test: n/a

Change-Id: Ie97fb105893064f92231b34f64c86609b6a0d722
 2022-02-21 15:22:58 +00:00
Treehugger Robot
237cdb3a5b Merge "Create OWNERS file for settingslib/devicestate" am: d3b8608d23 am: 8cf55c7e07 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1985027

Change-Id: I13dd0fb1bb0b8d856185f9df0d3124fae25d35a7
 2022-02-17 22:36:18 +00:00
Treehugger Robot
8cf55c7e07 Merge "Create OWNERS file for settingslib/devicestate" am: d3b8608d23 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1985027

Change-Id: Ibf5582c302f64dbf4f2fe42d893ca6c1b48b538a
 2022-02-17 22:14:42 +00:00
Treehugger Robot
d3b8608d23 Merge "Create OWNERS file for settingslib/devicestate" 2022-02-17 12:34:35 +00:00
Rahul Sabnis
f112b0226c Merge "Remove hidden Bluetooth dependencies" am: 2eebe9a0bc am: 9b7753af92 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1988929

Change-Id: I1d0bb525b09eb059313b95a93208666ab7a7df08
 2022-02-16 22:57:53 +00:00
William Escande
336c9135df Merge "Remove intdef usage that block bluetooth apex" am: b72b351d21 am: f81fe1cfb7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1988587

Change-Id: I654611d62cc38517165923724c098b5e6ec7f941
 2022-02-16 22:57:32 +00:00
Rahul Sabnis
9b7753af92 Merge "Remove hidden Bluetooth dependencies" am: 2eebe9a0bc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1988929

Change-Id: I7d42145f03b5e76c966369aad6da520233521ee0
 2022-02-16 22:37:05 +00:00
William Escande
f81fe1cfb7 Merge "Remove intdef usage that block bluetooth apex" am: b72b351d21 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1988587

Change-Id: I688c605a1cfbe77874148cc1df278c5d4ac0311a
 2022-02-16 22:36:14 +00:00
Rahul Sabnis
2eebe9a0bc Merge "Remove hidden Bluetooth dependencies" 2022-02-16 22:31:57 +00:00
William Escande
b87c56fb3b Remove hidden Bluetooth dependencies 
Bug: 217736913
Test: pre-submit
Change-Id: Id5d8ac79f773d29fd2200ed336872067cddfa276
 2022-02-16 20:03:47 +01:00
William Escande
a877bd488f Remove intdef usage that block bluetooth apex 
Test: pre-submit
Change-Id: I932cea4b02bbc8e43d5d373ba2a3305322032104
Bug: 217736913
 2022-02-16 17:15:06 +01:00
Shaowei Shen
697788291b Merge "DO NOT MERGE: provide different change in downstream since merge conflict [Output Switcher] Enable volume control for single cast device" into sc-v2-dev 2022-02-16 03:48:36 +00:00
Christian Göllner
332b999367 Create OWNERS file for settingslib/devicestate 
Add alexflo@ and chrisgollner@
Bug: n/a
Test: n/a

Change-Id: I06ed12fb8495aba0c6fbfd0d8b5e8bf389b24620
 2022-02-14 11:41:54 +00:00
Presubmit Automerger Backend
22b87017e7 [automerge] DO NOT MERGE: provide different change in downstream since merge conflict [Output Switcher] Enable volume control for single cast device 2p: d1f381a7db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16660809

Bug: 202500642
Change-Id: I28a6fc24644460f01aa7cd9e25a94a5814a14ee3
 2022-02-14 08:43:40 +00:00
shaoweishen
d1f381a7db DO NOT MERGE: provide different change in downstream since merge conflict [Output Switcher] Enable volume control for single cast device 
update method for checking remote group device logic by sessionInfo

Bug: 202500642
Test: Verified on device
Change-Id: If12c53e88976c590c38d45f7ffd9b7b84028c14d
 2022-02-14 08:43:33 +00:00
Bill Yi
23542b63b5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I928bac2e47f9c59b88b8584993169f177aee09e7
 2022-02-12 12:10:12 +00:00
Bill Yi
d3e5a46bf2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia6ea04ec9073656ef940c098ce85f6b2538482f0
 2022-02-12 12:07:02 +00:00
Bill Yi
b6be55ad2a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Icc4251be2571c31657c361f14952fe17897c8891
 2022-02-12 12:03:43 +00:00