653597 Commits

Author SHA1 Message Date
Treehugger Robot
95d77312a9 Merge "Add a system api to fetch uuids by the specific transport" 2021-08-23 19:23:26 +00:00
Makoto Onuki
f4d7116b49 Merge "Change Shallow Copy to Deep Copy in UsageStats" 2021-08-23 19:17:38 +00:00
liuxiaoyu7
df9a560868 audio:should stop btsco when client died
1.app start btsco ,it will use bt-sco preferrer device
2.kill app process,currently only client is removed without closing sco

Signed-off-by: liuxiaoyu7 <liuxiaoyu7@xiaomi.com>
Change-Id: I0738a7f8dee16ea68f7de012c5d7020387f160f9
Merged-In: I381537f61740f9a9fcbf3232ef4336943b0826c5
2021-08-23 10:08:33 +00:00
Treehugger Robot
67ae0a366f [automerger skipped] Merge "RESTRICT AUTOMERGE Avoid the scenario Where taskdisplayarea is null" am: 493baa1280 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2994fb7d1bd043d109a35280d9f0f206642a7af7
2021-08-23 10:00:57 +00:00
Orion Hodson
c3e8e916eb Drop system_server dexopt in ZygoteInit
system_server artifacts should be present in the system image or
generated by on-device signing.

Bug: 187711479
Fix: 163019104
Test: m & boot
Change-Id: I19094e1a60b903d04cf7ba23e65cc9ef10f7f243
2021-08-23 10:52:41 +01:00
Treehugger Robot
493baa1280 Merge "RESTRICT AUTOMERGE Avoid the scenario Where taskdisplayarea is null" 2021-08-23 09:46:12 +00:00
TreeHugger Robot
572ad262cb Merge "Add a system api to fetch uuids by the specific transport" into stage-aosp-master 2021-08-21 00:28:34 +00:00
Steven Moreland
ce81994f5f ServiceManager APIs for Wi-Fi mainline module
ServiceManager.waitForDeclaredService and .isDeclared needed for Wi-Fi mainline module.

Test: boot
Change-Id: I9e82dd1a6663396f1c79bc3f27c36711b0b6f3eb
2021-08-20 22:21:35 +00:00
Santiago Seifert
afc4d064cc Merge "Clean up ownership in frameworks/base/" am: c875fc5613
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1804116

Change-Id: I14566099250b2630a4146abd47862585e5e52fa1
2021-08-20 16:44:26 +00:00
Santiago Seifert
c875fc5613 Merge "Clean up ownership in frameworks/base/" 2021-08-20 16:29:34 +00:00
Alice Kuo
21ff734712 Add a system api to fetch uuids by the specific transport
The functionality is similar with fetchUuidsWithSdp which uses TRANSPORT_AUTO. Bt stack depends on the devie type and address type to do sdp or gatt service discovery. Add an api to specific the transport. It would be fexible to handle the dual mode device.

Ignore-AOSP-First: avoid merge conflict
Tag: #feature
Bug: 194447999
Test: atest BluetoothInstrumentationTests
Test: Take two headphone to test the dual mode behavior
Change-Id: I32c8dde68969e0bdc42e4e898c43a4f2c1d3379a
Merged-In: I32c8dde68969e0bdc42e4e898c43a4f2c1d3379a
2021-08-20 16:26:24 +00:00
Samiul Islam
818cbce3ad Hook the new APIs in StagingManager to PackageManagerNative service
Also note, if a StagedApexObserver is observing through binder, they
might not be able to send the original observing object for
unregistration. As such, for binder observer we clean them up when they
die.

Bug: 187444679
Test: atest StagingManagerTest
Test: atest StagedInstallInternalTest
Change-Id: Ie2e01b01690a5882574282f3158e454a9b6056e7
Merged-In: Ie2e01b01690a5882574282f3158e454a9b6056e7
(cherry picked from commit 5ac0ee8278ea33a6f0bf14b96821d31576e81df4)
2021-08-20 16:35:09 +01:00
Samiul Islam
fe58e6f7d1 Notify StagedApexObservers when there is a change in set of staged APEX
The set of staged APEX is changed whenever:
- a session containing APEX succesfully passes pre-reboot verification
  and gets marked ready
- a staged session gets abandoned

Bug: 187444679
Test: atest StagingManagerTest
Change-Id: I5c5bb4523cdab46e22fe3c8e2373289d8619c10e
Merged-In: I5c5bb4523cdab46e22fe3c8e2373289d8619c10e
(cherry picked from commit 9e7de2a0d01b6abfe28093add494322429f87a36)
2021-08-20 16:35:03 +01:00
Santiago Seifert
432e98eb50 Clean up ownership in frameworks/base/
Bug: 197217250
Change-Id: I04bee764bf50734523ff2210d30ed052dcb036bd
Test: No code changes done.
2021-08-20 13:59:15 +00:00
Samiul Islam
9f80efac39 Open up new API in StagingManager to get information about staged APEX
These APIs will be later used by PackageManagerNative service to open up
the information to native clients.

