7466 Commits

Author SHA1 Message Date
Xin Li
487d87cadc Merge "Merge Android 13 QPR2" 2023-03-14 21:40:43 +00:00
Prashant Patil
fb32aac1ea Keystore: Attestation fix for AOSP and GSI builds
Device ID attestation was failing in AOSP and GSI images due to
properties mismatch in Build.java and actual device properties.
(For example, the value of Build.DEVICE on a Raven device running
an AOSP build would be 'aosp_raven', but KeyMint was provisioned
with the value 'raven'.)

To fix above issue, properties ro.product.*_for_attestation were
introduced in AOSP build files (eg. aosp_raven.mk) only. But this
was not sufficient for both AOSP and GSI. The same solution does
not work for GSI images: GSI images are generic and so we cannot
set device-specific properties in them.

So, if ro.product.*_for_attestation properties are empty or unknown,
they are read from ro.product.vendor because these values are not
changed after flashing GSI images also. This fix will work for
both AOSP and GSI images. Device ID properties preferences for
eg. Build.BRAND_FOR_ATTESTATION = ro.product.brand_for_attestation ->
ro.product.vendor.brand -> UNKNOWN.

Bug: 268294752
Bug: 110779648
Bug: 259376922
Test: atest VtsAidlKeyMintTargetTest:PerInstance/NewKeyGenerationTest#EcdsaAttestationIdTags/0_android_hardware_security_keymint_IKeyMintDevice_default
Test: atest VtsAidlKeyMintTargetTest:PerInstance/NewKeyGenerationTest#EcdsaAttestationIdTags/1_android_hardware_security_keymint_IKeyMintDevice_strongbox
Test: atest CtsKeystoreTestCases:android.keystore.cts.KeyAttestationTest CtsKeystoreTestCases:DeviceOwnerKeyManagementTest
Change-Id: I574eca430cd2022cb9c270ca23ad33f6e5423cd4
2023-03-13 18:28:06 +00:00
Jeff Sharkey
07b95a8abd Merge "Update system APIs based on feedback." am: 1ae5b8e863
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2481488

Change-Id: I86eac856a57e9bb8df7d764bd9fa98135d435a6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-12 16:12:49 +00:00
Jeff Sharkey
293ee3fdde Update system APIs based on feedback.
API council has requested that the recently added BroadcastOptions
APIs be modified to better match API guidelines.

Bug: 267646347
Test: treehugger
Change-Id: I7e4e649b6fc46212fbfad53b32cbcee1b5a2efa7
2023-03-10 10:08:23 -07:00
Jeff Sharkey
7f5e2c32cc Merge "Update system APIs based on feedback." am: 0cf48623fc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2472724

Change-Id: I80d84428018666020993e9666ae2db72e931debb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 03:11:16 +00:00
Jeff Sharkey
0cf48623fc Merge "Update system APIs based on feedback." 2023-03-09 02:47:49 +00:00
Rambo Wang
0aa2cf776e Merge "Introduce CarrierConfigChangeListener API to monitor CC change" am: e302b2a385
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2467181

Change-Id: Icd69b13ad0fcc7a179704e6a12040a8e95e7d817
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 01:27:43 +00:00
Rambo Wang
e302b2a385 Merge "Introduce CarrierConfigChangeListener API to monitor CC change" 2023-03-09 00:49:59 +00:00
Jeff Sharkey
438719c03f Update system APIs based on feedback.
API council has requested that the recently added BroadcastOptions
APIs be modified to better match API guidelines.

Bug: 267646347
Test: treehugger
Change-Id: Ia466a1a3428fa25b6e677bbf29bad0c74e469f54
Merged-In: I28456b5f1e155cef1e8fc3f4f9f500c9d8dc26f4
2023-03-08 22:14:50 +00:00
Anton Hansson
2880f60f42 Merge "Use filegroups for the droidstub txt files" am: 134ad28293
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2469524

