Commit Graph

6969 Commits

Author SHA1 Message Date
TreeHugger Robot
2e7d461e32 Merge "Update to new RollbackUtils.sendCrashBroadcast API." 2019-08-16 11:08:59 +00:00
Richard Uhler
0c03aaae84 Update to new RollbackUtils.sendCrashBroadcast API.
Bug: 139108668
Test: atest StagedRollbackTest:com.android.tests.rollback.host.StagedRollbackTest#testBadApkOnly
2
Change-Id: Iaaa728aa58d894ba546677e8295faba2ebfc5e64
2019-08-16 09:03:02 +01:00
Jianpeng Li
7024959d9c Merge "Update wifi interface ip state upon receiving ap disable event" am: 25d4c75c26 am: 8e27bc49d4 am: aedb232cb8 am: aba3b5770a
am: b330e7dd56

Change-Id: I49e919b9cf773cefa4ae20507b6227f651a653db
2019-08-15 23:30:17 -07:00
Jianpeng Li
aba3b5770a Merge "Update wifi interface ip state upon receiving ap disable event" am: 25d4c75c26 am: 8e27bc49d4
am: aedb232cb8

Change-Id: I49bb649662a2f768b7099768e304a1a0a37f3cfe
2019-08-15 23:04:28 -07:00
Jianpeng Li
aedb232cb8 Merge "Update wifi interface ip state upon receiving ap disable event" am: 25d4c75c26
am: 8e27bc49d4

Change-Id: I0ae8f80c9a4019977e3a26d1f3ef4270a069137e
2019-08-15 22:56:22 -07:00
Jianpeng Li
8e27bc49d4 Merge "Update wifi interface ip state upon receiving ap disable event"
am: 25d4c75c26

Change-Id: Ia58a409f63c59ece7817f9412695595708a95c77
2019-08-15 22:48:54 -07:00
Treehugger Robot
25d4c75c26 Merge "Update wifi interface ip state upon receiving ap disable event" 2019-08-16 05:15:12 +00:00
Jianpeng Li
a70feeca7a Update wifi interface ip state upon receiving ap disable event
When turning on/off SoftAp with high frequency, sometime calling
WifiManager#updateInterfaceIpState with IFACE_IP_MODE_TETHERED
is performed after handling WIFI_AP_STATE_DISABLED event in
WifiServiceImpl while SoftAp is being terminated. This leads to
the issue that SoftAp is unable to start as startSoftAp always
returns "false". This is because mIfaceIpModes in WifiServiceImpl
keeps the mode WifiManager.IFACE_IP_MODE_TETHERED and the CL below
rejects SoftAp start request.

e257c5c9e79e3675375ca20731cfb74df02b1064 @ frameworks/opt/net/wifi
(WifiServiceImpl: Reject startSoftAp when already tethering)

This CL updates the interface ip state upon receiving ap disable
event from Tethering class to set proper state to mIfaceIpModes.

Bug: 134806980
Test: Ran script to turn on/off soft ap frequently
Signed-off-by: Daichi Ueura <daichi.ueura@sony.com>
Change-Id: I2f89214414d93f1aa942fb8a21264a9baae3452a
2019-08-16 04:16:26 +09:00
Roshan Pius
07820f85ac Merge changes from topic "wifi_mainline_apk_separation"
* changes:
  Sysui/WifiTracker: Changes to support late starting wifi service
  WifiManager: Retrieve IWifiManager service lazily
  WifiStackClient: Register wifi API services from system_server
  Mainline wifi stack module
  NetworkStackClient: Refactor network stack process interaction
2019-08-14 19:33:10 +00:00
Mark Chien
1bd1a78430 Merge "Don't allow upstream if entitlement don't know any downstream" am: 161814ffb1 am: 538bc0fe4f am: 5d2bb5b544 am: 4fbf46cdc5
am: 4e8eeb93c9

