Commit Graph

5691 Commits

Author SHA1 Message Date
TreeHugger Robot
f52b0cf908 Merge "Use existing getProcessPid method to get pid of system_server." 2018-10-23 08:14:48 +00:00
Richard Uhler
d64bdbccf4 Use existing getProcessPid method to get pid of system_server.
Rather than using custom logic for it.
Test: atest -v system-memory-test
Bug: 111830582

Change-Id: I94cb856fbedbdf2b653f448857024f7f79f3de6f
2018-10-22 11:48:19 +01:00
Weien Wang
4710c04e1f Add new WallpaperInfo attr settingsSliceUri.
Add settingsSliceUri attribute for supporting live wallpaper inline-
control, public for AOSP live wallpaper to use.

Bug: 117200693
Test: atest tests/Internal/src/android/app/WallpaperInfoTest.java

Change-Id: Iffe9fbd9f49daf8a63d5745f91532de13b7288e3
2018-10-22 14:16:55 +08:00
Junyu Lai
47d413df18 Merge "Add tests for the network blocked status change" am: af0de1a2e9 am: 43d8774f68
am: 9944d7f079

Change-Id: I0e3367d9641717676653bd54ca41d85422c5d81c
2018-10-19 09:54:18 -07:00
Junyu Lai
43d8774f68 Merge "Add tests for the network blocked status change"
am: af0de1a2e9

Change-Id: I0f3f93807d9089239f572c487d791acd7a324a2e
2018-10-19 09:18:38 -07:00
Mike Yu
f9729757f9 Add tests for the network blocked status change
onBlockedStatusChanged is intruduced for network blocked status.
The changes in this patch are:
  - Test onBlockedStatusChanged which tells apps whether the
    network is blocked.
  - Fixed the tests which is affected by the order changed in
    onAvailable.

Test: as follows
    - runtest frameworks-net
    - runtest -x NetworkPolicyManagerServiceTest.java
Bug: 74575553
Change-Id: I383c037ed895ef69c478dc3cff69fb1e27c42845
2018-10-19 19:52:50 +08:00
Mathieu Chartier
196b939a10 Merge "Sleep 1s before force stop and use killBackgroundApp" am: 2417859fa5 am: 96cb6d97e1
am: c3359b60ca

Change-Id: I1697d8fefc5d549438f05f14527b6fee88e97a6c
2018-10-19 00:26:48 -07:00
Mathieu Chartier
96cb6d97e1 Merge "Sleep 1s before force stop and use killBackgroundApp"
am: 2417859fa5

Change-Id: I92d83f16123dd16f68eb0d95d83f9dbabd493d01
2018-10-18 23:52:16 -07:00
Mathieu Chartier
5615adf824 Sleep 1s before force stop and use killBackgroundApp
Leave a bit of time before force stopping the application. This might
help prevent bad numbers.

Call killbackgroundApp after doing force-stop to make sure nothing is
still running.

Bug: 117094510
Bug: 117888316
Test: atest google/perf/app-startup/third-party-apps/cold-dropcache-stable-test
Change-Id: I47792f99b38edf2c40f61cc3f6817d82e6339d12
2018-10-18 22:03:47 +00:00
Sundong Ahn
a1bc1b1331 Merge "Build com.android.media.remotedisplay with java_sdk_library"
am: 1ad4aed0b9

Change-Id: Icb633bd7f8cc0ed932c0aa70ef9dfe475722ada0
2018-10-14 18:48:01 -07:00
Treehugger Robot
1ad4aed0b9 Merge "Build com.android.media.remotedisplay with java_sdk_library" 2018-10-15 01:32:16 +00:00
Neil Fuller
c83ed07391 Merge "Remove explicit dependencies on "core" libraries" am: 18f9a2c24d am: d252f61f66
am: ad3947bb43

Change-Id: I4eec960d3925bd6c30ac91f072883af8fddbd825
2018-10-12 03:36:23 -07:00
Neil Fuller
d252f61f66 Merge "Remove explicit dependencies on "core" libraries"
am: 18f9a2c24d

Change-Id: I326380ec0c10f29c09c64f4044a9c79c9ab2648f
2018-10-12 03:12:22 -07:00
Neil Fuller
066ca17372 Remove explicit dependencies on "core" libraries
The dependencies are unnecessary since bouncycastle, okhttp
and conscrypt are included in the "standard libraries".

Test: build
Bug: 113148576
Change-Id: Ic8d15d911decbdd6391db8c1231b845353586a54
2018-10-11 16:57:18 +01:00
Luke Huang
f33cfcf50d Merge "Refactor tetherGetStats by using stable aidl structure" am: 335253df0f am: f81dce0f79
am: 7ec816b07c

Change-Id: Id3d6e57c10afb06271228b59a40cec91edaed7e4
2018-10-11 00:38:42 -07:00
Luke Huang
f81dce0f79 Merge "Refactor tetherGetStats by using stable aidl structure"
am: 335253df0f

