692799 Commits

Author SHA1 Message Date
William Hester
dfca3dbdb6 Consolidate point where ADB is enabled for Test Harness Mode
Test Harness Mode relies on enabling ADB upon boot. However, currently,
there appears to be a race condition when enabling ADB. Test Harness
Mode enables ADB in PHASE_BOOT_COMPLETED, and ADB sets itself up in
PHASE_ACTIVITY_MANAGER_READY, both by writing a setting. It appears that
sometimes, the setting for initializing ADB's state commits *after* the
setting to enable ADB for Test Harness Mode, which means that ADB turns
on for a brief moment, then off until the device is manually fixed.

This changes it so that the AdbService checks the Test Harness Mode
property when initializing ADB state, always enabling ADB on boot if
Test Harness Mode is enabled.

Bug: 232813060
Test: tested with user and userdebug builds, both enable adb correctly
Change-Id: I518415dda275bc3d563820ead611e5f017368c95
2022-05-27 15:56:16 -07:00
Rambo Wang
4ce464c70b Merge "Fix race condition when TelephonyRegistry handles multi-SIM config change" am: 19e53cfdc8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2107190

Change-Id: I53d63a247cb99e020ff6f6555aa026dd538a149b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 16:45:55 +00:00
Rambo Wang
19e53cfdc8 Merge "Fix race condition when TelephonyRegistry handles multi-SIM config change" 2022-05-27 16:22:21 +00:00
Anton Hansson
e4fcdec29f Convert filegroup to library
This filegroup makes more sense as a standalone modules-utils library,
and can be migrated to the modules-utils repository. Remove the
unnecessary dependency from services.net-module-wifi.

Test: m
Change-Id: I95d270e5e885fc40bd21af693058ace9818f1e3e
2022-05-27 15:15:11 +00:00
Betty Chang
2122ee9b57 Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" am: e0939b12a8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2109044

Change-Id: I5464b06ba415f26b213b600aa456ae3497c5601a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 14:47:51 +00:00
Zoey Chen
8fd04b7cb6 [LeAudio] Move the QrCamera and decorateView from Settings to SettingsLib for Wifi and BT
Bug: 214340362
Test: Manual test
Change-Id: I0d10c9e34cfaeeb0f3cf1f0a2acbfda0cce0df13
Merged-In: I0d10c9e34cfaeeb0f3cf1f0a2acbfda0cce0df13
2022-05-27 14:34:24 +00:00
Betty Chang
e0939b12a8 Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" 2022-05-27 14:30:02 +00:00
Jooyung Han
8cff29b8ea Unhide Parcel.writeTypedList() with additional flag
The flag should be propagated to Parcelable.writeToParcel(). But since
it was hidden, we were not able to pass the flag to elements of the
list.

Bug: 215654054
Test: atest android.os.cts.ParcelTest
Change-Id: I72d419caa74c62d979c5102ebd8eba4338ec3e3b
2022-05-27 18:33:52 +09:00
Treehugger Robot
b36055528a Merge "[LeAudio] Add LocalBluetoothLeBroadcast and LocalBluetoothLeBroadcastAssistant" am: 51b916cb46
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2107986

Change-Id: I007fdf3909348f69d31647bcf52dd471291d2ebc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 09:05:33 +00:00
Zoey Chen
29a4be8274 Merge "[LeAudio] Add LocalBluetoothLeAudioContentMetadata and LocalBluetoothLeBroadcastMetadata" am: 818bcf350a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2107985

Change-Id: I1331a658771ea03e310869a6a0199fbddc4de6b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 09:04:18 +00:00
Treehugger Robot
51b916cb46 Merge "[LeAudio] Add LocalBluetoothLeBroadcast and LocalBluetoothLeBroadcastAssistant" 2022-05-27 08:57:12 +00:00
Zoey Chen
818bcf350a Merge "[LeAudio] Add LocalBluetoothLeAudioContentMetadata and LocalBluetoothLeBroadcastMetadata" 2022-05-27 08:40:10 +00:00
changbetty
83c8bbe303 Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT
Bug: 214338905
Test: Manual test
Change-Id: I51151d71b89a92fe6880a00ead490adeb14f20bb
Merged-In: I51151d71b89a92fe6880a00ead490adeb14f20bb
2022-05-27 04:23:30 +00:00
Treehugger Robot
65dfb195e0 Merge "Update javadoc to correct the typo" am: 4e76dec6c3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2107189

