Commit Graph

1952 Commits

Author SHA1 Message Date
Hongguang
956e635430 Use tuner AIDL HAL in Java codes.
This CL also updates the values of some tuner System API constants.
Those values generated by the HIDL HAL were duplicated, and should be
fixed.

Bug: 191825295
Bug: 194426536
Fix: 194426536
Test: atest android.media.tv.tuner.cts
Change-Id: Ife35bd0000b3aa864d6d0a7842536cad07f5ab9c
2021-08-02 12:02:25 -07:00
Jeff Sharkey
f13ad97af7 Merge "Pass metadata as AttributionSourceSource." into sc-dev am: a57ee36d6c am: 6673ce8704
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15388734

Change-Id: I53d259a9348d134911b99320aeec6c782b0e373b
2021-07-27 19:44:17 +00:00
Jeff Sharkey
6673ce8704 Merge "Pass metadata as AttributionSourceSource." into sc-dev am: a57ee36d6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15388734

Change-Id: I418d29e67cdab7d69bcabfce2767a9fe1eeadb37
2021-07-27 19:43:18 +00:00
Jeff Sharkey
75d4f93a4e Pass metadata as AttributionSourceSource.
These two PermissionManager methods are using AttributionSource as
metadata only, and aren't interested in the remote caller enforcing
that the claimed UID matches the caller, since they're not actually
being used for permission enforcement.

Thus we pass the metadata using the AttributionSourceState holder
object and reconstruct on the remote side, entirely avoiding the
enforceCallingUid() check.

Bug: 193842956
Test: atest CtsPermission5TestCases
Change-Id: I576b6feb8cc2b0586b4341268866d8027689293f
2021-07-27 09:45:54 -06:00
Rambo Wang
849474a343 Merge "Support platform-compat-framework for TeleService" am: 7ad8aa929e am: 2e7d4fe98b am: 02adf2d91d am: 4487b40f3a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1747977

Change-Id: Icbf0e82b4f46bc1fe5bab8ffaf0ede75f06f968e
2021-07-16 22:47:01 +00:00
Rambo Wang
4487b40f3a Merge "Support platform-compat-framework for TeleService" am: 7ad8aa929e am: 2e7d4fe98b am: 02adf2d91d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1747977

Change-Id: Ia630dfdba5e445597aaaa9c6bb58aa5a71acb873
2021-07-16 22:31:57 +00:00
Rambo Wang
02adf2d91d Merge "Support platform-compat-framework for TeleService" am: 7ad8aa929e am: 2e7d4fe98b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1747977

Change-Id: Iedefd178c03f988435e6fbf21a8744aefa3ae174
2021-07-16 22:16:53 +00:00
Rambo Wang
05e55c9e3e Support platform-compat-framework for TeleService
Bug: 191911306
Test: atest ServiceStateProviderTest
Change-Id: I23e0e0867c89c0e107258c723f29e9ae9b5ba9f1
2021-07-01 23:46:49 +00:00
Janis Danisevskis
c5cb9036b8 Merge "Keystore 2.0: Renaming the vpnstore interface." into sc-dev am: 3f0c227d93
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14969456

Change-Id: I0fc0c8a84ecd571c7c9637064a917c9ce1ef246b
2021-07-01 07:21:21 +00:00
Hasini Gunasinghe
ac4a3ae399 Merge "Keystore2 Metrics: System server rerouting" into sc-dev am: 06327bba21
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14976533

Change-Id: I98c04ae286b11c6b403aefb91cef7ab45efebd35
2021-07-01 06:51:47 +00:00
Janis Danisevskis
1994a493c9 Merge "Keystore 2.0: Renaming the vpnstore interface." into sc-dev am: 3f0c227d93 am: 043c85737e am: a17f42e5a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14969456

Change-Id: Idfbd950775e5078837b3bbe93b0979f4d2b0f185
2021-06-30 20:09:25 +00:00
Janis Danisevskis
a17f42e5a5 Merge "Keystore 2.0: Renaming the vpnstore interface." into sc-dev am: 3f0c227d93 am: 043c85737e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14969456

Change-Id: I82d3b207e8b2fffb6e3add473949e065d083305c
2021-06-30 19:59:11 +00:00
Janis Danisevskis
043c85737e Merge "Keystore 2.0: Renaming the vpnstore interface." into sc-dev am: 3f0c227d93
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14969456

