Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
800,342 Commits 3 Branches 0 Tags
d6eff4971cee8fe1e5bf68356b671d5f2af577dd
Commit Graph

7264 Commits

Author SHA1 Message Date
Xinyi Zhou
74cc53ca0c Merge "Add NAMESPACE_NEARBY String" am: 4339e51473 am: 9bd0f75bf4 am: f58897e737 am: f4b45a5faa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2219630

Change-Id: I9df2cd99dd2a382ebda09e5acadb825fcc415798
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-20 15:27:56 +00:00
Xinyi Zhou
96e7030189 Add NAMESPACE_NEARBY String 
Bug: 203579197
Test: -m
Change-Id: Id28a76af6c23f85fc1d4c1e7320f533f5604930f
 2022-09-15 22:46:12 -07:00
Darrell Shi
3a8fcd0b27 DO NOT MERGE: add interim startDream api. am: 93e654d66c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19901885

Change-Id: I9a71dac740cb498ed64aaecf2e6c7556bf6fc57e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-15 16:11:48 +00:00
Darrell Shi
93e654d66c DO NOT MERGE: add interim startDream api. 
DreamManager#startDream has been updated on QPR and master which removes
the unnecessary component name parameter, but it breaks TM CTS tests.
The interim api added in this change will prevent breakage on TM, and
should not be merged downstream.

Test: atest DreamManagerServiceTests
Fix: 245223722
Fix: 245058392
Fix: 245070240
Change-Id: Id9e8cc67003da9fc3e03bffd6ec50643d10652b5
 2022-09-14 20:42:20 +00:00
Chris Li
31f70c7ccb Merge "Cleanup unused TestApi in TaskFragmentOrganizer" into tm-qpr-dev am: 5ef4e81b20 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19693522

Change-Id: I1af9afb62ad4d9aa78f1c70d2d31955d26de1f9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 05:10:20 +00:00
Chris Li
3550fa269a Cleanup unused TestApi in TaskFragmentOrganizer 
The callback handling is moved to SplitController#onTransactionReady, no
longer need those TestApi.

This is different from the merged-in cl for CTS compatibility in the
current release.

Bug: 240519866
Test: pass existing
Change-Id: I66ddd51c94003254001436ff0505dde3b26d0437
Merged-In: I66ddd51c94003254001436ff0505dde3b26d0437
 2022-09-13 09:38:26 +08:00
Bill Yi
6f4e679ba0 Merge TP1A.220905.004 to aosp-master - DO NOT MERGE 
Merged-In: I3f9a35cbcb4b5c93c16e9bef04739e5cdbd7ddd4
Merged-In: I496a6f28cc3c48bd595725bce9a24ac4f4e8cc2b
Change-Id: Ic62872d77e7a5a5dfd358777ed22b49d35cb7f8e
 2022-09-08 14:23:19 -07:00
Lucas Silva
e264ab6190 Merge "Fix vulnerability that allowed attackers to start arbitary activities" into tm-qpr-dev am: de117f20ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19775871

Change-Id: Iad0b84f489fa749e146769650dc87cd7008e137a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-02 17:26:11 +00:00
Lucas Silva
de117f20ff Merge "Fix vulnerability that allowed attackers to start arbitary activities" into tm-qpr-dev 2022-09-02 17:18:21 +00:00
Treehugger Robot
30a039ae5e Merge "Add DataFailCause for IWLAN_CONGESTION." am: 090a244680 am: 0813324fc7 am: 1bcb41987f am: 324484c927 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2197571

Change-Id: I7408961e5dd2d5e75c94cc70e9823a755a4f8c28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-02 00:08:07 +00:00
Treehugger Robot
1bcb41987f Merge "Add DataFailCause for IWLAN_CONGESTION." am: 090a244680 am: 0813324fc7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2197571

Change-Id: I6d9440b41a5c653982873fe9a255d4a9706d1c36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 23:12:37 +00:00
Darrell Shi
ec6724232e Merge "Add hidden system dream API in DreamManagerService." into tm-qpr-dev am: 68e81c211e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19461449

Change-Id: I11f43a63201a0f56f8f61c56012d2f4fcaf69abe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 16:49:50 +00:00
Darrell Shi
68e81c211e Merge "Add hidden system dream API in DreamManagerService." into tm-qpr-dev 2022-09-01 16:41:32 +00:00
Maryam Dehaini
554bea8da6 Merge "Move Task Close to WindowContainerTransaction" into tm-qpr-dev am: ef023c1411 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19659464

