1572 Commits

Author SHA1 Message Date
Treehugger Robot
87b5c6a2a1 Merge "Adding AudioUsage converters to AudioAttributes" 2020-12-07 18:35:21 +00:00
Hayden Gomes
c164f6a4d1 Adding AudioUsage converters to AudioAttributes
audio_policy_configuration.xsd defines strings used by HAL
to represent audio usages. This adds converters between
those strings and the AudioAttributes#attributeUsage values

Bug: 171572311
Test: atest AudioAttributesTest
Change-Id: I5301276ebd6ea1539182e9925a1e19f515e80597
Merged-In: I5301276ebd6ea1539182e9925a1e19f515e80597
2020-12-04 16:48:35 +00:00
Baligh Uddin
3eab1b0983 Migrate frameworks/base/cmds/statsd to packages/modules/StatsD/bin
Add statsd protos to platform_protos rule

BUG: 167962588
TEST: TH
TEST: Local build [ m com.android.os.statsd ]
Merged-In: I053f2a211ea28c2f181937af3d58ad16b235d096
Change-Id: I637a1af27d572924e88b1f8a930fc45d0794fa20
2020-12-04 00:40:07 +00:00
Jeffrey Huang
17df403e9e Move enums file to new directory
Bug: 167962588
Test: m -j
Change-Id: I29b21fdc98c6c795902d23f21ef3dfd11d3f3216
Merged-In: I29b21fdc98c6c795902d23f21ef3dfd11d3f3216
2020-11-25 16:14:08 -08:00
Jeffrey Huang
5d230a2d49 Delete atoms.proto from statsd
Use the atoms.proto in proto_logging as the source of truth. Also
migrates statsd log api gen to use the new atoms.proto

Bug: 167962588
Test: m -j && m CtsStatsdAtomHostTestCases

Change-Id: I36ec354d273dceace5245d7634c68ac63dc5a8cd
Merged-In: I36ec354d273dceace5245d7634c68ac63dc5a8cd
2020-11-24 10:57:06 -08:00
Chiachang Wang
1b414d61b4 Merge changes from topic "move_BSCH"
* changes:
  Remove BasicShellCommandHandler from frameworks/base
  Move BasicShellCommandHandler to frameworks/lib/modules-utils
2020-11-20 07:29:56 +00:00
Chiachang Wang
d5726c1916 Move BasicShellCommandHandler to frameworks/lib/modules-utils
BasicShellCommandHandler is used by mainline modules and the
framwork. There is a new repo that was created for putting
this kind of utility class. Move BasicShellCommandHandler for
the incoming ConnectivityService mainline and updating the
related usage.

Bug: 170598012
Test: m ; verify with adb shell cmd
Change-Id: I8a2873df6e7d8342b7a8b466bda155f74c807ee3
Merged-In: Ida30c877116090616d4bf3f87fdad835446dac84
2020-11-19 03:16:03 +00:00
Yan Yan
a3e954ffda Include PersistableBundleUtils in framework-ike-shared-srcs
Bug: 163604823
Test: FrameworksIkeTests, CtsIkeTestCases
Change-Id: Iee38086e122293f59ae14d3350f45a63671e8566
2020-11-13 22:51:59 +00:00
Michael Sun
d523796ec5 Update to use new android.system.suspend.control AIDL interface
The suspend_control_aidl_interface is updated, renamed, and splitted
into android.system.suspend.control and
android.system.suspend.control.internal. Update to use the correct
interfaces.

Test: atest FrameworksCoreTests:KernelWakelockReaderTest
Bug: 171598743
Change-Id: I32aa339b27f3d9680a61b7338b1bdb531a1a43f7
2020-11-06 03:44:01 +00:00
Treehugger Robot
1f65c6b62e Merge changes Ib3c9affb,I1dbe3d02,I88681f21
* changes:
  Keystore 2.0 SPI: Adding the keystore AIDL interface to frameworks
  Keystore 2.0: KeyProperties SignaturePadding is now public but hidden
  Keystore SPI: Add SecurityLevelEnum to KeyProperties
2020-11-06 01:01:00 +00:00
Janis Danisevskis
145e11ff93 Keystore 2.0 SPI: Adding the keystore AIDL interface to frameworks
Adds the dependency to the new Keystore 2.0 AIDL spec to the frameworks
module.