Change-Id: Ibb6b107e7522d159d94a909c58204fce407f62f1
2021-06-30 19:58:08 +00:00
Janis Danisevskis
6ebb4df635 Merge "Keystore 2.0: Renaming the vpnstore interface." into sc-dev am: 3f0c227d93
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14969456

Change-Id: Icfe611bc66e6dc2ce94f4a6eeee292158e98f15e
2021-06-30 19:57:21 +00:00
Janis Danisevskis
84e082d3da Keystore 2.0: Renaming the vpnstore interface.
Renaming the vpnstore interface to legacykeystore.

Bug: 190229655
Test: TBD
Merged-In: Icd304ef621f0de52d6ebc415a0628d63f827fbcd
Change-Id: Icd304ef621f0de52d6ebc415a0628d63f827fbcd
2021-06-30 12:29:29 -07:00
Janis Danisevskis
191b206410 Keystore 2.0: Renaming the vpnstore interface.
Renaming the vpnstore interface to legacykeystore.

Bug: 191373871
Test: TBD
Change-Id: Icd304ef621f0de52d6ebc415a0628d63f827fbcd
2021-06-30 09:45:54 -07:00
Chavi Weingarten
5fb6fd9578 Merge "Renamed and moved InputWindow and related files" into sc-v2-dev am: d5e7575206
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14664164

Change-Id: Id5e9d8b769d6ab60da740f00f2fa99849011391c
2021-06-30 15:02:43 +00:00
Chavi Weingarten
d5e7575206 Merge "Renamed and moved InputWindow and related files" into sc-v2-dev 2021-06-30 14:46:22 +00:00
Hasini Gunasinghe
8dec2da741 Merge "Keystore2 Metrics: System server rerouting" into sc-dev am: 06327bba21 am: 75d0aa0e00 am: 96267e699d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14976533

Change-Id: Iff422709a27ef401363bc7fa9f20f3af959901cf
2021-06-30 13:54:06 +00:00
Hasini Gunasinghe
75d0aa0e00 Merge "Keystore2 Metrics: System server rerouting" into sc-dev am: 06327bba21
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14976533

Change-Id: I97d68b7726cdde00c414eef803792e6b6d40c3b2
2021-06-30 13:32:33 +00:00
Tej Singh
932f870d92 Keystore2 Metrics: System server rerouting
System server changes for rerouting keystore atoms.

Bug: 191050796
Bug: 188590587
Test: statsd testdrive
Change-Id: Id4d0880c4a8a53097ca7007c40026d2d4bc0bc5b
2021-06-29 17:38:51 +00:00
chaviw
b6b00b3393 Renamed and moved InputWindow and related files
In preparation for the hierarchy listener interface, moved the
InputWindow structs into libgui and have libinput dependant on libgui.
Also renamed InputWindow to exclude Input since it will be used for more
generic purposes.

Test: Builds and flashes
Bug: 188792659
Change-Id: Ib0a32c9920dc8110ceee4d6617ac030eb5cc0d99
Merged-In: Ib0a32c9920dc8110ceee4d6617ac030eb5cc0d99
2021-06-28 18:27:34 -05:00
Yan Yan
183ebe6e29 Include WakeupMessage in framework-ike-shared-srcs
Bug: 180653278
Test: make
Original-Change: https://android-review.googlesource.com/1734130
Merged-In: I3d7d789ab6f71ece64318e5aff74f7f739e2b2c0
Change-Id: I3d7d789ab6f71ece64318e5aff74f7f739e2b2c0
2021-06-26 00:09:25 +00:00
chaviw
9d438f974a Renamed and moved InputWindow and related files
In preparation for the hierarchy listener interface, moved the
InputWindow structs into libgui and have libinput dependant on libgui.
Also renamed InputWindow to exclude Input since it will be used for more
generic purposes.

Test: Builds and flashes
Bug: 188792659
Change-Id: Ib0a32c9920dc8110ceee4d6617ac030eb5cc0d99
2021-06-25 15:15:34 -05:00
Yan Yan
ceab1ad518 Merge "Include WakeupMessage in framework-ike-shared-srcs" am: e2a58ab718 am: 1e848eaeb5 am: edbc5449df am: 92b4b06c65
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1734130

Change-Id: I0b70e7c00f16cfd188ff012850fc9288646bc38a
2021-06-18 02:48:08 +00:00
Yan Yan
edbc5449df Merge "Include WakeupMessage in framework-ike-shared-srcs" am: e2a58ab718 am: 1e848eaeb5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1734130