Change-Id: Iffe9aeeb87e675fe3e404434f17179452cc455ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 10:43:14 +00:00
Anton Hansson
134ad28293 Merge "Use filegroups for the droidstub txt files" 2023-03-06 10:34:13 +00:00
Anton Hansson
881e2ef7d9 Merge "Move java_api_contributions closer to their source" am: 39536ebaaf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2469523

Change-Id: I22c917cdce45ab31761c8002eec907204781203a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 09:47:53 +00:00
Anton Hansson
39536ebaaf Merge "Move java_api_contributions closer to their source" 2023-03-06 09:12:50 +00:00
Treehugger Robot
34d1c0a1d9 Merge "Change get/setUserHandle to get/setSubscriptionUserHandle." am: cd2bdd1e84
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2468184

Change-Id: I3d8aeca44ad2e6eb520ef161142b440234f846a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 07:11:36 +00:00
Treehugger Robot
cd2bdd1e84 Merge "Change get/setUserHandle to get/setSubscriptionUserHandle." 2023-03-04 01:48:38 +00:00
Anton Hansson
b7cda92811 Use filegroups for the droidstub txt files
This allows moving the droidstubs modules into a subdir of
frameworks base. The paths would otherwise fail to resolve when
doing so.

Bug: 271563074
Test: m
Change-Id: I3472b37d8f4739d5018d9bb36b06f03b84f99e9a
2023-03-03 18:27:37 +00:00
Anton Hansson
519a8924f9 Move java_api_contributions closer to their source
These don't need to be defined in the top level Android.bp. Move
them into the directory where the files live.

Bug: 271563074
Test: m
Change-Id: I104374e49ba62de50016aa4a22173d5dbd00c257
2023-03-03 18:26:45 +00:00
rambowang
bc4480ea6e Introduce CarrierConfigChangeListener API to monitor CC change
The new interface is used for system components and 3rd party apps
to monitor carrier config changes, replacing the current carrier config
change broadcast receivers which has known performance issue.

Bug: 244087782
Test: atest CarrierConfigManagerTest

Merged-In: I782e3aa2312886279cc7f449fa3a8238b4115407
Change-Id: I782e3aa2312886279cc7f449fa3a8238b4115407
(cherry picked from commit c5e36e1c1f83cc130a96498f3117090065fa0531)
2023-03-03 17:16:30 +00:00
Jack Yu
5b326816cb Merge changes from topic "auto_data_switch_api"
* changes:
  Add MOBILE_DATA_POLICY_AUTO_DATA_SWITCH
  Add string for auto data siwtch notification
2023-03-03 16:47:04 +00:00
Aishwarya Mallampati
8180cf2787 Change get/setUserHandle to get/setSubscriptionUserHandle.
Bug: 255592760
Test: Sanity, atest android.telephony.cts.SubscriptionManagerTest, atest
com.android.internal.telephony.SubscritpionControllerTest

Merged-In: I6df0579cd33e2b2efcd8477270160b46c10d0a3a
Change-Id: I6df0579cd33e2b2efcd8477270160b46c10d0a3a
2023-03-02 21:55:09 -08:00
Ling Ma
09b3c89b1c Add MOBILE_DATA_POLICY_AUTO_DATA_SWITCH
The feature only applies to non-DDS. If enabled, we automatically switch to the non-DDS for data traffic when it has better availability than the DDS.

Test: cts
Bug: 244064524
Merged-In: Id827b3e253b637273504d87c8db64893c7b70924
Change-Id: Id827b3e253b637273504d87c8db64893c7b70924
2023-03-02 17:59:55 -08:00
Rambo Wang
c506557875 Merge "Introduce APIs to retrieve only carrier configs as needed" am: 9452519e24
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2467180

Change-Id: I051281bbdb310f58855fe03785470ee2e8679425
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 01:39:25 +00:00
Rambo Wang
9452519e24 Merge "Introduce APIs to retrieve only carrier configs as needed" 2023-03-02 22:21:08 +00:00
Alisher Alikhodjaev
941d928575 Merge "Implement NfcServiceManager and NfcFrameworkInitializer" am: 7e359a705b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2360420