Change-Id: Ie008dd30c29bb667b64b0f16ca8ffda9a675d5de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-31 21:31:02 +00:00
Maryam Dehaini
ef023c1411 Merge "Move Task Close to WindowContainerTransaction" into tm-qpr-dev 2022-08-31 20:39:37 +00:00
Aswin Sankar
948cd02535 Add DataFailCause for IWLAN_CONGESTION. 
- ePDG private error type CONGESTION was added in 3GPP TS 24.502
and used by some carriers.

Bug: 233121749
Test: ErrorPolicyManagerTest# testErrorPolicyWithNumAttemptsPerFqdn()

Change-Id: I85e6a1700f72db1d55a7929e5d4d93f8cac66c64
 2022-08-31 10:48:43 -07:00
Miguel Aranda
d1729b65c8 Merge "Enable StrictMode checks for explicit garbageCollection from T." am: ace6c8c76e am: 0c6f92501a am: 54bbbedfd2 am: 4856f61946 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2051241

Change-Id: I39a28d6edf551807a52ad8c593768350812b197d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-31 16:55:48 +00:00
Miguel Aranda
54bbbedfd2 Merge "Enable StrictMode checks for explicit garbageCollection from T." am: ace6c8c76e am: 0c6f92501a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2051241

Change-Id: Ie9b17a88e0664585fc1d2c1fce17263accb8392a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-31 15:49:05 +00:00
Miguel Aranda
ace6c8c76e Merge "Enable StrictMode checks for explicit garbageCollection from T." 2022-08-31 15:18:22 +00:00
Lucas Silva
2ce1b7fd37 Fix vulnerability that allowed attackers to start arbitary 
activities

Test: atest DreamServiceTest
Test: flashed device and verified dream settings works as expected
Fixes: 242845514
Change-Id: I6e90e3a0d513dceb7d7f5c59d6807ebe164c5716
 2022-08-31 11:10:21 -04:00
Darrell Shi
3c94bacacd Add hidden system dream API in DreamManagerService. 
This change
- adds a new private API in dream manager that allows a client with
  write dream permission to set a system dream component, which takes
  precedence over user configured dream
- fixes startDream() API in DreamManager which shouldn't take in a
  component name

Test: atest SystemDreamTest
Bug: 222529147
Change-Id: Iee9a0af1071e5ed57fa5bd4b0d06d8178118116e
 2022-08-30 23:19:44 +00:00
Maryam
193d515420 Move Task Close to WindowContainerTransaction 
Added removeTask HierarchyOp so that CaptionWIndowDecorModel now uses WindowContainerTransaction to remove task rather than IActivityTaskManager#removeTask(int)

Bug: 242094334
Test: Manual testing using acloud and unit testing (atest WmTests:WindowContainerTransactionTests)

Change-Id: I9e2f1946a517bdba6a75b7049f00943d729045f0
 2022-08-30 22:17:21 +00:00
Chris Li
3d65738ac7 Merge "Make WCT#requestFocusOnTaskFragment a TestApi" into tm-qpr-dev am: 69d314f23e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19745196

Change-Id: I435484411794ee5e530a72c2fbee42702097735e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-29 17:07:21 +00:00
Chris Li
da64f9599f Make WCT#requestFocusOnTaskFragment a TestApi 
So that we can verify the API in CTS.

Bug: 232476698
Test: CtsWindowManagerDeviceTestCases:TaskFragmentOrganizerPolicyTest
Change-Id: I0e064f8cae48cc0281a0b462b8d072baceeeca9f
 2022-08-26 10:19:37 +08:00
Miguel
8684d5be44 Enable StrictMode checks for explicit garbageCollection from T. 
This disallows calls to runtime.gc() in the new version of Android.
Explicit GC calls are blocking and can thus cause runtime overhead.
They used to be performed as a pattern in order to avoid GC_FOR_ALLOC.
However, that was only the case for Dalvik, that is now discouraged for
ART.

Bug: 3400644
Test: m
Test: atest StrictModeTest
Change-Id: I4720f2b4c4047bb90a88b924c539690e3c202e08
 2022-08-25 15:28:07 +00:00
