Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
653,669 Commits 3 Branches 0 Tags
c05e55ffbfdcd78cfd2ec8a8c2137e22c42bb8ba
Commit Graph

653669 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
William Escande
c05e55ffbf Use AttributionSource Builder 
Attribution source constructor are hidden api
Add a Builder option to take a AttributionSource as parameter

Test: atest BluetoothInstrumentationTests
Bug: 195144968
Tag: #refactor
Ignore-AOSP-First: No such thing on aosp
Change-Id: I901c8afff6a40bd8484fd8e10baf290aa483c280
 2021-09-22 20:22:36 +02:00
Anton Hansson
c010164844 Merge "Make merged api compat checks output baseline" am: 6c20a2d6b2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1832239

Change-Id: If57aae144cb15d6704a36311b358e892f8ae4f2f
 2021-09-21 17:32:26 +00:00
Anton Hansson
6c20a2d6b2 Merge "Make merged api compat checks output baseline" 2021-09-21 17:16:49 +00:00
TreeHugger Robot
179a9be4b1 Merge "Update CSIP base uuid devie set into a single device detail preference" into stage-aosp-master 2021-09-21 16:40:38 +00:00
Rambo Wang
44a43030c4 Merge "Limit the uniqueness of SignalMeasurementType instead of RAN in SignalStrengthUpdateRequest" am: 68b121111d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1826890

Change-Id: Iba5234e267a672be13a0262c53b93a5b1996c5a7
 2021-09-21 16:27:14 +00:00
Rambo Wang
68b121111d Merge "Limit the uniqueness of SignalMeasurementType instead of RAN in SignalStrengthUpdateRequest" 2021-09-21 16:13:58 +00:00
Anton Hansson
b8ce081c1a Make merged api compat checks output baseline 
When intentional API breakages are made, the incompatibilities tracking
file must be updated. This makes the failing build rule output the
baseline/incompatibilities file that would have made the build rule
succeed. This file can then be used to update prebuilts/sdk.

Whilst here, also make metalava quiet so we don't need to capture
stdout.

Test: make breaking change, build compat rule, inspect output dir
Change-Id: Ia95b65548371329cd467fd3093db92b471e6986d
 2021-09-21 16:29:41 +01:00
Treehugger Robot
ec3d9e84b3 [automerger skipped] Merge "Wifi use state machine from modules-utils" am: af88579f14 -s ours 
am skip reason: Merged-In I2087b15cf34b76dabeb14d51d041533f55e1b5ba with SHA-1 b52b48c9d1 is already in history

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

Change-Id: I0e95997b21e94675fd38b2c22533e6ada7532590
 2021-09-21 12:51:26 +00:00
Treehugger Robot
af88579f14 Merge "Wifi use state machine from modules-utils" 2021-09-21 12:36:25 +00:00
TreeHugger Robot
49d0f6788a Merge "Wifi use state machine from modules-utils" into stage-aosp-master 2021-09-21 09:55:23 +00:00
Alice Kuo
a1868538bd Update CSIP base uuid devie set into a single device detail preference 
Bug: 178981521
Bug: 150670922
Test: pair with two device which are a coordinated set, and make sure
the UI only show one device

Change-Id: I1a8d570da1af7fa4c8b3a99f8ce69d23b574e96c
 2021-09-21 11:11:18 +08:00
William Escande
b52b48c9d1 Wifi use state machine from modules-utils 
Bug: 198418216
Tag: #refactor
Test: atest FrameworkWifiApiTests
Change-Id: I2087b15cf34b76dabeb14d51d041533f55e1b5ba
 2021-09-20 23:19:09 +02:00
William Escande
0153d5ff19 Wifi use state machine from modules-utils 
Bug: 198418216
Tag: #refactor
Test: atest FrameworkWifiApiTests
Merged-In: I2087b15cf34b76dabeb14d51d041533f55e1b5ba
Change-Id: I2087b15cf34b76dabeb14d51d041533f55e1b5ba
 2021-09-20 21:18:45 +00:00
Colin Cross
abb70e433a Merge "Convert DownloadManagerTestApp to Android.bp" am: 46d22e3c87 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1829055

Change-Id: Ief2fc9ff1f69ae768f3d4b54242a2f95deea6344
 2021-09-20 20:38:38 +00:00
Colin Cross
35f4acb9bd Merge "Convert MultiDexLegacy* tests to Android.bp and d8 --main-dex-rules" am: 58210e2960 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1829054

Change-Id: I11dfd1a08745f9d45861ec296416bad0aa4e20d9
 2021-09-20 20:37:50 +00:00
