Commit Graph

100002 Commits

Author SHA1 Message Date
TreeHugger Robot
83a1f6a98c Merge "Add new Factory reset protection policy APIs" 2020-01-13 19:21:11 +00:00
Sarah Chin
6be7ecd54d Merge "Make MmsManager public and @SystemService" 2020-01-13 18:53:31 +00:00
TreeHugger Robot
329426efd2 Merge "Do not migrate use full volume shared preference" 2020-01-13 18:32:50 +00:00
David Su
433d603863 Merge changes from topics "framework-wifi-jarjar", "framework-wifi-jarjar-more-classes"
* changes:
  SystemService annotation: Remove import of Context
  Jarjar more classes into framework-wifi
  Jarjar utils into framework-wifi and share with wifi-service
2020-01-13 18:04:08 +00:00
Ryan Mitchell
0252b862de Merge changes from topic "shared-lib-tele-res"
* changes:
  Allow for overlaying dynamic shared libraries
  Assign shared libraries stable package ids
2020-01-13 15:15:57 +00:00
Automerger Merge Worker
9930eea1bd [SP03] support registerNetworkStatsProvider API am: 80831d2ff3 am: 358de94645 am: aa1242109c
Change-Id: Iaedbf1f8bbe8128ca2631efff24048b97ce9d909
2020-01-13 14:48:01 +00:00
Automerger Merge Worker
aa1242109c [SP03] support registerNetworkStatsProvider API am: 80831d2ff3 am: 358de94645
Change-Id: I16130e06129e985fab33b5caf904477bf241e1b2
2020-01-13 14:28:05 +00:00
Automerger Merge Worker
f68f1f383d [SP03.1] Replace com.android.internal.util.Preconditions.checkNotNull am: 232b2edcfb am: adf6c4eaff
Change-Id: I872285f988905d6707109ab3c7e6a419df47d39b
2020-01-13 14:28:02 +00:00
junyulai
358de94645 [SP03] support registerNetworkStatsProvider API
am: 80831d2ff3

Change-Id: Id3a21676b6063048124c54035207a1c070df7a8c
2020-01-13 06:12:41 -08:00
junyulai
adf6c4eaff [SP03.1] Replace com.android.internal.util.Preconditions.checkNotNull
am: 232b2edcfb

Change-Id: I17550a2191ccd33a53a195df3cd178d93fbfe952
2020-01-13 06:12:31 -08:00
Lorenzo Colitti
b891c0a6af Merge changes from topic "networkagent"
* changes:
  Rename NetworkMisc to NetworkAgentConfig.
  Make NetworkAgent stop subclassing Handler.
2020-01-13 14:08:04 +00:00
Automerger Merge Worker
6ccab09668 Merge "Use new UnsupportedAppUsage annotation." am: 89ac95017f am: b2b309516a
Change-Id: Ia3b772ad3ae7c26d92f3367a3689579cd00860ab
2020-01-13 13:50:52 +00:00
Treehugger Robot
89ac95017f Merge "Use new UnsupportedAppUsage annotation." 2020-01-13 13:35:38 +00:00
Automerger Merge Worker
1e7a3e8160 Merge "Use new UnsupportedAppUsage annotation." am: 9938c70fb5 am: 1f8ff9d305
Change-Id: I2aa7c78de32e8abb96150d43500ecb29ba9ebd15
2020-01-13 13:22:57 +00:00
Automerger Merge Worker
627480d918 Merge "Use new UnsupportedAppUsage annotation." am: 70a89435e7 am: 4220fc33a1
Change-Id: I0960879c5cd2791fa7cc27746474d6ebf2f61c9e
2020-01-13 13:22:33 +00:00
satayev
e1432f59ee Merge "Use new UnsupportedAppUsage annotation." 2020-01-13 13:09:36 +00:00
Treehugger Robot
9938c70fb5 Merge "Use new UnsupportedAppUsage annotation." 2020-01-13 13:05:17 +00:00
Treehugger Robot
70a89435e7 Merge "Use new UnsupportedAppUsage annotation." 2020-01-13 13:04:48 +00:00
Artur Satayev
bc3d8b9071 Use new UnsupportedAppUsage annotation.
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library.

Bug: 145132366
Test: m && diff unsupportedappusage_index.csv
Change-Id: I534e3fd1305e2f4af076986770033478448a665c
Merged-In: I534e3fd1305e2f4af076986770033478448a665c
2020-01-13 12:39:59 +00:00
Alex Johnston
011f5c6ea5 Add new Factory reset protection policy APIs
Historically, FRP behaviour was built on top of the application restrictions
infrastructure. This CL introduces new behaviour, as the profile owner of an
organization-owned device needs to be able to control FRP behaviour and
cannot set application restrictions on user 0.

- Introduced a new FactoryResetProtectionPolicy object
  - Added it as a field to ActiveAdmin
  - Created a default value
- Added setFactoryResetProtectionPolicy to DPM which is used to set a
  factory reset protection policy. If the policy is null, the current
  policy is cleared and set back to the default value.
