Commit Graph

476921 Commits

Author SHA1 Message Date
Tracy Zhou
a7e8fd2382 Merge "Update icon shapes for Sam and Victor" into rvc-d1-dev 2020-04-11 22:27:53 +00:00
Andrii Kulian
248a3e7c98 Merge "7/n Use display area instead of display id in ATM methods" into rvc-dev am: bba1891e80
Change-Id: If637e54a5bb73571f5fa71f1de71e278eaed57b3
2020-04-11 16:50:04 +00:00
Andrii Kulian
bba1891e80 Merge "7/n Use display area instead of display id in ATM methods" into rvc-dev 2020-04-11 16:33:24 +00:00
TreeHugger Robot
6744129a1e Merge "Set transport types to resolver" into rvc-dev am: 01cc8a3372
Change-Id: I0ee02778a7e2a5bf54ec73edf34fe1a4d98c6ebe
2020-04-11 14:41:01 +00:00
TreeHugger Robot
01cc8a3372 Merge "Set transport types to resolver" into rvc-dev 2020-04-11 14:25:27 +00:00
TreeHugger Robot
c86d1ee468 Merge "Fix typo in stack traversal" into rvc-dev am: 18b8b2d75e
Change-Id: Ib4ef92ee466d367e48d62aca2a37cb9e0cd29dc6
2020-04-11 07:06:12 +00:00
TreeHugger Robot
18b8b2d75e Merge "Fix typo in stack traversal" into rvc-dev 2020-04-11 06:55:29 +00:00
chenbruce
5d95562622 Set transport types to resolver
For a given network, resolver doesn't know what transport types are.
Therefore, when a new network is created or transport types are changed
in a give network, transport types will be updated and sent by calling
setResolverConfiguration(). In the same time, if link properties or
transport types are null, setResolverConfiguration() won't be called.
The original behaviors of setResolverConfiguration() aren't changed.
Only increasing one new behavior that when a given network has transport
type change, calling setResolverConfiguration() directly and resolver
updates the transport types for that given network.

Bug: 143732914
Test: atest FrameworksNetTests
      atest FrameworksNetIntegrationTests
Change-Id: I6527cde0e177ba08c886576131b35fc769c2bb53
2020-04-11 14:39:59 +08:00
TreeHugger Robot
fab090f359 Merge "WifiConfiguration: Add a method to check if keymgmt needs preShareKey" into rvc-dev am: 507bbaeb9b
Change-Id: I2b04d1e0599cbddca39c6e6704d7d4103ddcd52c
2020-04-11 06:17:13 +00:00
TreeHugger Robot
507bbaeb9b Merge "WifiConfiguration: Add a method to check if keymgmt needs preShareKey" into rvc-dev 2020-04-11 05:55:19 +00:00
Chalard Jean
67cdd0d1a1 Merge "Fix a theoretical NPE" into rvc-dev am: ce6aa16b80
Change-Id: I82c5df71163bfe14a5d0eb6b8fb3628cb67defb6
2020-04-11 05:16:38 +00:00
Daniel Bright
6934c5ad1f Merge "Add CarrierConfig key to customize apn priority" into rvc-dev am: 2a639e9786
Change-Id: Ibb4c34e8452df5705dbd884956d80813a5de8ae8
2020-04-11 05:15:51 +00:00
Chalard Jean
ce6aa16b80 Merge "Fix a theoretical NPE" into rvc-dev 2020-04-11 05:06:32 +00:00
Daniel Bright
2a639e9786 Merge "Add CarrierConfig key to customize apn priority" into rvc-dev 2020-04-11 04:56:25 +00:00
Roshan Pius
71709e04c9 WifiConfiguration: Add a method to check if keymgmt needs preShareKey
Bug: 153435438
Test: atest android.net.wifi
Change-Id: If67d853000d99f32204bf0b8b95465909e8740e2
2020-04-11 04:38:59 +00:00
Tej Singh
aa492edbdc Merge "Statsd test mapping" into rvc-dev am: e715d2f0e7
Change-Id: I6f02eaad93603ad9ab8c375985c70e5bb584f0b9
2020-04-11 04:07:20 +00:00
Tej Singh
e715d2f0e7 Merge "Statsd test mapping" into rvc-dev 2020-04-11 03:49:17 +00:00
Treehugger Robot
67ac7abd21 Fix a theoretical NPE
Test: NetworkAgentTests
Bug: 153718627