Bug: 159476414
Test: None
Change-Id: Ib3c9affbe0dfcbd78ff47b41907f5650444711a4
2020-11-05 13:11:12 -08:00
vichang
6d5fbc8434 Merge "Add app compat config from ICU4J" 2020-11-04 12:28:57 +00:00
Victor Chang
a4fae275d5 Add app compat config from ICU4J
Bug: 139480281
Bug: 171979766
Test: device boots
Change-Id: Ib2065368e2c5e0904c229c9383bc774269a0f410
2020-10-30 12:14:34 +00:00
Treehugger Robot
39c6068cbc Merge changes from topic "bug_167962976_visibility"
* changes:
  Add OWNERS block to prevent the tree from mooving during migration.
  Add visibility rules for packages/modules/Connectivity/Tethering
2020-10-29 07:15:03 +00:00
Baligh Uddin
ff8ff126c7 Add visibility rules for packages/modules/Connectivity/Tethering
BUG: 167962976
Test: TH
Change-Id: Id28881b35cf24fc9517fa11af6d8e539ab244fa6
2020-10-29 02:11:55 +00:00
Amit Mahajan
51fa2d3c56 Remove unused telephony api files.
Test: TH
Bug: 170906882
Merged-in: Ie91e11a23988729a63b6bf6a7ba965552b241748
Merged-in: Idbd05aeef055291fc50008129c30c4ae272c1ac0
Change-Id: If0d86ab504d5e5ca2cd288bd142f12a87465a8c5
2020-10-28 16:33:02 -07:00
Daniel Bright
f86143770f Merge "Add Handover Failure Mode to Radio Hal" 2020-10-22 21:38:58 +00:00
Daniel Bright
bd26ad22ba Add Handover Failure Mode to Radio Hal
On a handover request failure, the modem can now determine
whether or not to fallback.  There is also the option to revert
to the legacy logic.  Following the legacy logic is the default
behavior.

Test: FrameworkTelephonyTests
Bug: 161572465
Change-Id: I194aca34131301a3507ad3ba99be278cbf6fa87b
Merged-In: I194aca34131301a3507ad3ba99be278cbf6fa87b
2020-10-22 19:49:53 +00:00
Xin Li
986e6eeddf Merge ab/6749736 in stage.
Bug: 167233921
Merged-In: Iecef31f7bf10ad97b7e0075cf302ae94e248474a
Change-Id: I9e9c873bc2e05a0cfe3af0bf74725500f3f108db
2020-10-10 20:38:57 -07:00
Remi NGUYEN VAN
6387974158 Move IpUtils to frameworks/libs/net
The utility classes are useful for mainline modules and their tests, for
example IpClientIntegrationTest.

Bug: 168868607
Test: m && atest NetworkStaticLibTests
Change-Id: If2b1613aa18a7990391e2d31cc2951ca93f1cf3c
2020-10-05 14:38:19 +09:00
Anton Hansson
3e20672380 Merge the framework-defaults into framework-minus-apex
As of I1cea62aaedb7e653648130e3d315761c0c9aece4, there is only
one user of framework-defaults, so the separate defaults are no longer
needed.

Test: m
Change-Id: Ia06b50195dcf7de076664af4592616be5264ae21
Merged-In: Ia06b50195dcf7de076664af4592616be5264ae21
2020-09-07 14:41:30 +01:00
Anton Hansson
7a9bc4eb26 Make framework-all composed of other framework jars
This avoids duplicating the compilation of the module java source
code, as well as maintaining the compilation rules in two places.

Bug: 149906971
Test: m FrameworkServicesRoboTests
Change-Id: I1cea62aaedb7e653648130e3d315761c0c9aece4
Merged-In: I1cea62aaedb7e653648130e3d315761c0c9aece4
2020-09-07 09:14:50 +01:00
Xin Li
628590d7ec Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: I3d92a6de21a938f6b352ec26dc23420c0fe02b27
Change-Id: Ifdb80563ef042738778ebb8a7581a97c4e3d96e2
2020-08-31 21:21:38 -07:00
Chalard Jean
be00709344 Revert "Revert "Move Inet[4]AddressUtils to libs/net""
This patch is still needed and should go in now that the
error is fixed.
The patch was submitted into rvc-dev and is already in
rvc-dev-plus-aosp (patch in in ag/11923559, revert
skipped in ag/12072199). A follow-up will remove the
unused services.net-module-wifi target.

Test: originally tested in aosp/1324109
Test: m; manual: flashed, wifi and telephony working
Test: atest NetworkStackCoverageTests
Change-Id: I1074eedb0b0f156a1135e11210ec102de15ea674
Merged-In: Icd141a992c46290c74929785e261a1cd57bc001b
2020-08-07 03:31:04 +00:00
Alexander Mishkovets
654ed1df03 Merge "Integrate system language filtering functionality" am: 2df94f9b15 am: db00e424d9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1362798