Change-Id: I07226cd02d3c5557ee05954efdaccfb70c7431f5
2019-08-13 03:20:03 -07:00
Mark Chien
4fbf46cdc5 Merge "Don't allow upstream if entitlement don't know any downstream" am: 161814ffb1 am: 538bc0fe4f
am: 5d2bb5b544

Change-Id: Id409783b9fb71a71c982d5d7fe6c21bd20f5d84a
2019-08-13 03:07:28 -07:00
Mark Chien
5d2bb5b544 Merge "Don't allow upstream if entitlement don't know any downstream" am: 161814ffb1
am: 538bc0fe4f

Change-Id: Ibfa3dfd6a187f6926831910cbef920cf122721a1
2019-08-13 03:01:31 -07:00
Mark Chien
538bc0fe4f Merge "Don't allow upstream if entitlement don't know any downstream"
am: 161814ffb1

Change-Id: Ibac99a20b470b48597859fe737732f3c6f491805
2019-08-13 02:49:09 -07:00
Mark Chien
161814ffb1 Merge "Don't allow upstream if entitlement don't know any downstream" 2019-08-13 09:36:16 +00:00
markchien
426311bcb5 Don't allow upstream if entitlement don't know any downstream
In case tethering donwstream is setup but don't ask EntitlementManager
to run provisioning. Cellular upstream should not be allowed if
EntilementManager don't have any donwstream record.

Bug: 134649258
Test: -build, flash, boot
      -manual test with carrier SIM
Change-Id: I609722c79f0a45a1c2164d39721ef5883e436feb
2019-08-13 02:28:41 +00:00
Roshan Pius
7e6f5f5e08 NetworkStackClient: Refactor network stack process interaction
Refactor NetworkStackClient class to move the module service binding &
network stack process death monitoring to a separate class. This class
will only instantiated in the SystemServer process.
The new class |SystemServerToNetworkStackConnector| will be used from
the client classes corresponding to each module running on the network
stack process (NetworkStackClient, WifiStackClient, etc)

This has 2 main advantages:
a) Reduces code duplication (Otherwise the various Client classes need
to replicate the service bindding & process death monitoring).
b) Central crash recovery for the network stack process (Otherwise the
various Client classes will trigger multiple recovery for a single
network stack process crash).

Bug: 135679762
Test: Device boots up & connects to wifi networks.
Change-Id: I673581b0067b9a3f72dd68a3ab622c18183ebd2e
Merged-In: I673581b0067b9a3f72dd68a3ab622c18183ebd2e
2019-08-12 07:22:56 -07:00
Gavin Corkery
65e90bab69 Extend ROLLBACK_COMMITTED broadcast for the multi-user case
For the case where there are multiple users on the device,
the ROLLBACK_COMMITTED broadcast should be sent to all
users for which the package is being rolled back.

Test: atest RollbackTest
Test: atest SecondaryUserRollbackTest
Bug: 139060321
Change-Id: I8e20da321f52ebf9e6d584a8c59d2a3106a32212
2019-08-09 11:15:07 +01:00
Eugene Susla
419dc6cb57 Merge "Update codegen to match javaparser update" 2019-08-07 02:49:31 +00:00
Remi NGUYEN VAN
7fc7958938 Merge "Extract test utilities for ConnectivityService" am: b7d270a73e am: 62857556a4 am: 6d34ffb4e6 am: 111a3c1883
am: e2967d9830

Change-Id: I0bb8a965d11e9f16ac70f62a2319e1dc8e7544df
2019-08-06 16:31:01 -07:00
Remi NGUYEN VAN
111a3c1883 Merge "Extract test utilities for ConnectivityService" am: b7d270a73e am: 62857556a4
am: 6d34ffb4e6

Change-Id: Ib760ef922a440d54bab8c1647d8444ab2a717094
2019-08-06 15:57:04 -07:00
Remi NGUYEN VAN
6d34ffb4e6 Merge "Extract test utilities for ConnectivityService" am: b7d270a73e
am: 62857556a4