- Added getFactoryResetProtectionPolicy to DPM to retrieve the current
  factory reset protection policy. If this is the default value, then
  no policy is set.
- Both these APIs are callable by the device owner or profile owner of
  an organization-owned device.

Bug: 143517230
Test: atest com.android.server.devicepolicy.DevicePolicyManagerTest
      atest com.android.server.devicepolicy.FactoryResetProtectionPolicyTest
      atest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testFactoryResetProtectionPolicy
      atest com.android.cts.devicepolicy.OrgOwnedProfileOwnerTest#testFactoryResetProtectionPolicy

Change-Id: I72c4d06ec8a27741a1956d082969573077937726
2020-01-13 10:55:28 +00:00
Automerger Merge Worker
f527be5233 Merge "Do not throw exception when there is no omapi reader supported" am: 1fe83df53a am: 8c948867c5 am: 08dbee381e
Change-Id: Ia8253e4d829837c50cc6f4e7d544d966e501b9d8
2020-01-13 08:27:50 +00:00
Automerger Merge Worker
08dbee381e Merge "Do not throw exception when there is no omapi reader supported" am: 1fe83df53a am: 8c948867c5
Change-Id: If6af01cbe79f9f3a6802924814ee648366d7eca5
2020-01-13 08:15:55 +00:00
Treehugger Robot
1fe83df53a Merge "Do not throw exception when there is no omapi reader supported" 2020-01-13 07:43:56 +00:00
junyulai
80831d2ff3 [SP03] support registerNetworkStatsProvider API
This change provides an API that allow external modules to
register a custom provider of NetworkStats to merge the
network statistics that cannot be seen by the kernel to system.

Test: atest FrameworksNetTests CtsUsageStatsTestCases
Test: atest NetworkPolicyManagerServiceTest
Test: m doc-comment-check-docs
Bug: 130855321

Change-Id: I265bc637c40666cde505fde5056d2d9bfc5fb204
2020-01-13 14:43:03 +08:00
junyulai
232b2edcfb [SP03.1] Replace com.android.internal.util.Preconditions.checkNotNull
Extracted from ag/9990011 to make NetworkStatsManager sync with internal
line, given that it is missing in aosp/1198084.

Bug: 126528330

Test: Treehugger
Change-Id: I77f50326869799f51d4636cb7c6d7c97daf531e6
Merged-In: I42117ebfb640e3b0b133183e5e146860bed8471a
2020-01-13 14:42:37 +08:00
Lorenzo Colitti
d969656f45 Rename NetworkMisc to NetworkAgentConfig.
NetworkMisc is not really an appropriate name for a system API.

Bug: 138306002
Test: builds, boots, wifi works, telephony works
Test: atest FrameworksNetTests FrameworksWifiTests FrameworksTelephonyTests
Change-Id: I621cfbe165996c67b201ca2dd2f95a5ab9af10ee
2020-01-13 15:01:52 +09:00
Lorenzo Colitti
782b48d567 Make NetworkAgent stop subclassing Handler.
Subclassing Handler is not appropriate for a system API because
it is an implementation detail and allows users of this class to
post messages to the handler in ways that allow inappropriate
access to internals that aren't part of the API contract.

Also fix some lint errors.

Test: builds
Bug: 138306002
Change-Id: I79478ceff6bbcae879d1025098d177de0d15dbee
2020-01-13 14:49:15 +09:00
Automerger Merge Worker
c15b706790 Merge changes I7ea39b80,I6b9979f3 am: 310d1dac0d am: a27e14c240 am: ea6288bd2d
Change-Id: I97bd2471b04d9a6291b03a989ccd618c2dc70c6e
2020-01-13 04:51:33 +00:00
Automerger Merge Worker
ea6288bd2d Merge changes I7ea39b80,I6b9979f3 am: 310d1dac0d am: a27e14c240
Change-Id: If8cd7bd2c1fe4b698113eb761ed8e2b4f9580cf0
2020-01-13 04:34:10 +00:00
David Su
7f528b9a33 SystemService annotation: Remove import of Context
Remove import of Context to allow this annotation
to be statically linked easily.