Change-Id: I955b6dac6de48b12696dc640f131f5983ac552df
Merged-In: I08f57cce0cd85d5cd66e9a0ef948224290e9200e
(cherry picked from commit 31492c7087, aosp/1284575)
2020-04-11 03:26:27 +00:00
TreeHugger Robot
ec138e6171 Merge "Camera: Fix condition check for min/max zoom ratios" into rvc-dev am: 72a3d44773
Change-Id: I515e2e7580b950f4f6880a4ca67749f9f149671c
2020-04-11 02:38:43 +00:00
TreeHugger Robot
72a3d44773 Merge "Camera: Fix condition check for min/max zoom ratios" into rvc-dev 2020-04-11 02:19:12 +00:00
Yurii Zubrytskyi
06e1a29053 Merge changes I668e8664,Ia44f7e45 into rvc-dev am: 207f1d3036
Change-Id: Id2d15af5958a8da7528484e1b949e334a13d6463
2020-04-11 01:41:52 +00:00
TreeHugger Robot
c85ff58f6f Merge "LiveData#getValue can return null" into rvc-dev am: 2f601f4dbe
Change-Id: I5db6a7e41c148e8e456508cd39311b2bbd59f370
2020-04-11 01:40:54 +00:00
Andrii Kulian
1cb59dd027 7/n Use display area instead of display id in ATM methods
Bug: 152116619
Test: WM CTS and unit tests
Change-Id: I2267fdb7fc0e6e87ab8c3e9794de37947f2a70e7
2020-04-10 18:25:21 -07:00
Yurii Zubrytskyi
207f1d3036 Merge changes I668e8664,Ia44f7e45 into rvc-dev
* changes:
  [incfs] Fix a crash in worker thread calling JNI
  [incfs] Make native library extraction async
2020-04-11 01:24:45 +00:00
TreeHugger Robot
2f601f4dbe Merge "LiveData#getValue can return null" into rvc-dev 2020-04-11 01:19:37 +00:00
Tracy Zhou
3c222e57fe Update icon shapes for Sam and Victor
And rename them to Vessel and Tapered Rect