Change-Id: Ia86447c7b3bd5bca7328dd91c8769f5f9d2ec03c
2021-06-18 02:17:49 +00:00
Yan Yan
e2a58ab718 Merge "Include WakeupMessage in framework-ike-shared-srcs" 2021-06-17 22:04:26 +00:00
Harry Zhang
b4befa4537 Create platformtestprotos.
This target contains some proto definitions used by TradeFed. TF will
use this instead of platformprotos to reduce proto dependencies on the
platform.

A separate build file is created so its ownership is managed separately.
The OWNERS file will be updated due to merge conflicts.

Bug: 181921006
Test: New target builds.
Change-Id: I87e7a73d1160e3cf56a4c013e74989cdc90e1211
Merged-In: I82386a6c8a5e6ddf42d8377148001f4ede2f297f
2021-06-11 14:12:53 -07:00
Yan Yan
e7a360f7ff Include WakeupMessage in framework-ike-shared-srcs
Bug: 180653278
Test: make
Change-Id: I3d7d789ab6f71ece64318e5aff74f7f739e2b2c0
2021-06-10 18:45:39 -07:00
Harry Zhang
2b09b23221 Merge "Create platformtestprotos." into sc-dev am: e76529cb29 am: 83603fb34d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14824140

Change-Id: I2ddd93b9a34f451e05285d396a392b3cdea293a3
2021-06-10 19:41:17 +00:00
Harry Zhang
d61699e86c Create platformtestprotos.
This target includes a subset of protos in platformprotos, and will
replace it in TradeFed. It is created as a separate file so that it can
have its own set of owners. The owners will be updated in AOSP, but this
change has to be submitted first due to this target requiring one
additional dependency compared to AOSP.

Bug: 181921006
Test: The target builds.
Change-Id: I82386a6c8a5e6ddf42d8377148001f4ede2f297f
2021-06-03 17:18:02 +00:00
Remi NGUYEN VAN
fc729f02e9 Merge framework-connectivity impl and stub targets
Instead of using api_only: true, use a single java_sdk_library to
generate both framework-connectivity stubs and
framework-connectivity.impl.

Bug: 183600168
Test: m
Merged-In: I76d7cf1ba31a3f38ae6b9facbf1b668860c8c165
Change-Id: Icfe492943308ad35069b94a07d3cf80498739b66
2021-06-01 18:31:23 +09:00
Aaron Huang
94ce54fd30 Merge "Remove IntDef annotations from NetworkPolicyManager" into sc-dev am: 2debdb3ec2 am: b0409be590 am: e3b1213cfa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14747451

Change-Id: Ifb9a79dfd875efc51651068451562d5c93676a63
2021-06-01 09:11:56 +00:00
Aaron Huang
fb2b21a167 Remove IntDef annotations from NetworkPolicyManager
@RestrictBackgroundStatus and @MultipathPreference are defined
in connectivity mainline module. Annotate these in non-updatable
platform is not going to be manageable long term. For example,
if the module gets updated and the annotation gets more values
then it's a problem in non-updatable platform. So, it should
not have IntDef cross module boundaries. The javadoc already
document the return type.

Bug: 183972925
Test: build
Change-Id: I371e61fc1ba4d6137139bcfbf1d57fdebe00a257
2021-05-27 15:00:24 +08:00
Anton Hansson
df4b33036d Add some warnings and notes about framework's jarjar rules
These rules are explicitly recommended  to be depended on by other
libraries in the bootclasspath, that may depend on the framework's
copy of the hidl library.

Bug: 186804505
Test: presubmit
Merged-In: I09766423782d9bb9408f3d14169d7e5d8f1b5823
Change-Id: I09766423782d9bb9408f3d14169d7e5d8f1b5823
(cherry picked from commit 524bf24977)
2021-05-26 17:03:21 +01:00
Anton Hansson
766605521e Merge "Revert "Inline usage of jarjar_rules.txt"" 2021-05-26 13:57:11 +00:00
Anton Hansson
deefeb544e Merge "Add some warnings and notes about framework's jarjar rules" into sc-dev am: c886320500 am: a19d274877 am: 22a4cd5cf3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703099

Change-Id: I5763ad3a611fbd2dbddf581514abd81ec52ccaf5
2021-05-26 07:58:22 +00:00
Anton Hansson
c886320500 Merge "Add some warnings and notes about framework's jarjar rules" into sc-dev 2021-05-26 07:30:23 +00:00
Anton Hansson
637b1d65e2 Revert "Inline usage of jarjar_rules.txt"
This reverts commit 1461c6ef55.