Change-Id: Idfea637a9fd071c8fa62798bf8e3b9f241bc6348
2019-08-06 15:33:53 -07:00
Remi NGUYEN VAN
62857556a4 Merge "Extract test utilities for ConnectivityService"
am: b7d270a73e

Change-Id: I0ac2a480f961bb6fd1d83dedad6a7942ee03858f
2019-08-06 14:58:43 -07:00
Eugene Susla
b3361098ed Update codegen to match javaparser update
Test: . $ANDROID_BUILD_TOP/frameworks/base/tests/Codegen/runTest.sh
Change-Id: I3e961a9cee5c71bd2195328dcb53dabd61255aa6
2019-08-06 14:19:49 -07:00
Eugene Susla
3156a4ce21 Addresses further review comments from ag/8000041
Including:
 - An API to opt out of Int/StringDefs generation on per-field basis
 - A way to customize Builder
 - Non-optional fields are passed in Builder constructor
 - Various adjustments to SampleDataclass examples, as requested

Test: . $ANDROID_BUILD_TOP/frameworks/base/tests/Codegen/runTest.sh
Change-Id: I32d2eec52f05d505ff07779d923e4793d3036579
2019-08-05 16:54:41 -07:00
Remi NGUYEN VAN
95dc87ebce Extract test utilities for ConnectivityService
The utilities help using ConnectivityService in tests, and will be used
to write integration tests for ConnectivityService.

Test: atest FrameworksNetTests
Change-Id: Ie895ad05139cd5768d3d8a9bd5589d72571f47e6
2019-08-01 16:32:30 +09:00
Eugene Susla
a110b6b960 Merge "Auto-build/update codegen" 2019-07-30 16:42:45 +00:00
Eugene Susla
0fb0ffa4cc Auto-build/update codegen
Test: 1. Manually enter version/presence of build artifact,
and ensure `codegen FILENAME` still works
2. run codegen again without altering version, ensure no build triggered
Change-Id: I6f1dba0a476077c708bbea8ef558445107e5ad97
2019-07-29 14:57:01 -07:00
Makoto Onuki
792de8d648 Move the job scheduler service code to its own jar file.
- Also remove the dependency from SystemServiceRegistry to JobScheduler

See apex/jobscheduler/README_js-mainline.md for the details.

Bug: 137763703
Test: build and boot
Test: atest CtsJobSchedulerTestCases
Change-Id: I2386c78b7a6085d6e543a63f22cb620c4cabd06a
2019-07-29 09:32:02 -07:00
Makoto Onuki
a0c692ff9f Revert "Move the job scheduler service code to its own jar file."
This reverts commit 136d1ecf1e.

Reason for revert: My device didn't boot. :(

Change-Id: I11636c2ad03a3c14f5953a700fc3a2d629a81a42
2019-07-25 18:09:14 +00:00
Makoto Onuki
136d1ecf1e Move the job scheduler service code to its own jar file.
- Also remove the dependency from SystemServiceRegistry to JobScheduler

See apex/jobscheduler/README_js-mainline.md for the details.

Bug: 137763703
Test: build and boot
Test: atest CtsJobSchedulerTestCases
Change-Id: Ic8ae8e99e6600b261618b5cfb6590d3f3664ae9f
2019-07-24 14:50:47 -07:00
Eugene Susla
03af85af07 Merge "Codegen for parcelable/dataclass boilerplate" 2019-07-19 22:07:24 +00:00
Jeff Vander Stoep
b4990fa6fa Renderscript: rename .rs extension to .rscript
Reserve .rs extension for Rust.

Bug: 137365032
Test: make checkbuild
Test: cd frameworks/compile/slang/tests
    ./slang_tests.py
Test: atest CtsRenderscriptTestCases
Test: CtsRsCppTestCases