Change-Id: I4684de9e0199b2d750108473366d04f605b6e955
2020-07-30 12:18:53 +00:00
Alexander Mishkovets
77f6bc8951 Integrate system language filtering functionality
Filter system languages based on the configuration provided via
the corresponding system property.

Bug: 154133013
Test: manual; atest LocalizationTest
Change-Id: I7e4694f4b381ab81d0e8ceab97bad68bb266aaee
2020-07-29 10:16:24 +02:00
Peiyong Lin
b967a4c381 Use more inclusive terms inside GraphicsEnvironment.
Bug: b/162288333
Test: N/A
Change-Id: I2f1f13a892be0c8ff3f89e0ceabe39058390727d
2020-07-27 23:57:50 -07:00
Chalard Jean
a35580e0dd Revert "Move Inet[4]AddressUtils to libs/net"
This reverts commit 57d68e3c55176083ba40947be8f335534d958006.

Reason for revert: Breaks the build b/160390899

Merged-In: Icd141a992c46290c74929785e261a1cd57bc001b
Change-Id: Ie10e66f61393602f17fbb61bf17230b176bf1f44
2020-07-02 23:47:35 +00:00
Remi NGUYEN VAN
57d68e3c55 Move Inet[4]AddressUtils to libs/net
The classes should not be picked up from frameworks/base, as they are
part of several mainline modules.

Also refine comments in DhcpResults following feedback in previous
change.

(cherry-pick from internal branch skipping wifi classes; no other
conflict)

Bug: 151052811
Test: m; manual: flashed, wifi and telephony working
Test: atest NetworkStackCoverageTests
Merged-In: I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f

Change-Id: I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f
2020-07-02 10:52:31 +09:00
Remi NGUYEN VAN
deae676127 Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: 6555756e90
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846903

Change-Id: Icd141a992c46290c74929785e261a1cd57bc001b
2020-06-19 01:08:48 +00:00
Remi NGUYEN VAN
6555756e90 Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev 2020-06-19 00:49:29 +00:00
Amy Zhang
622f9f44d4 Merge "Update media resourceManagerService with the Application pid" into rvc-dev am: cea1d98cde
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11803042

Change-Id: I63d899f77c9616c2aac9a7c8d47e253ed91cbe1d
2020-06-15 21:12:59 +00:00
Amy Zhang
ccdbc4ddd8 Update media resourceManagerService with the Application pid
This CL updates the media resourceManagerService calling pid with the
real application pid when TunerResourceManager is able to get this
information from TvInputManager. Calling
IResourceManagerService.overridePid to update.

Test: dumpsys media.resource_manager on cuttlefish
Bug: 150989423
Change-Id: Ie811ae15bbcc326ed3a09f97b6b5a57f4b48b094
2020-06-15 17:40:34 +00:00
Remi NGUYEN VAN
eee629f4c7 Move Inet[4]AddressUtils to libs/net
The classes should not be picked up from frameworks/base, as they are
part of several mainline modules.

Also refine comments in DhcpResults following feedback in previous
change.

Bug: 151052811
Test: m; manual: flashed, wifi and telephony working
Test: atest NetworkStackCoverageTests
Change-Id: I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f
2020-06-12 17:04:06 +09:00
Paul Duffin
3bde2d558a Switch to standard naming scheme
Removes use of the special framework-modules naming scheme.

Bug: 155164730
Test: m java
Exempt-From-Owner-Approval: Build cleanup.
Merged-In: I3b78fcbcacc3df787e171d6eedeef1e51b087615
Merged-In: I0c31e2183353dfb5bd49f04f3455cb7b10be6866
Change-Id: I39e2033400a769568dd594eb2861e7f3ed42ce20
(cherry picked from 8b864fb45ce79051437f13c2a19510718ea3b7aa)
2020-06-08 15:47:53 +01:00
Paul Duffin
01fd6ff918 Switch to standard naming scheme
Removes use of the special framework-modules naming scheme.

Bug: 155164730
Test: m java
Exempt-From-Owner-Approval: Build cleanup.
Change-Id: I3896d7c91e937f503b49f5df011c21ee51219652
Merged-In: I0c31e2183353dfb5bd49f04f3455cb7b10be6866
Merged-In: I3b78fcbcacc3df787e171d6eedeef1e51b087615
(cherry picked from 8b864fb45ce79051437f13c2a19510718ea3b7aa)
2020-06-02 14:15:28 +00:00
Paul Duffin
42340d5a91 Merge "Switch to standard naming scheme" into rvc-dev am: f94d682a9b
Original change: undetermined