Change-Id: Ief96d8eb2a8c8c0f95f8a5e63112aea17f3e240f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 03:43:56 +00:00
Treehugger Robot
4e76dec6c3 Merge "Update javadoc to correct the typo" 2022-05-27 03:24:33 +00:00
Jack Yu
5b206b8126 Merge changes from topic "mvno_matching" am: a5fa62bcad
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2107246

Change-Id: Ief2ce4c07fc352ba31ee8413dfb46ed088c724b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 03:05:28 +00:00
Jack Yu
9efd98c8a5 Partially revert ag/17294635 am: ca544abf6f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2107248

Change-Id: Iff434db24da2c9b3375885a0b7e112a3441f1a40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 03:05:26 +00:00
Jack Yu
2a733748af Moved MVNO matching logic out of old data stack am: a95dd62e85
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2107247

Change-Id: I9fd856130a1cdfd88c327c9c54d547518efdfeb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 03:05:17 +00:00
Treehugger Robot
97cc602308 Merge "Traffic descriptor only data profile should be enabled" am: cf852e7c52
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2105665

Change-Id: I61b53a87bb9dfc36814e8a944cbb2e63a897da65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 02:55:16 +00:00
Jack Yu
a5fa62bcad Merge changes from topic "mvno_matching"
* changes:
  Document the QNS behavior
  Partially revert ag/17294635
  Moved MVNO matching logic out of old data stack
2022-05-27 02:43:25 +00:00
hupeng3
86bcd37b8f Toast: Fix JE caused by service not bind
Before calling unbindService, we need to call bindService,
but there are some logic problems in DisplayHashController,
which cause this problem to occur. Add the control variable mBound.

Bug: 232001919

Test: atest DisplayHashManagerTest

Signed-off-by: hupeng3 <hp121520@gmail.com>
Change-Id: I84cd1542af345d5078ef40ab282d2d405e967e8e
2022-05-27 10:37:48 +08:00
Treehugger Robot
cf852e7c52 Merge "Traffic descriptor only data profile should be enabled" 2022-05-27 02:32:33 +00:00
Rambo Wang
6f7d92c926 Fix race condition when TelephonyRegistry handles multi-SIM config change
TelephonyRegistry only updates some internal statuses related to
active modem count after receiving ACTION_MULTI_SIM_CONFIG_CHANGED.
If another component receives the same intent firstly and calls
TelephonyRegistryManager to either register or notify an event,
the internal status related to active modem count may not be able
to update yet, causing IAE saying e.g. phoneId is invalid.

To fix the issue, onMultiSimConfigChanged will be called to update
the internal statuses firstly before accessing them.

Bug: 230799289
Fix: 230773760
Test: atest TelephonyRegistryTest
Test: manual DS<->SS switching test
Merged-In: I31506a07406dee424546bfe4927e069280a7b011
Change-Id: I31506a07406dee424546bfe4927e069280a7b011
(cherry picked from commit 80b47e83f631b37cc72fbefc3686714672e1ef04)
2022-05-26 15:16:30 -07:00
Hui Wang
b694eea0a3 Update javadoc to correct the typo
Bug: 233943634
Test: make
Change-Id: I61c23c5b9024554553a57d74eb7bc92121865be6
2022-05-26 21:49:45 +00:00
Treehugger Robot
5327a51e5a Merge "Update security_log_writer group name" am: 5a66f41fa4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2108084