Change-Id: Ibaefeee3e115cc04163f1b07cdba148f9e9ab3b5
2018-10-10 23:10:10 -07:00
Luke Huang
335253df0f Merge "Refactor tetherGetStats by using stable aidl structure" 2018-10-11 05:58:22 +00:00
Colin Cross
62df67ddf7 Remove workarounds for b/79755007 am: f5c86dc1c1
am: 9428a92293

Change-Id: I89276e49bf16da997cc4501067caa946054af3b4
2018-10-10 22:54:33 -07:00
Colin Cross
9428a92293 Remove workarounds for b/79755007
am: f5c86dc1c1

Change-Id: I5bb981fdf807749c88492dfb2c24ea8b936992cf
2018-10-10 16:45:01 -07:00
Colin Cross
bfff7e2fe8 Merge changes from topic "aapt2-manifest-elements"
am: e75f2f504e

Change-Id: I2cf054f942109e539c2439887078a6e182603456
2018-10-10 16:13:26 -07:00
Treehugger Robot
e75f2f504e Merge changes from topic "aapt2-manifest-elements"
* changes:
  Remove workarounds for b/79755007
  AAPT2: Add the rest of supported manifest elements
  AAPT2: Add supported manifest elements
2018-10-10 22:29:57 +00:00
Yan Yan
01b46f8ffd Merge changes I10c01f2b,Ie05bc535 am: 277d42a035 am: 47a589c945
am: 73d9c32aaa

Change-Id: I074056f861332835adaed32ad7d43ed36667ffa3
2018-10-05 12:35:56 -07:00
Yan Yan
47a589c945 Merge changes I10c01f2b,Ie05bc535
am: 277d42a035

Change-Id: I2e55a266f65268ca734c028d4da7add14a281d75
2018-10-05 11:47:12 -07:00
Yan Yan
277d42a035 Merge changes I10c01f2b,Ie05bc535
* changes:
  Check to ensure UDP-encap is used only for IPv4
  Add UDP encapsulation tests for IpSecService.
2018-10-05 17:38:41 +00:00
TreeHugger Robot
8e78d358ba Merge "Convert native processes memory test to JUnit4 test" 2018-10-05 17:15:18 +00:00
evitayan
e4259d3e53 Check to ensure UDP-encap is used only for IPv4
This commit checks if UDP-encapsulation is used
for unsupported address family and throws
IllegalArgumentException when it happens.

Bug: 74213459
Test: Tests added in testCreateTransportModeTransformWithEncap
      and testCreateTunnelModeTransformWithEncap.
      Command: runtest frameworks-net
      Verified on taimen.
Change-Id: I10c01f2bad6aca23430849ea9ef6c1eb157ae131
2018-10-04 11:44:00 -07:00
evitayan
0a7d3e3424 Add UDP encapsulation tests for IpSecService.
This commit adds tests to ensure that IpSecService properly
handles UDP-encapsulation transforms correctly.

Bug: 76110065
Test: Added: testCreateTransportModeTransformWithEncap,
             testCreateTunnelModeTransformWithEncap.
      Command: runtest frameworks-net
      Verified on taimen.
Change-Id: Ie05bc5354266806c2d03b0b3d73a4696a89eccf2
2018-10-04 10:37:47 -07:00
Ng Zhi An
cf6b343b84 Convert native processes memory test to JUnit4 test
Bug: 117128561
Test: atest native-processes-memory-test
Change-Id: I1bf8abf23b5cb315f45ce2446f001a1fa5ef59f1
2018-10-04 10:06:21 -07:00
Luke Huang
13b79e83aa Refactor tetherGetStats by using stable aidl structure
Use stable aidl structure instead of persistbundle

Test: runtest frameworks-net passes
Test: manual testing of tetherGetStats function works

Change-Id: I6835541d450446ba7993ac9f5b783d34229b79cb
2018-10-04 16:24:44 +08:00
Tiger Huang
e91ae63374 Merge "Track focus changes on external displays (2/4)" 2018-10-04 05:58:00 +00:00
Remi NGUYEN VAN
939e83d2ad Merge "Send hostname and MTU options in DHCP ACK/OFFER" am: 3b12359e4c am: 94b0562628
am: 04615b7999

Change-Id: Ibae5f00e85b7f6ff2f62f72f1d5f8bfb3bca9f8e
2018-10-03 19:40:11 -07:00
Remi NGUYEN VAN
94b0562628 Merge "Send hostname and MTU options in DHCP ACK/OFFER"
am: 3b12359e4c

Change-Id: I47972e25fd69471aacd52b58ffed67be1e685557
2018-10-03 19:08:34 -07:00
Remi NGUYEN VAN
3b12359e4c Merge "Send hostname and MTU options in DHCP ACK/OFFER" 2018-10-04 01:08:19 +00:00
Kweku Adams
a23c0f09b5 Merge "Initial unit test for DeviceIdleController." 2018-10-03 23:27:30 +00:00
Kweku Adams
00e3a37e1a Initial unit test for DeviceIdleController.
This just tests the standard progression into deep idle mode. Exit
conditions and light idle flow is not tested yet.