Change-Id: I57cffc68409c2e9b795b0c8732fecc9bbf33e113
2020-06-02 11:58:50 +00:00
Paul Duffin
abebc6a897 Switch to standard naming scheme
Removes use of the special framework-modules naming scheme.

Bug: 155164730
Test: m java
Exempt-From-Owner-Approval: Build cleanup.
Change-Id: I3b78fcbcacc3df787e171d6eedeef1e51b087615
Merged-In: I0c31e2183353dfb5bd49f04f3455cb7b10be6866
(cherry picked from 8b864fb45ce79051437f13c2a19510718ea3b7aa)
2020-06-02 06:53:53 +00:00
Makoto Onuki
2ba0a25175 Merge "Update api-lint baseline for NO_SETTINGS_PROVIDER" 2020-05-28 17:02:57 +00:00
Baligh Uddin
f1613ef178 Adjust visibility rules for IPSec
BUG: 156287389
Test: TH and Local Build
Merged-In: Ia2c1c6e82eef7ba25fe4c090ffa02bff5c3ddca2
Change-Id: I097ce1a51d2fa1abde3502f6023f4d840cee3794
2020-05-27 23:39:04 +00:00
Makoto Onuki
b14bc8c6ae Merge "Update api-lint baseline for NO_SETTINGS_PROVIDER" into rvc-dev-plus-aosp 2020-05-27 23:34:28 +00:00
Baligh Uddin
5d8d8a237e Merge "Adjust visibility rules for IPSec" am: 29e3c0ba36 am: f7a649984f
Change-Id: I17d15a972542971244a962b1c8401dd9b6de0c50
2020-05-27 22:11:37 +00:00
Makoto Onuki
a664a9017f Update api-lint baseline for NO_SETTINGS_PROVIDER
Bug: 151454839
Test: See the other CL in the topic

Merged-in: I4e1d6c419c79663a47341cf26d5229ec17b9ca01
Change-Id: I4e1d6c419c79663a47341cf26d5229ec17b9ca01
(cherry picked from commit 451da1ce77de069558394be221d30a1e93fb7b03)
2020-05-27 21:49:29 +00:00
Baligh Uddin
b7ec5bbc0c Adjust visibility rules for IPSec
BUG: 156287389
Test: TH and Local Build
Change-Id: Ia2c1c6e82eef7ba25fe4c090ffa02bff5c3ddca2
2020-05-27 19:22:36 +00:00
Alex Buynytskyy
53ea003df2 Merge "Lifecycle: detecting blocked and unhealthy." into rvc-dev am: 4e5ff2eb7d
Change-Id: If0f24b8549fbf78aecf4586551528606064ecfe7
2020-05-27 04:17:10 +00:00
Makoto Onuki
7821658dfb Update api-lint baseline for NO_SETTINGS_PROVIDER
Bug: 151454839
Test: See the other CL in the topic

Merged-in: I4e1d6c419c79663a47341cf26d5229ec17b9ca01
Change-Id: I4e1d6c419c79663a47341cf26d5229ec17b9ca01
2020-05-26 17:16:31 -07:00
Alex Buynytskyy
8ef61aebee Lifecycle: detecting blocked and unhealthy.
Part 1: interfaces and PM implementation.

Bug: 153874006
Test: atest PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest IncrementalServiceTest
Change-Id: I312dd919d2bb552bea3d72fb49fd1579882da14b
2020-05-26 19:34:39 +00:00
Ramy Medhat
5ab24e74da Merge "Add sources read implicitly when building android.test.mock.stubs.source.test" am: ff2641428f am: 3105aee1ee
Change-Id: I1e9641981ae1048507d81f59b84a2a19ebe89d32
2020-05-25 13:44:39 +00:00
Ramy Medhat
10146d8821 Add sources read implicitly when building android.test.mock.stubs.source.test
This CL makes explicit the source files read implicitly when building
android.test.mock.stubs.source.test. The list of source files added was
obtained by using ag/11062343 to dump all implicitly read files during
the execution of a metalava command.

Test: m
out/soong/.intermediates/frameworks/base/test-mock/android.test.mock.stubs.source.test/android_common/check_current_api.timestamp
with RBE_METALAVA=1 to make sure their are no api mismatches when using
the RBE result.

Change-Id: Ib131a13731e0e97cba0c34e19c454d3086858948
2020-05-25 07:35:06 -04:00
Hall Liu
92f928b250 Refactor SubscriptionManager caching code am: 29b1874ffc
Change-Id: I9b3eeade5d5b7ddc91ede9c340ab1381cb4e9278
2020-05-05 16:46:32 +00:00