Jean-Michel Trivi
7c86f338e2 Merge "Module API for BluetoothProfileConnectionInfo for BLE with volume" am: ec3e31bc41 am: 084cf13a12 am: 9c23ef9991 am: 6919452a3b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2191199

Change-Id: I68b15f8bf2e19d6266e29bb06930ed6053e3aaed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 17:47:31 +00:00
Jean-Michel Trivi
9c23ef9991 Merge "Module API for BluetoothProfileConnectionInfo for BLE with volume" am: ec3e31bc41 am: 084cf13a12 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2191199

Change-Id: I9a407e21583252687645ce9ca6c4ddc3ab31b740
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 17:11:10 +00:00
Chris Li
ba5540ee25 Merge "Apply TaskFragmentOrganizer changes in one WCT (2/2)" into tm-qpr-dev am: f215542792 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19492304

Change-Id: I629d0ed9d01c8f0c89304ea6cd5e96e0c71c6f89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-21 02:29:36 +00:00
Chris Li
660101fdc7 Apply TaskFragmentOrganizer changes in one WCT (2/2) 
Before, when receive TaskFragment transaction, we apply changes in
multiple WindowContainerTransactions. Now, update to apply all changes
in one WCT for the whole TaskFragment transaction.

Bug: 240519866
Test: pass existing
Change-Id: I943d6232ff226ed6f67367fa9b7f73e1f861de64
Merged-In: I943d6232ff226ed6f67367fa9b7f73e1f861de64
 2022-08-20 20:19:57 +08:00
Jean-Michel Trivi
4b441c8ef4 Module API for BluetoothProfileConnectionInfo for BLE with volume 
Add factory method for BLE output device with volume information

Bug: 233975367
Test: atest frameworks/base/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/BluetoothProfileConnectionInfoTest.java
Change-Id: If9f88e2489f93f05c6c83424fc7b7a12671c1f32
 2022-08-19 22:39:24 +00:00
Yu-Han Yang
86feb702da Correct the range of issueOfDataEphemeris as [0, 1023] 
Bug: 239083503

Test: atest SatellitePvtTest
Change-Id: I017b4e83a6af61c7827c9135176953809b139bb7
Merged-In: I017b4e83a6af61c7827c9135176953809b139bb7
(cherry picked from commit 70f5d083ce)
Merged-In: I017b4e83a6af61c7827c9135176953809b139bb7
 2022-07-29 22:35:16 +00:00
Louis Chang
25c5f97ed6 Merge "Sending TaskFragmentInfo and operation type in #onTaskFragmentError" into tm-qpr-dev am: 8be2f81086 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19321166

Change-Id: I8aad77caa6cb353a7fa926461aea9eb940178568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-28 06:11:40 +00:00
Louis Chang
61bfe6e0dc Sending TaskFragmentInfo and operation type in #onTaskFragmentError 
So, the TaskFragmentOrganizer can know what exact operation was
failed and perform error handles if needed.

Removes the pending appeared activities when starting/reparenting
activity into a TaskFragment was failed.

Deprecating the #onTaskFragmentError method with another overloaded
version, but still making sure the deprecated one is called in order
to make it compatible with Android T CTS.

Bug: 236668365
Bug: 233989810
Test: atest TaskFragmentTest
Test: atest TaskFragmentOrganizerControllerTest
Test: atest TaskFragmentOrganizerTest
Test: atest TaskFragmentOrganizerPolicyTest
Change-Id: Id328d037536d32b3acb9c424d36052b6dca8628a
Merged-In: Id328d037536d32b3acb9c424d36052b6dca8628a
 2022-07-28 01:36:38 +00:00
Victor Chang
d3fb6ef1a4 Merge "Deprecate Debug.enableEmulatorTraceOutput()" am: 3f007c4dea am: b0bbe9b5f3 am: fd818a3610 am: 27f8e8943b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2154934

Change-Id: Ie3ce9234b41dc9b32a2f97a70298f6cf6dd8e744
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 11:39:04 +00:00
Victor Chang
fd818a3610 Merge "Deprecate Debug.enableEmulatorTraceOutput()" am: 3f007c4dea am: b0bbe9b5f3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2154934

Change-Id: I73022c7c3840483af31390c297ded5d904de51fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 10:41:35 +00:00
Victor Chang
b0bbe9b5f3 Merge "Deprecate Debug.enableEmulatorTraceOutput()" am: 3f007c4dea 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2154934