Exempt-From-Owner-Approval: Clean CP
Change-Id: Ic49fc7f5265d49cd4f8efd6a2b6a60b77bbd40dc
Merged-In: Ic49fc7f5265d49cd4f8efd6a2b6a60b77bbd40dc
(cherry picked from commit e98dce083c)
(cherry picked from commit bbb75b1263)
2019-07-18 04:00:56 +00:00
Jeffrey Vander Stoep
c799747103 Merge "Renderscript: rename .rs extension to .rscript" 2019-07-18 02:02:00 +00:00
Eugene Susla
574b7e11d5 Codegen for parcelable/dataclass boilerplate
This is the initial implementation of the `codegen` cli utility
for in-place java boilerplate generation

See DataClass and SampleDataClass for documentation/guide/examples.

See tools/codegen/ for implementation and tests/Codegen/ for tests.

Bug: 64221737
Test: . frameworks/base/tests/Codegen/runTest.sh
Change-Id: I75177cb770f1beabc87dbae9e77ce4b93ca08e7f
2019-07-17 17:12:37 -07:00
Jeff Vander Stoep
2960f0e7ec Renderscript: rename .rs extension to .rscript
am: bbb75b1263

Change-Id: Ia947ac7c387514f44747d1c1d89cb3d3bd9ba9c9
2019-07-17 16:04:23 -07:00
Jeff Vander Stoep
bbb75b1263 Renderscript: rename .rs extension to .rscript
Reserve .rs extension for Rust.

Bug: 137365032
Test: make checkbuild
Test: cd frameworks/compile/slang/tests
    ./slang_tests.py
Test: atest CtsRenderscriptTestCases
Test: CtsRsCppTestCases

Exempt-From-Owner-Approval: Clean CP
Change-Id: Ic49fc7f5265d49cd4f8efd6a2b6a60b77bbd40dc
Merged-In: Ic49fc7f5265d49cd4f8efd6a2b6a60b77bbd40dc
(cherry picked from commit e98dce083c)
2019-07-17 21:47:28 +00:00
Jeff Vander Stoep
065e3864cc Renderscript: rename .rs extension to .rscript
Reserve .rs extension for Rust.

Bug: 137365032
Test: make checkbuild
Test: cd frameworks/compile/slang/tests
    ./slang_tests.py
Test: atest CtsRenderscriptTestCases
Test: CtsRsCppTestCases

Change-Id: Ic49fc7f5265d49cd4f8efd6a2b6a60b77bbd40dc
Merged-In: Ic49fc7f5265d49cd4f8efd6a2b6a60b77bbd40dc
2019-07-17 21:32:50 +00:00
TreeHugger Robot
084ac5e0c8 Merge "Renderscript: rename .rs extension to .rscript" 2019-07-17 18:04:18 +00:00
Jeongik Cha
168267660f Merge changes from topic "system_ext"
* changes:
  Consider overlay in system_ext as system's
  Support /system_ext partition
2019-07-17 10:24:58 +00:00
Alan Stokes
227f21df7d DO NOT MERGE: Disable failing test.
This code is going away soon, so not attempting a more nuanced fix.

Bug: 137574238
Test: atest DexLoggerIntegrationTests:com.android.server.pm.dex.DexLoggerIntegrationTests#testDexLoggerReconcileGeneratesEvents -- --abi x86
Change-Id: I021c49470d23fd5a3a75d53b8f44f088e167116b
2019-07-16 10:59:39 +01:00
Jeff Vander Stoep
e98dce083c Renderscript: rename .rs extension to .rscript
Reserve .rs extension for Rust.

Bug: 137365032
Test: make checkbuild
Test: cd frameworks/compile/slang/tests
    ./slang_tests.py
Test: atest CtsRenderscriptTestCases
Test: CtsRsCppTestCases

Change-Id: Ic49fc7f5265d49cd4f8efd6a2b6a60b77bbd40dc
2019-07-15 09:17:18 -07:00
Kweku Adams
6acbca3a9a Rename ProtoInputStream.isNextField to nextField.
ProtoInputStream.isNextField() skips over the current field to read the
next tag. This side effect means that calling isNextField prevents the
caller from reading the field it was just on. The "is" prefix makes it
easy to assume that the method has no side effects. Renaming to
nextField(long) with a parameter should help make it clear that the call
is as dangerous as calling nextField().

