Commit Graph

480302 Commits

Author SHA1 Message Date
TreeHugger Robot
247c43acdb Merge "CEC: Filter certain message arguments from logging" into rvc-dev am: 3002b11fb6
Change-Id: Iae4200cc4254c094da2d47a7ac560b006b6d50cb
2020-04-14 09:01:58 +00:00
TreeHugger Robot
3002b11fb6 Merge "CEC: Filter certain message arguments from logging" into rvc-dev 2020-04-14 08:41:57 +00:00
Hongwei Wang
87adc05eb4 Merge "Update destination bounds if rotation finishes first" into rvc-dev am: a2807f2859
Change-Id: I661984e4a6ed39493c890d8c3566d490b0090f0f
2020-04-14 07:33:28 +00:00
Joanne Chung
9163d7e6e7 Merge "Pass augmented client state to the event history." into rvc-dev am: ba52b860f7
Change-Id: I6c5f22d5c267ac2781b52133911f24a95745688d
2020-04-14 07:32:40 +00:00
Hongwei Wang
a2807f2859 Merge "Update destination bounds if rotation finishes first" into rvc-dev 2020-04-14 07:27:30 +00:00
Joanne Chung
ba52b860f7 Merge "Pass augmented client state to the event history." into rvc-dev 2020-04-14 07:16:02 +00:00
Hyundo Moon
cbfce7019a Merge changes Ibf61ba52,Ief4b7f4b into rvc-dev am: e6bd8505be
Change-Id: I6696f8726e5572d3dcf4ad24fe452a60d7604958
2020-04-14 06:47:50 +00:00
TreeHugger Robot
aa2e331b72 Merge "Add Multi Audio focus" into rvc-dev am: 35f960dff4
Change-Id: I97bda7a1f752557217d3b597a55342b29c63990a
2020-04-14 06:47:23 +00:00
TreeHugger Robot
87246bae8e Merge "Return empty array when BluetoothAdapter is null" into rvc-dev am: 635c9bcb04
Change-Id: If91e39ca35e962c8fdce416f880b0a267b3cb934
2020-04-14 06:46:59 +00:00
Louis Chang
bf6e5986ba Merge "Compute visibilities when finishing show-when-lock activity" into rvc-dev am: 8758ee4176
Change-Id: Ifc66a587d9ad8ced598e616a668c3fc781bbdbe2
2020-04-14 06:46:00 +00:00
Hyundo Moon
e6bd8505be Merge changes Ibf61ba52,Ief4b7f4b into rvc-dev
* changes:
  Allow MediaRouter2Manager releasing the session created w/o request
  Do not check router's permission on requests from MediaRouter2Manager
2020-04-14 06:41:26 +00:00
TreeHugger Robot
35f960dff4 Merge "Add Multi Audio focus" into rvc-dev 2020-04-14 06:29:16 +00:00
TreeHugger Robot
635c9bcb04 Merge "Return empty array when BluetoothAdapter is null" into rvc-dev 2020-04-14 06:26:34 +00:00
Louis Chang
8758ee4176 Merge "Compute visibilities when finishing show-when-lock activity" into rvc-dev 2020-04-14 06:22:30 +00:00
Chalard Jean
30f7464555 [automerger skipped] Merge "Add instrumentation to test NetworkAgent." into rvc-dev am: b0bf3e94fa -s ours
am skip reason: Change-Id Ia83b1c896df63bb18e2aa4b74d6cc09eba990eb5 with SHA-1 eea3b016ce is in history

Change-Id: I92c0c3da037eabed28f78c09ffad80074602dd5f
2020-04-14 05:13:38 +00:00
Chalard Jean
b0bf3e94fa Merge "Add instrumentation to test NetworkAgent." into rvc-dev 2020-04-14 04:54:33 +00:00
Hongwei Wang
e0412d1fdb Update destination bounds if rotation finishes first
When the entering pip transition is on-going and rotation finishes
first, simply schedule a resize on the PiP window

Bug: 153827966
Test: repeatedly enter/exit PiP with Play Movies
Change-Id: Ie9bf7fbc44970d4fe03b7febde5d69c7348e5bb9
2020-04-13 21:54:06 -07:00
Jacky Kao
54925c12d6 Merge "Fix more windows at framework on system gesture mode" into rvc-dev am: 705ebb0946
Change-Id: Ieb80cc373337472ea8b77d3c0eb46a21ac188d5a
2020-04-14 03:58:24 +00:00
hughchen
be5140048a Return empty array when BluetoothAdapter is null
BluetoothAdapter will be null in some platform device, because they
don't have bluetooth feature. This CL add null check to avoid null
point exception on non-bluetooth feature platform device.