Change-Id: I42fc0a1fb5536332a072430262b68636b3ad77b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 15:40:22 +00:00
Treehugger Robot
5a66f41fa4 Merge "Update security_log_writer group name" 2022-05-26 15:03:02 +00:00
Rubin Xu
4486314be6 Update security_log_writer group name
group name was changed during review but not updated
in the permission mapping.

Bug: 232283779
Test: manual
Change-Id: Ib7df61fa4fd49c8419f0543fd6c54186a33ebeb6
2022-05-26 12:44:55 +01:00
Treehugger Robot
9c55d71a25 Merge "Rename CtsAndroidTestBase29ApiSignatureTestCases in TEST MAPPING file." am: aae5f3eecf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2107544

Change-Id: I06af5cc3d2c956bb3baa1f78d2a203bcf7f590a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 11:18:19 +00:00
duguowei
a7cb994b6f Add runtime crash information to sysprops
- sys.system_server.crash_java
How many times the system server has crashed within
Java layer. sys.system_server.start_count is the time
that system_server has started.

Normally, (start_count - 1 - crash_java) is the count of
native crash or the other native processes triggered
system_server restart.

We expect the start_count is 1, and the crash_java is 0.

$ getprop | grep system_server
[sys.system_server.start_count]: [5]
[sys.system_server.crash_java]: [2]
...

Signed-off-by: duguowei <duguowei@xiaomi.corp-partner.google.com>
Change-Id: I14af2025def1ad8cb937b9e0dbd6d3a9d34c8558
2022-05-26 10:36:57 +00:00
Zoey Chen
f99fb3fa33 [LeAudio] Add LocalBluetoothLeBroadcast and LocalBluetoothLeBroadcastAssistant
Test: manual
Bug: 222676140
Change-Id: I7b7ecb087b08aeaec9d8035fd490b40e273d8c90
Merged-In: I7b7ecb087b08aeaec9d8035fd490b40e273d8c90
2022-05-26 08:49:11 +00:00
Zoey Chen
ad7f77f4fe [LeAudio] Add LocalBluetoothLeAudioContentMetadata and LocalBluetoothLeBroadcastMetadata
Test: manual
Bug: 222676140
Change-Id: I3722ce537cc6e2b8a85d6390a432881e7fccef87
Merged-In: I3722ce537cc6e2b8a85d6390a432881e7fccef87
2022-05-26 08:49:01 +00:00
Treehugger Robot
aae5f3eecf Merge "Rename CtsAndroidTestBase29ApiSignatureTestCases in TEST MAPPING file." 2022-05-26 08:20:21 +00:00
Jack Yu
14111703f3 Document the QNS behavior
Clearly defined the QNS behavior to avoid
ambiguity.

Bug: 226267529
Test: atest AccessNetworksManagerTest
Merged-In: I274d88338ac4f15a4458e035af0e5c0b278f9c1b
Change-Id: I274d88338ac4f15a4458e035af0e5c0b278f9c1b
2022-05-25 17:28:30 -07:00
Jack Yu
ca544abf6f Partially revert ag/17294635
The qualified network service change was accidentally
merged in ag/17294635. It should be merged in a different
CL. Revert back to the previous version.

Bug: 171809764
Test: Build
Merged-In: Id50e376c04141a347ff70cdc7ab7ad1fab661844
Change-Id: Id50e376c04141a347ff70cdc7ab7ad1fab661844
2022-05-25 17:28:04 -07:00
Jack Yu
a95dd62e85 Moved MVNO matching logic out of old data stack
Moved MVNO matching logic out of old data stack. There
is no logic change here.

Bug: 171809764
Test: Manual
Merged-In: Ia7fc8042fe81a884bbab60c7a9bb6423f0401d65
Change-Id: Ia7fc8042fe81a884bbab60c7a9bb6423f0401d65
2022-05-25 17:25:08 -07:00
easoncylee
5875d7c12c Rename CtsAndroidTestBase29ApiSignatureTestCases in TEST MAPPING file.
Reason: CtsAndroidTestBase28ApiSignatureTestCases has been renamed to
CtsAndroidTestBase29ApiSignatureTestCases, so correct this.