The current implementation is a bit wasteful since everytime the client
makes a request, we ask the ApexManager to fetch us information about
the staged sessions N times, where N is the number of staged sessions
that are marked ready.

We can optimize it by caching the result of getStagedApexInfos(session)
method. This will be done in a separate CL.

Bug: 187444679
Test: atest StagingManagerTest
Change-Id: I76803382db26a029f6d9cabb0d9ce9a2bf9c8ea1
Merged-In: I76803382db26a029f6d9cabb0d9ce9a2bf9c8ea1
(cherry picked from commit c8132a943723f56fb4850b96779ac39d41fec336)
2021-08-20 11:56:53 +01:00
Samiul Islam
3d8b82ca08 Connect the new API from ApexService to ApexManager
Bug: 187444679
Test: atest ApexManagerTest
Change-Id: I60482a180d873a5f65887d0a5bb4230f75cb55df
Merged-In: I60482a180d873a5f65887d0a5bb4230f75cb55df
(cherry picked from commit 2bcdaf91d59cec2b007e211bd4e0107c7ec07147)
2021-08-20 11:44:16 +01:00
Treehugger Robot
b2cb2c7994 Merge "Add SharedMemory.fromFileDescriptor" am: d079236881
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1775625

Change-Id: I5464155029ddbc1e8391ae1717bbc91cb48522a3
2021-08-20 05:08:13 +00:00
Treehugger Robot
d079236881 Merge "Add SharedMemory.fromFileDescriptor" 2021-08-20 04:50:26 +00:00
Keun young Park
39c4f40746 Add SharedMemory.fromFileDescriptor
- Rename existing SharedMemory.create and make it public
- Passed file is now detached after creating shared memory and is
  not usable any more.

Bug: 188780895
CTS-Coverage-Bug: 197226773
Test: atest com.android.car.internal.test.LargeParcelableJavaStableAIDLTest
      (runs only in auto. will add matching CTS tests for non-auto devices)

(This combines two CL in internal tree, so Change-Id and Merged-In id are
different)
Change-Id: I8a634062d10ff0c114f3add1d2a5e8056f17b788
Merged-In: I11381e78580b97982b25a52aa06f2192def7353f
2021-08-20 01:18:11 +00:00
Treehugger Robot
61555f903b Merge "Remove unused but set variables" am: 97fe4d0cc4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1802956

Change-Id: Iddb6fffb5f33f324859b5a6be0c6f1034cda3558
2021-08-19 23:16:57 +00:00
Treehugger Robot
97fe4d0cc4 Merge "Remove unused but set variables" 2021-08-19 22:51:23 +00:00
Jooyung Han
150af91f9c Merge "tuner: use typed Map<String, String>" am: 6f3ebef588
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1801772

Change-Id: If52235c7a0da54145d1682212a6ca5e83885e1d5
2021-08-19 21:07:28 +00:00
Hongguang Chen
bcc2864d50 Merge "Update tuner OWNERS." am: 332cd02609
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1801122

Change-Id: I7bd2e583584e5685c77e5c94c4eb87b3e8775180
2021-08-19 21:06:49 +00:00
Jooyung Han
6f3ebef588 Merge "tuner: use typed Map<String, String>" 2021-08-19 21:01:19 +00:00
Hongguang Chen
332cd02609 Merge "Update tuner OWNERS." 2021-08-19 20:49:18 +00:00
Seth Moore
11cce949b6 Fix key alias string comparison
The code was doing a reference compare, not object value comparison,
resulting in failures in the KeyStore setEntry API.

Test: CtsKeystoreTestCases:android.keystore.cts.AndroidKeyStoreTest
Fixes: 197138784
Change-Id: I2c5e47283eed5694951869e9ea3853364ddef9d1
2021-08-19 12:44:08 -07:00
Yi Kong
82ac868c8c Remove unused but set variables
Discovered by unused-but-set-variable diagnostics.

Test: build
Bug: 197240255
Change-Id: I32a1185f9714848c91860fbaa76521d490c842b9
2021-08-19 18:57:56 +00:00
Zoey Chen
7a293d62ba [automerger skipped] Merge "[PhysicalChannelConfig] UL's frequency should not be same with DL's" am: a6f8188539 -s ours
am skip reason: Merged-In I1225a1429ff77b33c54af0dfce60a8739494e47a with SHA-1 e5225ba858 is already in history

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