Colin Cross
46d22e3c87 Merge "Convert DownloadManagerTestApp to Android.bp" 2021-09-20 20:22:56 +00:00
Colin Cross
58210e2960 Merge "Convert MultiDexLegacy* tests to Android.bp and d8 --main-dex-rules" 2021-09-20 20:22:44 +00:00
Colin Cross
6f4e26df2b Convert DownloadManagerTestApp to Android.bp 
See build/soong/README.md for more information.

Test: mma
Change-Id: I2d3fefc4467cde83d8a93217935b908230bcbade
 2021-09-20 20:22:35 +00:00
Colin Cross
5f4f5562e0 Convert MultiDexLegacy* tests to Android.bp and d8 --main-dex-rules 
The mainDexClasses script is obsolete, pass the rule to d8 with
--main-dex-rules instead.

Test: mma
Change-Id: Ia88660550c3e57749b8ccb154e97c31aaf2fcf3a
 2021-09-20 20:22:25 +00:00
Roopa Sattiraju
e7087432f6 Merge "Adding sattiraju@ as OWNER and also changing the order of ldaps to be alphabetical" am: 2279402490 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1829234

Change-Id: I95bc17bce0aedca17e0cf8ae57a66a8056fe3c68
 2021-09-20 19:42:30 +00:00
Roopa Sattiraju
2279402490 Merge "Adding sattiraju@ as OWNER and also changing the order of ldaps to be alphabetical" 2021-09-20 19:05:39 +00:00
Treehugger Robot
0cf0b71c17 [automerger skipped] Merge "Make createBond(int) a system API" am: a9c6fbdff7 -s ours 
am skip reason: Merged-In I10d9ac305cbc1bb28c8150e1b167a0e61ad3f04e with SHA-1 5cebaaa562 is already in history

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

Change-Id: If50aa9db7269acb8e13e6b556a8cb3081accac96
 2021-09-20 16:10:40 +00:00
Treehugger Robot
a9c6fbdff7 Merge "Make createBond(int) a system API" 2021-09-20 15:52:02 +00:00
Rambo Wang
924964767c Limit the uniqueness of SignalMeasurementType instead of RAN in 
SignalStrengthUpdateRequest

Support different SignalMeasurementType with same type of RAN
is valid user case. For example, client may be interested to
measure both RSRP and RSRQ for EUTRAN.

Throw IAE if the SignalThresholdInfo collection is empty. This
is behavior specified in the public interface.

Bug: 198318496
Test: atest SignalStrengthUpdateRequestTest
Change-Id: I87ea5e356189f61fc58dff80456aff35ea2a8e55
 2021-09-20 08:13:57 -07:00
Treehugger Robot
b2ffc47407 [automerger skipped] Merge "Migrate dependency from base to modules-utils" am: ef483e49cd -s ours 
am skip reason: Merged-In I248dc29e68d3564c6723626b683b10c8a863853f with SHA-1 9150afa330 is already in history

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

Change-Id: If29845540145e5c150b783ab9ea508c06d2e1d48
 2021-09-20 14:25:48 +00:00
Treehugger Robot
ef483e49cd Merge "Migrate dependency from base to modules-utils" 2021-09-20 14:12:37 +00:00
Treehugger Robot
054817d68c [automerger skipped] Merge "csip: Expose an extra data with intent and store in CachedBluetoothDevice" am: 09170fdb8a -s ours 
am skip reason: Merged-In I3e99c59e0cb974409291e1b4c28393106784e133 with SHA-1 e12ff23a6d is already in history

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

Change-Id: Ia2f296def970b74ad91465e1d70f51d0db76ffe2
 2021-09-20 13:23:43 +00:00
Treehugger Robot
09170fdb8a Merge "csip: Expose an extra data with intent and store in CachedBluetoothDevice" 2021-09-20 13:09:04 +00:00
Treehugger Robot
4c3b610bcb Merge "Add patb@ as a owner of SystemConfig tests" am: 9fe8f3ee27 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1829887

Change-Id: I66005e106592bc5c3dbef006f09780d3b9e28d7e
 2021-09-20 11:54:02 +00:00
Anton Hansson
e18d971443 Merge "Add doc stubs target that uses module stub source" into stage-aosp-master 2021-09-20 11:21:47 +00:00
Treehugger Robot
9fe8f3ee27 Merge "Add patb@ as a owner of SystemConfig tests" 2021-09-20 10:19:45 +00:00
Thiébaud Weksteen
2130d975b5 Merge "Replace security_context_t type" am: 8bf8b19e84 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1827241

Change-Id: Ib903b986d77efb785d4e3fa1509f0146b66f3609
 2021-09-20 07:22:48 +00:00
Thiébaud Weksteen
8bf8b19e84 Merge "Replace security_context_t type" 2021-09-20 07:06:33 +00:00
Yi Kong
daa2a19c60 Merge "Fix an instance of -Wunused-but-set-variable." am: c10adebed6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1829955