Fixes: 153277903
Test: Manual
Change-Id: I63ffffce5162ba7ad59c1beb7a89e924b40e4454
2020-04-11 01:11:16 +00:00
Youngjun Kwak
2bae5949e0 Merge "Implement AAOS-specific KeyguardViewController and decouple keyguard from statusbar." into rvc-dev am: 0abf11e202
Change-Id: Ib4c6ac8f5c4580d89adedfc6ba2b3199633994d9
2020-04-11 00:59:06 +00:00
Youngjun Kwak
0abf11e202 Merge "Implement AAOS-specific KeyguardViewController and decouple keyguard from statusbar." into rvc-dev 2020-04-11 00:42:04 +00:00
John Li
24f5c7fa62 Merge "Change field type for reverse" into rvc-d1-dev 2020-04-11 00:17:42 +00:00
Sarah Chin
e55e774557 Merge "Add carrier configs for NR SA unmetered" into rvc-dev am: 31354ac59f
Change-Id: I72991d34121f24b2dc82119bdb2d63b9defe23c0
2020-04-11 00:08:12 +00:00
Daniel Bright
14ad84249a Add CarrierConfig key to customize apn priority
Test: atest on com.android.internal.telephony.dataconnection
Test: Make phone call
Test: Send text message
Test: Hit websites on chrome
Test: Override pririties using carrier config using broadcast
Bug: 152324921
Change-Id: Ib2139a93768999c2a867e40fea8d86c0ce730130
Merged-In: I259071334c135709fc98c989a9b7c8c35f449578
2020-04-10 23:53:21 +00:00
Sarah Chin
31354ac59f Merge "Add carrier configs for NR SA unmetered" into rvc-dev 2020-04-10 23:38:37 +00:00
TreeHugger Robot
7a6812427f Merge "Make internal printing tests compatible with helpers" into rvc-dev am: 5b3e4d946f
Change-Id: I1cb7bae303ec56d2d281b7a7f4de9bc0a4ece2d3
2020-04-10 23:28:26 +00:00
TreeHugger Robot
9545300324 Merge "Deprecates the animatingBounds from WM to SysUI" into rvc-dev am: c3721ac874
Change-Id: I5c1bc9681c2cec5add3bd3362fa88165e488dfba
2020-04-10 23:27:44 +00:00
TreeHugger Robot
b7f5e2c131 Merge "Fix preventable NPE & probable others" into rvc-dev am: f622ff9add
Change-Id: I6b778f1cfb1541504a454569a602c80075ec5eae
2020-04-10 23:27:05 +00:00
TreeHugger Robot
5b3e4d946f Merge "Make internal printing tests compatible with helpers" into rvc-dev 2020-04-10 23:15:19 +00:00
TreeHugger Robot
c3721ac874 Merge "Deprecates the animatingBounds from WM to SysUI" into rvc-dev 2020-04-10 23:13:52 +00:00
TreeHugger Robot
f622ff9add Merge "Fix preventable NPE & probable others" into rvc-dev 2020-04-10 23:03:15 +00:00
TreeHugger Robot
f7a38c515c Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-04-10 23:01:32 +00:00
Andrii Kulian
5bb053bfe7 Fix typo in stack traversal
Bug: 152116619
Test: RootActivityContainerTests#testRemovingStackOnAppCrash_multipleDisplayAreas
Change-Id: I1672bc0c712c2bfd3f2f87139414da612a039226
2020-04-10 16:01:07 -07:00
TreeHugger Robot
9b9ec3b771 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-04-10 22:57:02 +00:00
Robert Snoeberger
0cf2bc2f53 LiveData#getValue can return null
The documentation recommends not calling this method on a background
thread. The problem is that it returns null until the value is set, and
setting the value requires waiting for the set-task to run on the main
thread.

Fixes: 153697933
Test: seek bar is still working
Change-Id: Idbb02e1c9baafd1676f67c1a5408107ed84c41d2
2020-04-10 18:51:36 -04:00
kwaky
4ed2e207c5 Implement AAOS-specific KeyguardViewController and decouple keyguard from statusbar.
Bug: 150162295
Bug: 150164054
Test: Manual. Unit Tests Pending.
Change-Id: I66586e15d114eb6da55254f778511bde4fce3154
2020-04-10 15:22:51 -07:00
Joshua Duong
974d69fcb5 Merge "Hide notification shade when WifiDebuggingActivity is shown." into rvc-dev am: 4d7fb0b4c2
Change-Id: Id3726d6426ecaa6a15c63522bc285b0dbab46736
2020-04-10 22:10:39 +00:00
Robert Snoeberger
9f7fccce18 Merge "Get media devices for each media application" into rvc-dev am: a86df87eaa
Change-Id: I7d92028310164abb23a1b81522f42e90cc7f7105
2020-04-10 22:09:46 +00:00
Joshua Duong
4d7fb0b4c2 Merge "Hide notification shade when WifiDebuggingActivity is shown." into rvc-dev 2020-04-10 21:59:01 +00:00
Robert Snoeberger
a86df87eaa Merge "Get media devices for each media application" into rvc-dev 2020-04-10 21:46:23 +00:00
Fabian Kozynski
7b4a6a8e4d Merge "Add controls rearrange activity" into rvc-dev am: 0935694b5a
Change-Id: I39eee0dded5729f5c4f834efea51dbed8f758bdb
2020-04-10 21:14:44 +00:00
TreeHugger Robot
bc51f78cb8 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-04-10 21:08:50 +00:00
Fabian Kozynski
0935694b5a Merge "Add controls rearrange activity" into rvc-dev 2020-04-10 21:02:01 +00:00