Chris Ye
4527135d00
Merge "Add cpp native headers for IPowerManager.aidl parcelables."
2020-04-06 19:35:27 +00:00
Nikita Dubrovsky
ce3894baa4
Merge "Minor javadoc fixes for RichContentReceiver API"
2020-04-06 17:47:59 +00:00
Jorim Jaggi
387991e2aa
Merge "Revert "Revert "Defer updating InsetsSource.mFrame while animating""" into rvc-dev am: a775f45d85 am: 911ce402a4 am: 67658867a1 am: 46756d0fa2
...
Change-Id: Ida5cd0ca35bed637a2bc3e5cacc20168efa1d990
2020-04-06 15:48:46 +00:00
Jorim Jaggi
67658867a1
Merge "Revert "Revert "Defer updating InsetsSource.mFrame while animating""" into rvc-dev am: a775f45d85 am: 911ce402a4
...
Change-Id: I0b775c6756215c19cfcdd3dc587cb967ba4a36c2
2020-04-06 14:58:10 +00:00
Jorim Jaggi
a775f45d85
Merge "Revert "Revert "Defer updating InsetsSource.mFrame while animating""" into rvc-dev
2020-04-06 14:27:16 +00:00
Abhijeet Kaur
34dd66d8db
Merge "Remove a TODO as no work needs to be done" into rvc-dev am: a32954ec22 am: ca6a0f9999 am: 6b39d37d39 am: 3c4a4a4bb3 am: 4d0f93b743
...
Change-Id: Ifd7eacd036405016177569d0c0eb11083ad4775e
2020-04-06 14:17:03 +00:00
Abhijeet Kaur
4d0f93b743
Merge "Remove a TODO as no work needs to be done" into rvc-dev am: a32954ec22 am: ca6a0f9999 am: 6b39d37d39 am: 3c4a4a4bb3
...
Change-Id: I6e2f8ba45c602422d04279b63f6e8536d26e34ff
2020-04-06 13:56:10 +00:00
Abhijeet Kaur
58cdf17ce4
Merge "Remove a TODO as no work needs to be done" into rvc-dev am: a32954ec22 am: ca6a0f9999
...
Change-Id: Ie940d829e61cef732d43ff319e3e7aab43dda901
2020-04-06 13:14:33 +00:00
Abhijeet Kaur
a32954ec22
Merge "Remove a TODO as no work needs to be done" into rvc-dev
2020-04-06 12:36:11 +00:00
Jorim Jaggi
33a2183d4b
Revert "Revert "Defer updating InsetsSource.mFrame while animating""
...
This reverts commit 8c56ac6b94 .
Underlying issue has been fixed:
Test: InsetsControllerTest
Bug: 152071027
Change-Id: I2b80de7067bf688a6b36233b9a1e92e2cf31c148
2020-04-06 14:28:59 +02:00
Chalard Jean
ee171cad08
Fix a bug where the legacy extra info is reset on connect.
...
Bug: 149459996
Test: NetworkAgentTest FrameworksNetTests FrameworksWifiTests FrameworksTelephonyTests
Change-Id: I3e437f0fe2eb28f1d621551a8daf164a06af83fc
Merged-In: I3e437f0fe2eb28f1d621551a8daf164a06af83fc
(cherry picked from commit a3fdb94a32 , originally aosp/1277602)
2020-04-06 11:14:59 +00:00
Jacky Kao
f69bb02f26
Merge "Supporting multi-display for takeScreenshot()" into rvc-dev am: aa8f5cb671 am: ba452787c7 am: 8baf0cebbe am: f08a1a7d2f
...
Change-Id: I6be761c26c509a7c7cef216d097ac6f6756b772c
2020-04-06 09:58:00 +00:00
Abhijeet Kaur
fd83d9dbb7
Remove a TODO as no work needs to be done
...
Bug: 150672994
Test: builds
Change-Id: I90fcbfb8d52e6883c12c7a76765767eaed370afe
2020-04-06 10:34:28 +01:00
Jacky Kao
45d6353363
Merge "Supporting multi-display for takeScreenshot()" into rvc-dev am: aa8f5cb671
...
Change-Id: I03c220f6be59a041015f9959bb7905e7e328bf20
2020-04-06 09:12:22 +00:00
Jacky Kao
aa8f5cb671
Merge "Supporting multi-display for takeScreenshot()" into rvc-dev
2020-04-06 09:03:42 +00:00
Tony Huang
3b3d8ea61d
Merge "Fix split divider janky" into rvc-dev am: a171ec4203 am: e6abf0b719 am: c030cdafad am: d1db0d4023
...
Change-Id: Ie2fedd5893590745c62d85819693f71a38c46f27
2020-04-06 08:52:20 +00:00
Tony Huang
c030cdafad
Merge "Fix split divider janky" into rvc-dev am: a171ec4203 am: e6abf0b719
...
Change-Id: I6554e2844d2ecc21544a4ec601b4d7c8f974719c
2020-04-06 08:33:07 +00:00
TreeHugger Robot
f7e0d7da15
Merge "Update documentation of Resources#getDisplayMetrics" into rvc-dev am: 001fddc078 am: 4e59fde49e am: 5126e8c32d am: c5f5a88b0f
...
Change-Id: Ic0654dbe23f754ac71ea6e574671944b625c71bb
2020-04-06 07:55:52 +00:00
Tony Huang
17ebe76f7a
Merge "Fix split divider janky" into rvc-dev am: a171ec4203
...
Change-Id: I195d4d1df29f9628b8c39e9ee6da78c2fe60574d
2020-04-06 07:44:11 +00:00
TreeHugger Robot
5126e8c32d
Merge "Update documentation of Resources#getDisplayMetrics" into rvc-dev am: 001fddc078 am: 4e59fde49e
...
Change-Id: I72ab296906b30219d535fb64da8db09432ca3bf3
2020-04-06 07:26:47 +00:00
Chalard Jean
a3fdb94a32
Merge "Fix a bug where the legacy extra info is reset on connect." am: 67370a01cb am: a5f7fcacbe am: a072ef0c4b am: 4399bad610 am: 133019953e
...
Change-Id: I3e437f0fe2eb28f1d621551a8daf164a06af83fc
2020-04-06 07:25:10 +00:00
Tony Huang
a171ec4203
Merge "Fix split divider janky" into rvc-dev
2020-04-06 07:24:15 +00:00
TreeHugger Robot
1eac95259a
Merge "Update documentation of Resources#getDisplayMetrics" into rvc-dev am: 001fddc078
...
Change-Id: I4f2d9cc0d3cfc466922cf1f27ef24cea0d1c789e
2020-04-06 07:06:16 +00:00
TreeHugger Robot
001fddc078
Merge "Update documentation of Resources#getDisplayMetrics" into rvc-dev
2020-04-06 07:01:35 +00:00
Chalard Jean
a072ef0c4b
Merge "Fix a bug where the legacy extra info is reset on connect." am: 67370a01cb am: a5f7fcacbe
...
Change-Id: I127bf621caa39a24265f30cd4c781248410e5348
2020-04-06 06:34:09 +00:00
Chalard Jean
a5f7fcacbe
Merge "Fix a bug where the legacy extra info is reset on connect." am: 67370a01cb
...
Change-Id: Ia0a2afe359cac6adfd33d2f839eddb8bd14b5f43
2020-04-06 06:17:46 +00:00
Chalard Jean
67370a01cb
Merge "Fix a bug where the legacy extra info is reset on connect."
2020-04-06 06:04:46 +00:00
Junyu Lai
ae9a901cbb
Merge changes from topic "am-5ce58db354ac494a84904378ca35c013-rvc-dev" into rvc-dev
...
* changes:
[SP26] add CTS for NetworkStats
[SP26.2] add a method in NetworkStats that removes empty entries
2020-04-06 04:15:39 +00:00
Chalard Jean
90ef10894c
Fix a bug where the legacy extra info is reset on connect.
...
Bug: 149459996
Test: NetworkAgentTest FrameworksNetTests FrameworksWifiTests FrameworksTelephonyTests
Change-Id: I5f8f6d962ee3317e101d19518c767b3c327c0c47
2020-04-06 12:46:19 +09:00
Joanne Chung
f71cd48bcb
Merge "Made ExplicitHealthCheckService testable." into rvc-dev am: 62cd75f90d am: 6828c3e551 am: 7b237cdbd5 am: 1743021a41
...
Change-Id: I787b372ff1898f7d15bb26f71c1bdb9679b01583
2020-04-06 03:21:04 +00:00
Joanne Chung
6828c3e551
Merge "Made ExplicitHealthCheckService testable." into rvc-dev am: 62cd75f90d
...
Change-Id: I9a7fe8c35d760302355e57a0d52af1c89e2ecd8b
2020-04-06 02:42:03 +00:00
Joanne Chung
62cd75f90d
Merge "Made ExplicitHealthCheckService testable." into rvc-dev
2020-04-06 02:33:24 +00:00
junyulai
dba7d0ae89
[SP26.2] add a method in NetworkStats that removes empty entries
...
In current design, entries with zeros are preserved after
addition/subtraction. These entries are not very useful
and lead to difficulty of verifying the result of
addition/subtraction.
However, change the behavior in the original NetworkStats
is considered risky in current stage.
Thus, this change provide a function that could remove these
empty entries in tests.
Test: atest FrameworksNetTests
Bug: 152827872
Bug: 150644692
Change-Id: I40a76935d55712b8083ee1e17e137a8a4ef5e029
Merged-In: I40a76935d55712b8083ee1e17e137a8a4ef5e029
(cherry picked from commit 6c7bef3064 )
2020-04-06 02:18:50 +00:00
TreeHugger Robot
13bbf2e6e5
Merge "Pipe through attributionTag for package installation"
2020-04-05 01:50:40 +00:00
Winson Chung
6909c0fe4f
Merge "Keep task hidden until task appeared" into rvc-dev am: 17849976da am: 3934bf1c6a am: 67b1c2e4d2 am: 5b44740fc6
...
Change-Id: Ie4930845ee5f6b9cc4d4670d43b01916e74ae932
2020-04-04 19:10:13 +00:00
Winson Chung
67b1c2e4d2
Merge "Keep task hidden until task appeared" into rvc-dev am: 17849976da am: 3934bf1c6a
...
Change-Id: I27310b6730a848f4b79689b4a0d42013f654c7cb
2020-04-04 18:43:48 +00:00
Winson Chung
69c5790189
Merge "Keep task hidden until task appeared" into rvc-dev am: 17849976da
...
Change-Id: I524d283e532e7938a149f0cbbcecf54d1e0d4ac4
2020-04-04 18:26:18 +00:00
Winson Chung
17849976da
Merge "Keep task hidden until task appeared" into rvc-dev
2020-04-04 18:06:04 +00:00
Raff Tsai
a5cd600f86
Merge "Add name space settings_stats" into rvc-dev am: 6944511300 am: efe044ca65 am: 9f5e5de863 am: 5a4880156c
...
Change-Id: I1c510f2148e6e6d5588488cb11267537e431584f
2020-04-04 04:35:35 +00:00
Raff Tsai
9f5e5de863
Merge "Add name space settings_stats" into rvc-dev am: 6944511300 am: efe044ca65
...
Change-Id: Ie3c73b6a26a00285a63dd36bd477c4c9a5c2a3b1
2020-04-04 04:09:03 +00:00
Raff Tsai
229be6c1d5
Merge "Add name space settings_stats" into rvc-dev am: 6944511300
...
Change-Id: I90d2de1f341204bba2b9ecced9b55407a0ae8bdd
2020-04-04 03:47:23 +00:00
TreeHugger Robot
43bc020fc0
Merge "Only apply VPN isolation if it's fully routed" into rvc-dev
2020-04-04 03:44:46 +00:00
Raff Tsai
6944511300
Merge "Add name space settings_stats" into rvc-dev
2020-04-04 03:18:04 +00:00
Winson Chung
cbd8793a44
Keep task hidden until task appeared
...
- If the task is previously not visible or has no visible children at
the point when we start controlling it in the task org, hide the task
until we send taskAppeared to ensure that the task org can reparent
and show it otherwise we could see a flash of the task.
This happens mainly from two cases:
- when starting a new task with a given win mode, we show it and wait
for first draw before notifying the task org
- when transitioning into pip from swipe up, the activity is hidden
and when it requests to enter pip is made visible again
Since we are hiding the task w/ the pending transaction, we also need
to defer all task org callbacks until that's applied to ensure proper
lifecycle of the calls.
- Also skip app transitions for task org tasks for now
Bug: 152809695
Bug: 152134460
Test: Open a bubble, ensure that we don't see the task in fullscreen
first. Enter pip, ensure that we don't see flash of the task
before SysUI can fade it in.
Test: atest PipAnimationControllerTest
Test: atest TaskOrganizerTests
Test: atest SplitScreenTests
Change-Id: If51e98cd007faef35e99acd31b27b20eebbea010
2020-04-03 19:59:05 -07:00
Nikita Dubrovsky
186b4eba0a
Minor javadoc fixes for RichContentReceiver API
...
Bug: 152068298
Test: Presubmit
Change-Id: If86fa3d68ae2af616f234a3fe283f333c29888cd
2020-04-03 17:57:19 -07:00
Philip P. Moltmann
c3278660cb
Pipe through attributionTag for package installation
...
Test: atest CtsAppOpsTestCases
Bug: 136595429
Change-Id: Ifda7464911faf505cd5287dbf48859e17452d3e5
2020-04-03 17:38:36 -07:00
Mehdi Alizadeh
99ce1fd0ec
Merge "Wrap ShortcutQuery in a parcelable wrapper object and pass it direcly through aidl." into rvc-dev am: 6991da300f am: 0f53058f4b
...
Change-Id: Ie74f647e2a3311ff8e196a4d947d6380f27b7101
2020-04-04 00:28:34 +00:00
Mehdi Alizadeh
08dec8342e
Merge "Wrap ShortcutQuery in a parcelable wrapper object and pass it direcly through aidl." into rvc-dev am: 6991da300f
...
Change-Id: Idfdd455924f78e1802afee6132a3230ce5b8c781
2020-04-04 00:27:41 +00:00
Mehdi Alizadeh
6991da300f
Merge "Wrap ShortcutQuery in a parcelable wrapper object and pass it direcly through aidl." into rvc-dev
2020-04-04 00:23:47 +00:00
TreeHugger Robot
9fc430801a
Merge "Disable the freezer while we're collecting binder interface descriptors." into rvc-dev am: 2c1f53ad6f am: 92d390f966 am: 813257db3a am: a5bba19ce3
...
Change-Id: I9179b233f74792e7080ef5c96e095f96c4fbd6c4
2020-04-03 23:19:40 +00:00