Bug: 152647633
Test: make -j42 RunSettingsLibRoboTests
Change-Id: Iba7f41796bd22163ab55a7f9ff4f44df6513754e
2020-04-14 11:50:55 +08:00
Jacky Kao
705ebb0946 Merge "Fix more windows at framework on system gesture mode" into rvc-dev 2020-04-14 03:38:43 +00:00
Louis Chang
3d718c30c6 Compute visibilities when finishing show-when-lock activity
The activity visibilities was not updated in KeyguardController
while a show-when-locked activity was finished. Therefore, the
general activity below was resumed for a short time and flickering
the screen with transition animation.

Bug: 149837574
Test: start emergency dialer and exit
Test: atest ActivityRecordTests
Change-Id: I7cea9d3e00a856c392728c7a8c825d4633b73f55
2020-04-14 11:33:53 +08:00
Calvin Pan
41ba392984 [automerger skipped] Merge changes from topic "DEFAULT_PREFERRED_NETWORK_MODE" am: f2da40ad07 am: c40cb4c0d8 -s ours
am skip reason: Change-Id Ifd7b17cc2445c9cbe4c6ba688838a1b07eb13599 with SHA-1 8c3919f906 is in history

Change-Id: I5a0e7874ff2e5ed08a8aef94718839aa831fcef8
2020-04-14 02:53:56 +00:00
Jayachandran C
e0539726dd [automerger skipped] Add new system API constant DEFAULT_PREFERRED_NETWORK_MODE am: 9160670b18 am: 719a0a2ba8 -s ours
am skip reason: Change-Id Ia114e4546d88e294ed37b6632a1eae6a06fbf7bc with SHA-1 f0a973b564 is in history

Change-Id: Ic61ee04d3147a8a00cf15ead02565d7914d464db
2020-04-14 02:53:48 +00:00
Jayachandran C
f2f6a6b65e [automerger skipped] Remove usage of Telephonymanager getDefault() hidden API am: 70e03d953d am: f05d95638f -s ours
am skip reason: Change-Id Ifb7b53af787b86b1d6c2f91a96a330bde57271d7 with SHA-1 917199a316 is in history

Change-Id: I49bf0963376844bab066c2003177db29e1147263
2020-04-14 02:53:36 +00:00
Inseob Kim
7fcaae7000 [automerger skipped] SettingsProvider: use sysprop as API for telephony am: 6eac929099 am: 107e3e125b -s ours
am skip reason: Change-Id Ib28d5804dcb8480f5a00a869c16a1112fb2c075d with SHA-1 b45b890a79 is in history

Change-Id: I9e4ff141b86e67fbbaaf57065ae48a5983f81f63
2020-04-14 02:53:29 +00:00
Chalard Jean
39104d5ed2 [automerger skipped] Merge "Allow testing of signal strength" into rvc-dev am: 4947356664 -s ours
am skip reason: Change-Id I2b4b89be3e69f4853fd6978d2c8f5c8eb4271f21 with SHA-1 ca241694cb is in history

Change-Id: Iab15d259b8032a207d7c6ad086987bbf2a9da145
2020-04-14 02:44:58 +00:00
Jin Seok Park
d32dd103fd Merge "Ensure thread-safety of SimpleDateFormat" into rvc-dev am: 78552a888a
Change-Id: I72ee82e19cd2dd9d3121399bf80d4db5f1a3ab4c
2020-04-14 02:44:45 +00:00
TreeHugger Robot
a81d7d8620 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6557f7169c -s ours
am skip reason: subject contains skip directive

Change-Id: I792ce4fc2d078b6d1bfa4203305b6ce55ac1a72d
2020-04-14 02:42:28 +00:00
Chalard Jean
4947356664 Merge "Allow testing of signal strength" into rvc-dev 2020-04-14 02:42:06 +00:00
TreeHugger Robot
6d1548968d Merge "Expand minimized split stack on relaunch-attempt" into rvc-dev am: 38a68f0c62
Change-Id: I2a144a432c72d3562ef2fc8e75d889a5b8ed01cf
2020-04-14 02:41:34 +00:00
Calvin Pan
c40cb4c0d8 Merge changes from topic "DEFAULT_PREFERRED_NETWORK_MODE" am: f2da40ad07
Change-Id: I039f6121ffcb8ff29055d1a2fee46006a8b7af36
2020-04-14 02:32:49 +00:00
Jayachandran C
719a0a2ba8 Add new system API constant DEFAULT_PREFERRED_NETWORK_MODE am: 9160670b18
Change-Id: I29e57274ff624e4445155e3ed005a582b2f72141
2020-04-14 02:32:46 +00:00
Jayachandran C
f05d95638f Remove usage of Telephonymanager getDefault() hidden API am: 70e03d953d
Change-Id: I0b1ab3053648d56c52a0679e7e25b14ff8156507
2020-04-14 02:32:44 +00:00
Inseob Kim
107e3e125b SettingsProvider: use sysprop as API for telephony am: 6eac929099
Change-Id: I33d84833d3fa49b51c2287e545fab39a8903ffa4
2020-04-14 02:32:39 +00:00
Jin Seok Park
78552a888a Merge "Ensure thread-safety of SimpleDateFormat" into rvc-dev 2020-04-14 02:28:03 +00:00
TreeHugger Robot
6557f7169c Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-14 02:25:17 +00:00
TreeHugger Robot
38a68f0c62 Merge "Expand minimized split stack on relaunch-attempt" into rvc-dev 2020-04-14 02:20:46 +00:00
Mark Chien
b79ee214d8 [automerger skipped] Merge "Tethering: Add an exported flag in manifest" am: ec6cf543f9 am: e81da2d8c4 -s ours
am skip reason: Change-Id I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e with SHA-1 9befafe109 is in history