Change-Id: I27288c361a15e05c33c4a17a06be2d1245087030
2021-08-19 18:14:13 +00:00
Zoey Chen
a6f8188539 Merge "[PhysicalChannelConfig] UL's frequency should not be same with DL's" 2021-08-19 17:56:20 +00:00
Treehugger Robot
5ba1c6ad98 Merge "Disable errorprone for platformtestprotos" am: e476546592
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1801291

Change-Id: I70d257a5c7dbb177de4be29d8c309280e978745b
2021-08-19 17:36:26 +00:00
Treehugger Robot
e476546592 Merge "Disable errorprone for platformtestprotos" 2021-08-19 17:18:42 +00:00
Alice Kuo
ee29136541 Add a system api to fetch uuids by the specific transport
The functionality is similar with fetchUuidsWithSdp which uses TRANSPORT_AUTO. Bt stack depends on the devie type and address type to do sdp or gatt service discovery. Add an api to specific the transport. It would be fexible to handle the dual mode device.

Tag: #feature
Bug: 197195548
Test: atest BluetoothInstrumentationTests
Test: Take two headphone to test the dual mode behavior
Change-Id: I32c8dde68969e0bdc42e4e898c43a4f2c1d3379a
Merged-In: I32c8dde68969e0bdc42e4e898c43a4f2c1d3379a
2021-08-19 15:29:32 +00:00
Victor Chang
480f33c187 Regenerate LocaleDataTables.cpp due to ICU 69 upgrade
The command:
./tools/localedata/extract_icu_data.py $ANDROID_BUILD_TOP > libs/androidfw/LocaleDataTables.cpp

Bug: 195953235
Test: atest CtsIcu4cTestCases CtsIcuTestCases CtsLibcoreTestCases CtsLibcoreOjTestCases CtsBionicTestCases CtsTextTestCases
Change-Id: Idd4329a83a27bd550185e815dc5c92e3f2882d12
2021-08-19 15:04:14 +01:00
Ashok Mutyala
26d8e9e85a RESTRICT AUTOMERGE Avoid the scenario Where taskdisplayarea is null
Problem: Framework Reboot i.e., NPE in android.ui Thread
E AndroidRuntime: FATAL EXCEPTION IN SYSTEM PROCESS: android.ui
E AndroidRuntime: java.lang.NullPointerException: Attempt to invoke virtual method 'com.android.server.wm.ActivityStack com.android.server.wm.TaskDisplayArea.getRootHomeTask()' on a null object reference
E AndroidRuntime: **at com.android.server.wm.ActivityStarter.postStartActivityProcessing(ActivityStarter.java:1486)
E AndroidRuntime: **at com.android.server.wm.ActivityStarter.startActivityUnchecked(ActivityStarter.java:1533)
E AndroidRuntime: **at com.android.server.wm.ActivityStarter.executeRequest(ActivityStarter.java:1190)
E AndroidRuntime: **at com.android.server.wm.ActivityStarter.execute(ActivityStarter.java:673)
E AndroidRuntime: **at com.android.server.wm.ActivityStartController.startHomeActivity(ActivityStartController.java:206)

Analysis:
getDisplayArea in Task and its Super Class is annotated with Nullable and can be return Null.

Bug: 196568035
Test: StabilityTest
Change-Id: I4f3c8fdca0202591e7ac07aa7b8e3de3b08b2475
Merged-In: I4f3c8fdca0202591e7ac07aa7b8e3de3b08b2475
2021-08-19 11:41:49 +00:00
Zoey Chen
bcf65aa1d0 [PhysicalChannelConfig] UL's frequency should not be same with DL's
Bug: 194042135
Test: atset PhysicalChannelConfigTest
Change-Id: I1225a1429ff77b33c54af0dfce60a8739494e47a
Merged-In: I1225a1429ff77b33c54af0dfce60a8739494e47a
2021-08-19 06:59:45 +00:00
Jooyung Han
8ed699e610 OverlayManager: use typed collection type in AIDL
Use Map<K,V> and List<V>.

Bug: 192615532
Test: m
Change-Id: I5ad7f67b4b08b646362a58214c3b62cd1ada28c0
2021-08-19 15:56:48 +09:00
Jooyung Han
54a1fd2e0f tuner: use typed Map<String, String>
Bug: 192615532
Test: m
Change-Id: Ifa4c9c56d642e1047397cc185872f76a5970f944
2021-08-19 15:29:23 +09:00
Hongguang
0daaeb1d8a Update tuner OWNERS.
Bug: 191825295
Test: N/A
Change-Id: I5cd78e277008897913dcd3a5ce4d382a66fa3d27
2021-08-19 02:43:19 +00:00
Treehugger Robot
79e1c12dd3 [automerger skipped] Merge "Rename ProcResult stdout and stderr fields" am: cb8f9e3429 -s ours
am skip reason: Merged-In I04770d2d6e82ca8393308ab12a304838a80f0ae5 with SHA-1 faa5e27652 is already in history

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