Bug: 116512267
Test: atest com.android.server.DeviceIdleControllerTest
Change-Id: I015c10871cd00d7a6be19c0b13fd4b3926c9fdf0
2018-10-03 14:01:27 -07:00
Tiger Huang
1e5b10a217 Track focus changes on external displays (2/4)
Let each DisplayContent has its own focused window and focused app.
This change also moves the last tapped display to the top.

Test: atest ActivityManagerMultiDisplayTests
            ActivityStackSupervisorTests
            ActivityStackTests
            CtsWindowManagerDeviceTestCases
            DisplayContentTests
            PointerCaptureTest
Bug: 111361570
Change-Id: I776cabaeaf41ff4240f504fb1430d3e40892023d
2018-10-04 01:05:49 +08:00
Neil Fuller
d436f03470 Merge "Remove unnecessary dependency on bouncycastle" am: 32fb670a0a am: cfc508530d
am: d9357e7f47

Change-Id: I6531548e8f6e5210526963f28a534d34cf06e67d
2018-10-03 07:22:45 -07:00
Neil Fuller
cfc508530d Merge "Remove unnecessary dependency on bouncycastle"
am: 32fb670a0a

Change-Id: I6289757af66978259b49d4b0b648e049a96b25a7
2018-10-03 06:58:20 -07:00
Neil Fuller
32fb670a0a Merge "Remove unnecessary dependency on bouncycastle" 2018-10-03 13:36:02 +00:00
Jayant Chowdhary
d72ccfff3d Merge "Add libbinderthreadstate to LOCAL_JNI_SHARED_LIBS for some tests" am: 604b0eed1f am: a0484ac42f
am: 0c4fad5e92

Change-Id: I77c35778a14ac8671a87a7a0d2bd2ce77409a363
2018-10-02 15:29:49 -07:00
Jayant Chowdhary
a0484ac42f Merge "Add libbinderthreadstate to LOCAL_JNI_SHARED_LIBS for some tests"
am: 604b0eed1f

Change-Id: I82c3e108ed4d284840358e7f82aaac3a8404453c
2018-10-02 14:01:01 -07:00
Neil Fuller
35297c49f6 Remove unnecessary dependency on bouncycastle
Nothing in this target requires bouncycastle.
Bug: 113148576
Test: build

Change-Id: I6128fca1eca1c6cefe679721a4cf72729d27d6bb
2018-10-02 21:32:36 +01:00
Jayant Chowdhary
604b0eed1f Merge "Add libbinderthreadstate to LOCAL_JNI_SHARED_LIBS for some tests" 2018-10-02 20:14:37 +00:00
Leif Hendrik Wilden
d538e6b8fb Merge "Allow wifi and ethenet connected at same time." am: 54d34fe8a7 am: 1bceeaac85
am: bf1f2c455e

Change-Id: I36b924ac20ebe58dc2a522509b83a341994ff480
2018-10-02 11:25:36 -07:00
Leif Hendrik Wilden
1bceeaac85 Merge "Allow wifi and ethenet connected at same time."
am: 54d34fe8a7

Change-Id: I7c1d6fdcb7c7ed26e765f52373e20d19b6db7bfc
2018-10-02 10:57:11 -07:00
Treehugger Robot
54d34fe8a7 Merge "Allow wifi and ethenet connected at same time." 2018-10-02 17:09:16 +00:00
TreeHugger Robot
3d82416e02 Merge changes from topic "am_launch_times"
* changes:
  AM: Update WaitResult parsing logic in AppLaunch
  AM: Use ActivityMetricsLogger to get app launch times
2018-10-02 15:30:52 +00:00
Sundong Ahn
881a9872e7 Build com.android.media.remotedisplay with java_sdk_library
com.android.media.remotedisplay is built with java_sdk_library and api
files are added by running "make update-api".
The com.android.media.remotedisplay.xml is removed since it will be made
auto generation by soong when the library is built with java_sdk_library.

Bug:77577799
Test: make -j
Test: make checkapi
Test: adb shell cmd package list libraries |\
      grep com.android.media.remotedisplay
      And check the com.android.media.remotedisplay library

Merged-In: I40e2d5456877a434f7c1ae70b6ec3692db106537
Change-Id: I40e2d5456877a434f7c1ae70b6ec3692db106537
(cherry picked from commit 6e038837be)
2018-10-02 13:35:49 +09:00
TreeHugger Robot
e84ba87a62 Merge "Build com.android.media.remotedisplay with java_sdk_library" 2018-10-02 04:23:16 +00:00
Jayant Chowdhary
14aeab6f19 Add libbinderthreadstate to LOCAL_JNI_SHARED_LIBS for some tests
libbinder and libhwbinder now also depend on libbinderthreadstate. Add
this dependency to LOCAL_JNI_SHARED_LIBS since these libraries need to
be packaged together.

Bug: 110364143

Test: atest FrameworksNetTests
Test: atest FrameworksServiceTests (no new failures)
Test: atest FrameworksUiServiceTests

Change-Id: Ibc63f041b8ee23cc4d0e9d82a508a128104e6025
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2018-10-01 15:18:18 -07:00