Change-Id: I254df58123db32e542a75176544313776c55d20b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 10:23:51 +00:00
TreeHugger Robot
ae636989f6 Merge "Correct the range of issueOfDataEphemeris as [0, 1023]" into tm-dev am: 58dc8eb63b am: 51bfee0d8a am: 59634aaf0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19272069

Change-Id: I3c64a6d49db1ec39f4b5075b75048f2277e4204e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 23:30:09 +00:00
TreeHugger Robot
c326217c51 Merge "Correct the range of issueOfDataEphemeris as [0, 1023]" into tm-dev am: 58dc8eb63b am: 0f0fbcad8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19272069

Change-Id: I47c1c8a7404061b61b69a6e98049db90c3963aca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 23:14:24 +00:00
TreeHugger Robot
51bfee0d8a Merge "Correct the range of issueOfDataEphemeris as [0, 1023]" into tm-dev am: 58dc8eb63b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19272069

Change-Id: I929a409ec111c6b08ca9395764007ba81ef0bf69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 22:54:16 +00:00
Victor Chang
6ec9edf868 Deprecate Debug.enableEmulatorTraceOutput() 
The API has been no-op for 2 releases.
https://r.android.com/1352354

We should officially deprecate the API.

Bug: 238895989
Test: atest CtsOsTestCases:android.os.cts.DebugTest
Change-Id: Ib1454b200a0ae0da557de02c49c482145deb97df
 2022-07-15 11:38:38 +01:00
Yu-Han Yang
70f5d083ce Correct the range of issueOfDataEphemeris as [0, 1023] 
Bug: 239083503

Test: atest SatellitePvtTest
Change-Id: I017b4e83a6af61c7827c9135176953809b139bb7
Merged-In: I017b4e83a6af61c7827c9135176953809b139bb7
 2022-07-14 23:48:48 +00:00
Chris Li
ae59a3d6dc Merge "Add API to set launch TDA featureId in options" am: 362e1c6eb4 am: 159473f75a am: 93c848722a am: 945bb0323e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2110706

Change-Id: I72d8d2742d91a43aa094b98e8a029680d4e8cf11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 11:07:50 +00:00
Chris Li
159473f75a Merge "Add API to set launch TDA featureId in options" am: 362e1c6eb4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2110706

Change-Id: I57cca54b5e4a0eced45c255d776f9c484215fd3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 10:15:08 +00:00
Chris Li
362e1c6eb4 Merge "Add API to set launch TDA featureId in options" 2022-06-30 08:42:46 +00:00
Nicu Corj
e83e2a20c6 Add API to set launch TDA featureId in options 
- Add new api in ActivityOptions for a caller to be able to specify
launch TaskDisplayArea in ActivityOptions.
- Add option to specify launch TaskDisplayArea featureId in
ActivityManagerShellCommand.

Bug: 234349363
Test: atest TaskLaunchParamsModifierTests
Change-Id: I092787ede5245d15774e01054c408533fe632b57
 2022-06-29 10:11:14 +03:00
Roopa Sattiraju
e2abe03206 API changes requires for Bluetooth apk inside the apex to build. 
Bug: 216731966
Test: Compile and Test
Cherry-picked from tm-dev
Merged-In: Ic8e9c2db0743738b2b6649451c79a559c3b8edc5

Change-Id: Ic8e9c2db0743738b2b6649451c79a559c3b8edc5
 2022-06-27 16:35:47 -07:00
Xin Li
195b02b570 Merge "Merge Android 12 QPR 3" 2022-06-16 18:51:54 +00:00
Jooyung Han
fab0dc0d32 Merge "Unhide Parcel.writeTypedList() with additional flag" am: a4d51305f7 am: 2f831b08ca am: dc9b9f6d83 am: 92b6b4d408 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2107830

Change-Id: If621d256967d1b335cd8ae138c38b42650b94f0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 15:43:58 +00:00
Jooyung Han
dc9b9f6d83 Merge "Unhide Parcel.writeTypedList() with additional flag" am: a4d51305f7 am: 2f831b08ca 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2107830

Change-Id: I1e24dc9b7d861bf77fd90f25a9184fa5f4be9dd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 15:07:54 +00:00
Jooyung Han
2f831b08ca Merge "Unhide Parcel.writeTypedList() with additional flag" am: a4d51305f7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2107830

Change-Id: If36533484f1f90c57b6799d086fa5e9b7beba35e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 01:32:14 +00:00