Change-Id: I96a8563b02a668743ac9c7a1dea9a95d68daa2f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 19:38:36 +00:00
Alisher Alikhodjaev
7e359a705b Merge "Implement NfcServiceManager and NfcFrameworkInitializer" 2023-03-02 19:26:41 +00:00
Treehugger Robot
a760f0ce34 Merge "Add setUserHandle and getUserHandle apis." am: ae4c8fc368
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2459669

Change-Id: I1018879e47df40dd7cc659e1f2070bf78b9032ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 17:23:12 +00:00
Treehugger Robot
ae4c8fc368 Merge "Add setUserHandle and getUserHandle apis." 2023-03-02 16:59:24 +00:00
rambowang
f94d838de2 Introduce APIs to retrieve only carrier configs as needed
Current CarrierConfigManager APIs only allow to retrieve
ALL supported carrier configs at once. It may be as many
as hundreds of keys/values in one bundle which is not only
slow but also consumes unnecessarily more resources.

Clients study shows that the majority of the clients actually
only care about one or few of carrier configs.

The new APIs allow clients to specify a single or
multiple configs they care about. The performance profiling
shows that it is not only much faster but also consumes much
less resources.

Bug: 244087782
Test: atest CarrierConfigManagerTest
Change-Id: I436b9ad1d7e928d628c0103144cd345e8c4c4e3c
Merged-In: I436b9ad1d7e928d628c0103144cd345e8c4c4e3c
(cherry picked from commit 365825e2c587d7c6a8e324a90a022f94b5ab2aeb)
2023-03-02 09:48:06 -06:00
Tyler Gunn
29bd3c4353 Merge "Deprecate EXTRA_CLEAR_MISSED_CALLS_INTENT." am: f2c0657709
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2461894

Change-Id: Ib252b9fcafdc2e05b4a766db952c8d051ba61fd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 23:31:49 +00:00
Tyler Gunn
f2c0657709 Merge "Deprecate EXTRA_CLEAR_MISSED_CALLS_INTENT." 2023-03-01 22:29:50 +00:00
Sean McQuillan
905fa5f6b6 Merge "Add codepoint exclusions API" am: 84d3ca061f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2372427

Change-Id: Ibc5ca203ba376ebed86228b1fbc81e9c341c03eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 01:58:04 +00:00
Sean McQuillan
84d3ca061f Merge "Add codepoint exclusions API" 2023-03-01 00:37:47 +00:00
Tyler Gunn
a2879414b9 Deprecate EXTRA_CLEAR_MISSED_CALLS_INTENT.
This intent was never exposed as a proper API and the developer should
use a TelecomManager API instead.

Test: Make/run cts/unit tests
Fixes: 148361587
Change-Id: I058490ceed809d3e4c0d32b300463fffed1a2dac
2023-02-28 23:41:53 +00:00
Alisher Alikhodjaev
08b7d5270f Implement NfcServiceManager and NfcFrameworkInitializer
Bug: 244264995
Test: read a tag, nfc on/off
Merged-In: Ie11e888cb852740d806d06c0c725bb2a4544e13c
Change-Id: Ie11e888cb852740d806d06c0c725bb2a4544e13c
2023-02-28 14:34:15 -08:00
Aishwarya Mallampati
e35b29f1a0 Add setUserHandle and getUserHandle apis.
Bug: 247166170
Test: Basic testing, unittests
Merged-In: I4b9ab5f56a3ddac25ab8c335a84d86b5ba0fe932
Change-Id: I4b9ab5f56a3ddac25ab8c335a84d86b5ba0fe932
2023-02-27 22:31:56 -08:00
Treehugger Robot
d71d9086d1 Merge "Update API text file format to include missing generic signature" am: 5ec41c255e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2453865