Change-Id: I7095f3e7ce171f0be9402d91475b74e623316545
 2021-09-18 08:14:34 +00:00
Yi Kong
c10adebed6 Merge "Fix an instance of -Wunused-but-set-variable." 2021-09-18 07:57:46 +00:00
Alice Kuo
399c36babb csip: Expose an extra data with intent and store in CachedBluetoothDevice 
Bug: 178981521
Bug: 150670922
Test: Discover and pair with the CSIP supported device, and check the
pairing string in the dialog

Merged-In: I3e99c59e0cb974409291e1b4c28393106784e133
Change-Id: I3e99c59e0cb974409291e1b4c28393106784e133
 2021-09-18 01:02:32 +00:00
Alice Kuo
cc3fb6dd85 Merge "csip: Expose an extra data with intent and store in CachedBluetoothDevice" into stage-aosp-master 2021-09-18 00:40:17 +00:00
wescande
4f2420f84b Migrate dependency from base to modules-utils 
Use stand-alone modules-utils library.

Bug: 198418216
Tag: #refactor
Test: Build
Merged-In: I248dc29e68d3564c6723626b683b10c8a863853f
Change-Id: I248dc29e68d3564c6723626b683b10c8a863853f
 2021-09-17 20:41:26 +00:00
Yi Kong
b5cab25730 Fix an instance of -Wunused-but-set-variable. 
Test: presubmit
Bug: 197240255
Change-Id: Iedb28903cfada8d23e931196b72059a0fc8797aa
 2021-09-18 02:28:22 +08:00
Alice Kuo
e12ff23a6d csip: Expose an extra data with intent and store in CachedBluetoothDevice 
Bug: 178981521
Bug: 150670922
Test: Discover and pair with the CSIP supported device, and check the
pairing string in the dialog

Change-Id: I3e99c59e0cb974409291e1b4c28393106784e133
 2021-09-17 17:29:11 +00:00
Anton Hansson
fa5d0bc676 Add doc stubs target that uses module stub source 
The framework-doc-stubs target currently takes the module source code
as input. Work is being done to change that over to use module sdk
artifacts, primarily the jar stub source code. Check in a
work-in-progress target that does so, to avoid it breaking and to
simplify iterating on improvements.

Bug: 186197911
Test: m framework-doc-stubs{,-module-stubs}
Change-Id: I1a275b3f44632e6655dc84d711a58fc0c5b3a46a
 2021-09-17 17:22:03 +01:00
Pedro Loureiro
6476e035da Add patb@ as a owner of SystemConfig tests 
Giving ownership of
    services/tests/servicestests/src/com/android/server/systemconfig/

Test: N/A
Change-Id: Ifae11b700bd5f2134cb7e31d50d02d204b649f7c
 2021-09-17 16:06:08 +00:00
TreeHugger Robot
973054171a Merge "Migrate dependency from base to modules-utils" into stage-aosp-master 2021-09-17 15:34:45 +00:00
Anton Hansson
fabe544f0f Merge "Move annotations in public api to frameworks/base" am: f664101210 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1827246

Change-Id: Ifcb7b8b4e186c5815b0602d22f0dbae1dbbe03b1
 2021-09-17 14:20:05 +00:00
Anton Hansson
f664101210 Merge "Move annotations in public api to frameworks/base" 2021-09-17 14:01:20 +00:00
Anton Hansson
e0f3d2348f Move annotations in public api to frameworks/base 
These two are the only annotations in the android.annotations package
that are not @hide -- they are actually in the public API.

As such, they are not suitable in the annotations library. Move them
back to frameworks/base where the other core java APIs live.

Bug: 186197911
Test: m
Merged-In: Ide01e4e7840bddf1e024e9024771e528d17a1d80
Change-Id: Ide01e4e7840bddf1e024e9024771e528d17a1d80
 2021-09-17 12:31:50 +00:00
Aaron Huang
b8b78051eb Merge "Remove forceAllNetworkTypes from test" am: bc48cdaf46 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1824613

Change-Id: I460b93a1a9d04ecdf687761eea3461ecf0346860
 2021-09-17 12:25:04 +00:00
Aaron Huang
bc48cdaf46 Merge "Remove forceAllNetworkTypes from test" 2021-09-17 12:08:59 +00:00
Roopa Sattiraju
b3ba6cdbed Adding sattiraju@ as OWNER and also changing the order of ldaps to be 
alphabetical

Tag: #feature
Bug: 200240100
Test: Manual
Change-Id: I15ccfeae1e1a061a002be9c2e202104352b1ce98
 2021-09-16 23:47:19 -07:00
Treehugger Robot
90e0a894eb Merge "Keep only the classes in the android.test.mock package" am: 70a0869f49 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1824624

Change-Id: I5b4e93c719b31489611e64da97b041fc60b19c8a
 2021-09-17 04:29:40 +00:00