Bug: 142886292
Test: compiles
Change-Id: I74b02d562a9df1729e4046c7a1e6d5d8033f21e2
2020-01-12 18:35:01 -08:00
Minche Li
b95dfee332 Merge "Add new switchToInputMethod API" 2020-01-13 02:31:53 +00:00
Lorenzo Colitti
0153955e9a Address comments on ag/10050681.
Test: builds
Bug: 138306002
Change-Id: I7ea39b80eede50288261d05ef6f2e860f30b22d6
2020-01-12 18:08:56 +09:00
Automerger Merge Worker
f1f6f5d827 Merge changes from topic "networkprovider" am: 78ff9fe27a am: 5eed2ca1ea
Change-Id: Ib256b5b4a710f4f28f214d614cc2c03014459a55
2020-01-12 08:40:34 +00:00
Automerger Merge Worker
4f6e318fea Stop using factory serial numbers in NetworkFactory. am: f486b23982 am: 0b9e88d6dc
Change-Id: I2265a8ac2afbc4b920363cac79c8f5b7d72230d6
2020-01-12 08:40:30 +00:00
Automerger Merge Worker
af91e2951d Use NetworkProvider in NetworkFactory. am: 2df761bdcb am: 457137406a
Change-Id: I37cc606c6a4c76e0f2ce4e4bcd21f5201ad354cb
2020-01-12 08:40:25 +00:00
Lorenzo Colitti
6654b08619 Stop using NetworkFactory in connectivity code.
Bug: 138306002
Test: builds, boots
Test: atest FrameworksNetTests
Change-Id: I6b9979f343108c0c077abd86ae1c21e5ece0cccc
2020-01-12 17:40:02 +09:00
Nicholas Ambur
55c162edcd Merge "add audioCapabilities to SoundTrigger properties" 2020-01-11 16:39:55 +00:00
Lorenzo Colitti
b6b9fa6eff Delete the NetworkFactory running-on-correct-thread assertion.
The change to make NetworkFactory use NetworkProvider included an
assertion that the onNetworkRequested and onRequestWithdrawn
methods were called on the factory's Looper.

This is not really necessary since it cannot happen in the
current code unless there is a bug in Looper. It also makes it
impossible to test this code using TestLooper, which dispatches
messages on the test thread instead of on the looper thread.

So, delete the check.

Bug: 138306002
Test: atest FrameworksWifiTests now passes
Change-Id: I37449efb50287c683312f0b19909bd4c61b38585
Merged-In: I37449efb50287c683312f0b19909bd4c61b38585
2020-01-11 20:06:20 +09:00
Lorenzo Colitti
f486b23982 Stop using factory serial numbers in NetworkFactory.
Don't delete NetworkFactory.SerialNumber or getSerialNumber() yet
because those are still in use in various places.

Test: builds
Bug: 138306002
Change-Id: I102af09cb52b447e472398869d82556b5708cb82
Merged-In: I102af09cb52b447e472398869d82556b5708cb82
2020-01-11 20:02:05 +09:00
Lorenzo Colitti
2df761bdcb Use NetworkProvider in NetworkFactory.
Bug: 138306002
Test: builds, boots, wifi and telephony work
Test: Existing NetworkFactory tests in FrameworksNetTests pass
Change-Id: Ib8cac2fab5092c99b0a496fdeedfcfab6d578936
Merged-In: Ib8cac2fab5092c99b0a496fdeedfcfab6d578936
2020-01-11 20:01:24 +09:00
Jack Yu
bcbe46816c Do not migrate use full volume shared preference
Use full volume has been renamed to override DnD and
the toggle is now only available for certain countries. We
intended not to provide the ability to migrate this shared
preference as it might cause issue for users who already
changed the preference. After mainline migration, override
DnD should be always reset to default value of that country.

Test: Manual
Bug: 147426188
Change-Id: I5746fe32674131b474e784bd5dd62ecff76386d5
2020-01-10 23:40:59 -08:00
Yanli Wan
0c581ec46d Merge "Add support to start financed device provisioning" 2020-01-11 05:24:17 +00:00
Sarah Chin
4affb51cc9 Make MmsManager public and @SystemService
Test: manually verify can send/receive MMS
Bug: 144004293
Change-Id: I39cde852252e18f71f98e328354df66611c9db60
2020-01-10 20:02:08 -08:00
Lorenzo Colitti
c326cedadf Merge changes from topic "networkprovider"
* changes:
  Delete the NetworkFactory running-on-correct-thread assertion.
  Stop using factory serial numbers in NetworkFactory.
  Use NetworkProvider in NetworkFactory.
2020-01-11 03:50:46 +00:00
Benedict Wong
d6d1c3aa3e Merge "Add new appop for Platform VPNs" 2020-01-11 02:31:14 +00:00
Automerger Merge Worker
00f335412b Merge changes I978ac321,I5675a80c,I56ef3cc4,I1cdaf002 am: 2ff0a7bd58 am: 3bb4823ce5
Change-Id: Iccbb591430093ac42fa813648fa4ece4b17a0ea3
2020-01-11 01:17:27 +00:00
Automerger Merge Worker
a6f8a96d6d Merge "Add JNI call for writing StatsEvent to statsd." am: 9e52462c48 am: a4bba9adf8
Change-Id: I22294b7a9a0eb15b82b865d6ad271b59af9ef9ba
2020-01-11 01:17:04 +00:00
Treehugger Robot
2ff0a7bd58 Merge changes I978ac321,I5675a80c,I56ef3cc4,I1cdaf002
* changes:
  Add --supportQ flag to java StatsLog codegen
  Support new socket schema in native codegen
  Move statsd metadata from statslog to atoms_info
  Fix StatsEvent memory usage for pulled events
2020-01-11 00:42:14 +00:00
Treehugger Robot
9e52462c48 Merge "Add JNI call for writing StatsEvent to statsd." 2020-01-11 00:41:30 +00:00
TreeHugger Robot
b3b11a07ee Merge "Add TEST_MAPPING for ResourceLoaders" 2020-01-11 00:20:43 +00:00