Change-Id: I8c40ac17e7a6f092bb7355975ae71a5cae7469ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 14:00:58 +00:00
Jihoon Kang
ebda7db742 Update API text file format to include missing generic signature
Currently, API text file does not include type parameter list for
constructor item. This change reformats the api text file to include the
missing type parameter list, with respect to the change in the behavior
of metalava.

Test: m update-api
Bug: 269135125
Change-Id: I46d364291615eabe071eab2dfc28796448f3139e
2023-02-23 20:01:09 +00:00
Jack Wu
c3563cca9a Merge changes from topic "batteryStateOfHealth" am: 9614aa9ce8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2442659

Change-Id: Id9c59f7265f2494101e7bbcdcdb7c9d334f29e43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 07:30:04 +00:00
Jack Wu
29c416f10b BatteryManager: Add new battery intent and property am: 5c264266cc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2441721

Change-Id: Iffc18abf984f23718d90c295491c04a51c824748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 07:29:53 +00:00
AleX Pelosi
f25f8106ae BatteryManager: stateOfHealth is a property
Read batteryStateOfHealth from HealthData with access control

Bug: 251427118
Test: m update-api ; m
Change-Id: Ida87ef9f59c32cf52b036f37c7c261d03d3b4c37
Signed-off-by: AleX Pelosi <apelosi@google.com>
2023-02-23 01:25:41 +00:00
Jack Wu
5c264266cc BatteryManager: Add new battery intent and property
These are going to be public:
- Battery state of health
- Battery cycle count
- Charging status

These are going to be system API
- BATTERY_PROPERTY_MANUFACTURING_DATE
- BATTERY_PROPERTY_FIRST_USAGE_DATE
- BATTERY_PROPERTY_CHARGING_POLICY

Bug: 251427118
Test: m
Change-Id: If74b96d7657611934d293df8376296e373ec9b35
Signed-off-by: AleX Pelosi <apelosi@google.com>
Signed-off-by: Jack Wu <wjack@google.com>
2023-02-23 01:25:29 +00:00
Benedict Wong
48e1a31ddb Merge "Add API for VCN configuration of UDP port 4500 NAT Timeouts" am: c1bd048026
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2436536

Change-Id: Ia67991623f180e40dabdb9dfcdaa4bdc087a0f09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 09:02:03 +00:00
Benedict Wong
c1bd048026 Merge "Add API for VCN configuration of UDP port 4500 NAT Timeouts" 2023-02-16 08:25:34 +00:00
Treehugger Robot
a5cfe59a5d Merge "Adds API AudioManager#setLeAudioSuspended" am: a05aa12869
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2439772

Change-Id: Ic7b6ad59560f024a4ede8f11cf11d2bbd84613df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 03:16:14 +00:00
Treehugger Robot
3e5397d945 Merge "Add function for getting supported audio format for LE Audio Broadcast" am: 433eceabff
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2428912

Change-Id: Icb75b22d15fca3a4595f2fec17c04b68e3d8df63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 03:14:08 +00:00
Andy Hung
452cd4a7e9 Merge "Report AC-4 decoder profile and level" am: e091cebf12
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2389989

Change-Id: I5cbf9727a4a6eec89970b2309129e9fe26733cc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 03:09:04 +00:00
Treehugger Robot
a05aa12869 Merge "Adds API AudioManager#setLeAudioSuspended" 2023-02-16 02:49:01 +00:00
Treehugger Robot
433eceabff Merge "Add function for getting supported audio format for LE Audio Broadcast" 2023-02-16 02:45:47 +00:00
Andy Hung
e091cebf12 Merge "Report AC-4 decoder profile and level" 2023-02-16 02:44:47 +00:00
Rahul Sabnis
ee9fc5a124 Adds API AudioManager#setLeAudioSuspended
Bug: 257881495
Test: Manual
Merged-In: Ib07d54ffb6fc34ea2f5985115fde132ab19c27c2
Change-Id: Ib07d54ffb6fc34ea2f5985115fde132ab19c27c2
2023-02-15 17:41:40 -08:00