Bug: 233937435

Test: unittest
Change-Id: I3b1be4ce4033104fcb86027fe596c852d64e6fa1
2022-05-26 08:04:22 +08:00
Cole Faust
75c7c33ecd Remove services.speech
services.speech-sources had no files in it,
so services.speech was just being built as
an empty jar file.

Bug: 210751803
Test: m services.speech && unzip out/target/product/generic_arm64/obj/JAVA_LIBRARIES/services.speech_intermediates/javalib.jar produces "zipfile is empty"
Change-Id: Id98db9ee98d71f639ef6104ad7fece92940944a9
2022-05-25 13:16:26 -07:00
Treehugger Robot
053f3b9137 Merge "Add dipankarb to storage owners" am: 6b7ebbfd26
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2106664

Change-Id: I7f056b43ca1124f7ee7a824015c314e8f1f95533
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 18:24:15 +00:00
Treehugger Robot
dd04a0cb26 Merge "Treat allowlists differently for flattened apex" am: 94651571bc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2105512

Change-Id: I26f0cf634a93d1f6fe14dbf3e1d96b27b0c70014
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 18:23:46 +00:00
Treehugger Robot
6b7ebbfd26 Merge "Add dipankarb to storage owners" 2022-05-25 18:21:47 +00:00
Treehugger Robot
94651571bc Merge "Treat allowlists differently for flattened apex" 2022-05-25 17:59:05 +00:00
Treehugger Robot
086cf4b5fb Merge "Update ASM usage to ASM9" am: 24fbdff6a0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2104644

Change-Id: Ie51315d31f67b7385ccffd3ef90c4b152b0b5740
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 16:25:55 +00:00
Dipankar Bhardwaj
2b932750af Add dipankarb to storage owners
Change-Id: I486ad459e945340865adcc030286c443afa7007b
Test: n/a
Bug: 233893599
2022-05-25 16:20:53 +00:00
Treehugger Robot
24fbdff6a0 Merge "Update ASM usage to ASM9" 2022-05-25 16:03:15 +00:00
Andrei Onea
ede686e3a3 Treat allowlists differently for flattened apex
On devices which use flattened APEX, treat the allowlists as part of the
system image.

Test: m # lunch wembley_2GB-userdebug
Bug: 221862988
Change-Id: I1971a686aa111b396f9e694a74be70d758078423
Merged-In: I1971a686aa111b396f9e694a74be70d758078423
2022-05-25 13:23:08 +00:00
Rubin Xu
356f81b957 Merge "Map WRITE_SECURITY_LOG permission to gid" am: 2b2b455884
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2105065

Change-Id: I8453536d82e840da22d7f94a167f4a95b3826ad5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 12:01:56 +00:00
Rubin Xu
2b2b455884 Merge "Map WRITE_SECURITY_LOG permission to gid" 2022-05-25 11:43:50 +00:00
Jack Yu
ae11b299df Traffic descriptor only data profile should be enabled
If a data profile only contains traffic descriptor, and has no
APN setting, it should be considered enabled.

Fix: 233557423
Test: Manual + atest DataProfileTest
Merged-In: Ied26cbba3bde8491bfd6299a2724fc2c5b26c026
Change-Id: Ied26cbba3bde8491bfd6299a2724fc2c5b26c026
2022-05-24 18:41:56 -07:00
Rubin Xu
e806776e54 Map WRITE_SECURITY_LOG permission to gid
Map WRITE_SECURITY_LOG to AID_SECURITY_LOG_WRITE which is how logd
controls access to security log buffer.

Bug: 232283779
Test: manual
Change-Id: Ifde2e5192326f0811807dcb05563b1b5b63077ce
2022-05-24 23:27:10 +01:00
Treehugger Robot
09953ea512 Merge "Updating nativeAsyncTraceForTrackEnd to not require a name argument" am: fbc5263e1a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2078718

Change-Id: I0bb1651bb4c6f86fb86a4ba923a6da06086206f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 19:45:52 +00:00