Change-Id: Idfc7a32b608c97c9ebc956b6d4bf85a5d8f42776
2020-04-14 02:19:35 +00:00
Calvin Pan
f2da40ad07 Merge changes from topic "DEFAULT_PREFERRED_NETWORK_MODE"
* changes:
  Make DEFAULT_PREFERRED_NETWORK_MODE @hide for now
  Add new system API constant DEFAULT_PREFERRED_NETWORK_MODE
  Remove usage of Telephonymanager getDefault() hidden API
  SettingsProvider: use sysprop as API for telephony
2020-04-14 02:13:14 +00:00
Mark Chien
e81da2d8c4 Merge "Tethering: Add an exported flag in manifest" am: ec6cf543f9
Change-Id: I10166943f9c84abc71e34807fd6960c4fa23fed5
2020-04-14 01:58:11 +00:00
Mark Chien
e3a785951f Merge "Tethering: Add an exported flag in manifest" into rvc-dev am: ddbe63e44c
Change-Id: Icc13f39dc779d7432d95c07aedbcf1bc5d756078
2020-04-14 01:50:18 +00:00
Mark Chien
ddbe63e44c Merge "Tethering: Add an exported flag in manifest" into rvc-dev 2020-04-14 01:41:00 +00:00
TreeHugger Robot
0c36700457 Merge "startop: Forward the package update event from dexopt service to iorapd." into rvc-dev am: 1dcd8f4116
Change-Id: Ib2daa7937c284fc8a4ccfd94de37926c92f93357
2020-04-14 01:40:24 +00:00
TreeHugger Robot
3e63aba639 Merge "Apply rotation animation to restore rotated activity" into rvc-dev am: 45e7091f37
Change-Id: I05c97e24769a46326540adf590e8e4197581b6f4
2020-04-14 01:39:59 +00:00
Mark Chien
ec6cf543f9 Merge "Tethering: Add an exported flag in manifest" 2020-04-14 01:38:42 +00:00
TreeHugger Robot
1dcd8f4116 Merge "startop: Forward the package update event from dexopt service to iorapd." into rvc-dev 2020-04-14 01:28:39 +00:00
TreeHugger Robot
45e7091f37 Merge "Apply rotation animation to restore rotated activity" into rvc-dev 2020-04-14 01:27:54 +00:00
Chalard Jean
3b2a81b23b Allow testing of signal strength
- Let any process with NETWORK_SETTINGS register for signal strength
  wakeup.
- Allow agents registering test networks to assign them a signal
  strength.

Test: NetworkAgentTest
Bug: 139268426
Change-Id: Iebfeb9316bcbd8472459c517abb16f1f9d879871
Merged-In: I2b4b89be3e69f4853fd6978d2c8f5c8eb4271f21
(cherry picked from commit 5cc7b18fe7, aosp/1284585)
2020-04-14 01:22:14 +00:00
Chiachang Wang
2b41cbf5ed [automerger skipped] Merge "Add more tests for CaptivePortalData" into rvc-dev am: ecbf648b62 -s ours
am skip reason: Change-Id I6d3826922f16816d5b18ed3540266442a0ed3e49 with SHA-1 55bde27f29 is in history

Change-Id: I9d9249b4ae1e31f35a8774f7d145c8afe5ce3145
2020-04-14 01:21:40 +00:00
Chiachang Wang
c2f819449f [automerger skipped] Merge "Move CaptivePortalDataTest to common test to support cts" into rvc-dev am: 7448287450 -s ours
am skip reason: Change-Id Iddd00e1c85abe767b1a41a1761d3266ba322dba6 with SHA-1 f4ebfd4bde is in history

Change-Id: I9b2476c87531a064165e5514b9e56fadbbcfabd1
2020-04-14 01:21:11 +00:00