Fixes: 137294060
Test: atest android.app.usage.UsageStatsTest
Test: atest android.app.usage.cts.UsageStatsTest
Test: atest com.android.server.usage.UsageStatsDatabaseTest
Test: atest ProtoInputStreamTests
Change-Id: Ibfb8ef741f27a211f076dc0b715b64acbfc0696a
2019-07-12 17:10:39 -07:00
Richard Uhler
7c53fa5409 Merge "Disable testEnableRollbackTimeoutFailsRollback test." into qt-dev am: 4dd2a01430
am: ef944458e3

Change-Id: I2717856a921b24f988c8fbe9579ce00966729578
2019-07-11 10:30:46 -07:00
Richard Uhler
f3bf426393 Merge "Disable testEnableRollbackTimeoutFailsRollback test." into qt-dev
am: 4dd2a01430

Change-Id: Ia687f64cf6a26d414d8f106d4093b08ba980d173
2019-07-11 10:21:53 -07:00
Richard Uhler
ef944458e3 Merge "Disable testEnableRollbackTimeoutFailsRollback test." into qt-dev
am: 4dd2a01430

Change-Id: Icedd678266fc505d4545865b3431f5606f8f73ad
2019-07-11 10:21:53 -07:00
Richard Uhler
75f942dfa8 Disable testEnableRollbackTimeoutFailsRollback test.
The test is flaky because it is testing a race condition.

The flakiness is fixed with the help of some new @TestApi in
I01f3e769711ffa51fa714ff4bc81e70887f427ad. Disable the test on those
branches without the fix merged.

Bug: 134373106
Bug: 136605788
Test: atest RollbackTest

Change-Id: I05edfc142c14631b259ae7aaf2dd31af00363a35
Merged-In: I01f3e769711ffa51fa714ff4bc81e70887f427ad
2019-07-11 09:32:43 +01:00
Jeongik Cha
9ec059ac1d Support /system_ext partition
This commit is mainly from I7a6a30bf8e8db9f2738594d187bb9148f138b8da, so
test cases and features are mostly same.

We change product_services partition name to "system_ext" because this
partition's purpose changes.

 - installing a RRO package for framework from /system_ext/overlay
 - installing apps from /system_ext/app
 - installing priv-apps from /system_ext/priv-app
 - installing permissions from
   /system_ext/etc/[default-permissions|permissions|sysconfig]

Bug: 134359158
Test: `mma` under frameworks/base/tests/[libs|privapp]-permissions
      adb sync && adb reboot
      adb shell cmd package list libraries
        => confirmed com.android.test.libs.system_ext library
      adb shell cmd package dump \
        com.android.framework.permission.privapp.tests.system_ext
        => confirmed that the package is a priv-app

Change-Id: Ibbccbba64156a7bc464ffb3785fb8fe69ebb973c
2019-07-09 23:55:37 +09:00
Fedor Kudasov
e202d97a97 Merge changes from topic "fix_master_build" am: 2e5319117a am: 8125047183 am: 95cc083588
am: 10fbf5b18a

Change-Id: Ic58f839b76369b9adcef2a17da289c1b8c2fd0ca
2019-07-09 06:53:38 -07:00
Fedor Kudasov
10fbf5b18a Merge changes from topic "fix_master_build" am: 2e5319117a am: 8125047183
am: 95cc083588

Change-Id: I3f5ec7c9b170e5f168a300a86364559ea88e0c93
2019-07-09 06:42:44 -07:00
Fedor Kudasov
8125047183 Merge changes from topic "fix_master_build"
am: 2e5319117a

Change-Id: If49999e7ce6149e847a678b03ccf8b4549f8365b
2019-07-09 06:10:01 -07:00