Change-Id: Ibb38819f3df294342089facea1c09ae61cda8899
2021-08-19 00:57:56 +00:00
Treehugger Robot
cb8f9e3429 Merge "Rename ProcResult stdout and stderr fields" 2021-08-19 00:40:13 +00:00
Colin Cross
95f3535381 Disable errorprone for platformtestprotos
Running errorprone on platformtestprotos took more than 45 minutes.
Disable it.

Bug: 197157393
Test: m RUN_ERROR_PRONE=1 javac-check
Change-Id: I4e62adfddb93489d83c7e41e4ecba75fdf654004
2021-08-18 17:19:27 -07:00
Colin Cross
304793a811 Rename ProcResult stdout and stderr fields
stdout and stderr are macros in musl, which causes build failures
when they are used as field names.  Rename the fields to stdout_str
and stderr_str.

Test: builds
Merged-In: I04770d2d6e82ca8393308ab12a304838a80f0ae5
Change-Id: I04770d2d6e82ca8393308ab12a304838a80f0ae5
2021-08-18 23:01:24 +00:00
TreeHugger Robot
bde914ea74 Merge "Rename ProcResult stdout and stderr fields" into stage-aosp-master 2021-08-18 20:19:52 +00:00
Samiul Islam
33dce2cffd Hook the new APIs in StagingManager to PackageManagerNative service
Also note, if a StagedApexObserver is observing through binder, they
might not be able to send the original observing object for
unregistration. As such, for binder observer we clean them up when they
die.

(Note: Unit tests have been removed to resolve merge conflict)

Bug: 187444679
Test: atest StagedInstallInternalTest
Change-Id: Ie2e01b01690a5882574282f3158e454a9b6056e7
Merged-In: Ie2e01b01690a5882574282f3158e454a9b6056e7
(cherry picked from commit 5ac0ee8278ea33a6f0bf14b96821d31576e81df4)
2021-08-18 15:26:52 +01:00
Samiul Islam
7675b5c154 Notify StagedApexObservers when there is a change in set of staged APEX
The set of staged APEX is changed whenever:
- a session containing APEX succesfully passes pre-reboot verification
  and gets marked ready
- a staged session gets abandoned

(Note: Unit tests have been removed to resolve cherry-pick conflict)

Bug: 187444679
Test: atest StagedInstallInternalTests
Change-Id: I5c5bb4523cdab46e22fe3c8e2373289d8619c10e
Merged-In: I5c5bb4523cdab46e22fe3c8e2373289d8619c10e
2021-08-18 14:01:52 +01:00
Samiul Islam
9a68bedca7 Open up new API in StagingManager to get information about staged APEX
These APIs will be later used by PackageManagerNative service to open up
the information to native clients.

The current implementation is a bit wasteful since everytime the client
makes a request, we ask the ApexManager to fetch us information about
the staged sessions N times, where N is the number of staged sessions
that are marked ready.

We can optimize it by caching the result of getStagedApexInfos(session)
method. This will be done in a separate CL.

(Note: Unit tests have been removed to resolve cherry-pick conflict)

Bug: 187444679
Test: atest StagedInstallInternalTests
Change-Id: I76803382db26a029f6d9cabb0d9ce9a2bf9c8ea1
Merged-In: I76803382db26a029f6d9cabb0d9ce9a2bf9c8ea1
(cherry picked from commit c8132a943723f56fb4850b96779ac39d41fec336)
2021-08-18 13:36:47 +01:00
Samiul Islam
43d5b8b3f7 Connect the new API from ApexService to ApexManager
Bug: 187444679
Test: atest ApexManagerTest
Change-Id: I60482a180d873a5f65887d0a5bb4230f75cb55df
Merged-In: I60482a180d873a5f65887d0a5bb4230f75cb55df
(cherry picked from commit 2bcdaf91d59cec2b007e211bd4e0107c7ec07147)
2021-08-18 12:02:34 +01:00
Max Bires
f5e0c3e257 Merge "Fixing a condition that can cause deadlock" am: 773a378390
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1797475

Change-Id: Id20947de8b039d4a468127a446266c30fbbd1659
2021-08-18 02:06:57 +00:00
Max Bires
773a378390 Merge "Fixing a condition that can cause deadlock" 2021-08-18 01:45:15 +00:00
Treehugger Robot
82a84c8c8d Merge "Update OWNERS for Intent* and Content*" am: 6e3ea69863
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1799046

Change-Id: Icea95dd713a074ecad5e7fcf4ab001e6e780db47
2021-08-17 23:27:51 +00:00