Reason for revert: b/186804505
Bug: 186804505
Test: presubmit
Merged-In: I055f4075ac7728dfed5877286624a9600c90a38f
Change-Id: Ie1f100883c3ad6bb6f2f9a308647e4e5268b02d5
2021-05-25 16:56:48 +00:00
Anton Hansson
cb904bcdcb Merge "Revert "Inline usage of jarjar_rules.txt"" into sc-dev am: 23efb3ab75 am: eff53d0075 am: 43d664ae9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703098

Change-Id: Ifdc957f92bd26ca3951ca2b24276936188de242c
2021-05-25 13:27:32 +00:00
Anton Hansson
23efb3ab75 Merge "Revert "Inline usage of jarjar_rules.txt"" into sc-dev 2021-05-25 13:01:51 +00:00
Anton Hansson
524bf24977 Add some warnings and notes about framework's jarjar rules
These rules are explicitly recommended  to be depended on by other
libraries in the bootclasspath, that may depend on the framework's
copy of the hidl library.

Bug: 186804505
Test: presubmit
Change-Id: I09766423782d9bb9408f3d14169d7e5d8f1b5823
2021-05-25 12:48:58 +01:00
Anton Hansson
dffc59c12d Revert "Inline usage of jarjar_rules.txt"
This reverts commit 9c74c744fc

Reason for revert: b/186804505
Bug: 186804505
Test: presubmit
Change-Id: I055f4075ac7728dfed5877286624a9600c90a38f
2021-05-25 11:44:31 +00:00
Baligh Uddin
940801c165 Remove packages/Connectivity
It has moved to packages/modules/Connectivity

BUG: 186628461
TEST: TH
Merged-In: I2ed1fb00a7780c488c40d27590f206031fe033f2
Merged-In: I2a7a181e65be8952f8044df845efa80b6134d416
Change-Id: I8d162386289fcd4dc5e7092c3ea836fb67641e9f
2021-05-24 05:41:51 +00:00
Baligh Uddin
d65474f3e4 Remove packages/Connectivity.
It has moved to packages/modules/Connectivity.
Also adjust include_dir paths in frameworks/base/Android.bp

BUG: 186628461
TEST: TH
Merged-In: I2727e13dbe051162f23ef279ca11cd5cca1fc761
Change-Id: I2a7a181e65be8952f8044df845efa80b6134d416
2021-05-24 04:39:18 +00:00
Baligh Uddin
f33ffa14ae packages/Connectivity moved to packages/modules/Connectivity
BUG: 186628461
TEST: TH
Change-Id: I2727e13dbe051162f23ef279ca11cd5cca1fc761
2021-05-24 01:11:31 +00:00
Aaron Huang
b4c70e6032 Merge "Add ConnectivityAnnotations class" into sc-dev am: d2d8fa6c17 am: 329aede902
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14186142

Change-Id: I45df58f58e096f27fa6bb2e1b359c514e68206fe
2021-05-19 22:51:15 +00:00
Aaron Huang
4a9f988934 Add ConnectivityAnnotations class
This change is to address API review, add respective
@IntDef for network policy API.

Typedef cannot be exposed as SystemApi so add
ConnectivityAnnotations class and add an annotation library
so that it can be used in module and platform.

Bug: 183972925
Test: m, build doc target framework-doc-stubs_annotations.zip
      and check the APIs have an attribute IntDef annotation
Change-Id: Ie3ec40cf48818edd422a4550377774eae387d3b2
2021-05-14 10:30:49 +08:00
Alexander Dorokhine
fc253d847e Merge "Link framework-appsearch against the module_current SDK." into sc-dev am: c09e57ce61
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14348119

Change-Id: Id94e6ac58bed00cd7bef5b3e983978b5e4a1cabb
2021-05-13 20:10:36 +00:00
Alexander Dorokhine
c0bf81a526 Link framework-appsearch against the module_current SDK.
This requires removal of all hidden APIs from the framework code.

Preconditions are jarjar'd into the jar.
Other APIs are replaced with system-visible equivalents.

Bug: 181787682
Bug: 146218515
Test: Presubmit
Change-Id: I6649bed3260ac08a0f66abd7a8ec545c401761fe
2021-05-12 11:34:51 -07:00