Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
480,336 Commits 3 Branches 0 Tags
cceee540622575c4e0aa06a2ba34af4574086f01
Commit Graph

480336 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
cceee54062 Merge changes from topic "bubble_settings_wooo" into rvc-dev am: c026d54cd7 
Change-Id: I6e89aaa4ed1f331acc8e8b07dd8c01e07d564d62
 2020-04-14 11:28:46 +00:00
Mady Mellor
5bed4a8ab4 Notification Bubble Button am: 9adfe6a20c 
Change-Id: I879feee141b1584624dee3236851f59024b8ac22
 2020-04-14 11:28:41 +00:00
Mady Mellor
f2e1c620a4 Make bubble settings a pref with an int rather than a bool am: a92268cd01 
Change-Id: Iff5cd122b4ed2ee91461a04c36dd32a386e6b042
 2020-04-14 11:28:37 +00:00
Julia Reynolds
c026d54cd7 Merge changes from topic "bubble_settings_wooo" into rvc-dev 
* changes:
  Changes to enable bubble settings CTS
  Notification Bubble Button
  Make bubble settings a pref with an int rather than a bool
 2020-04-14 11:22:14 +00:00
Susi Kharraz-Post
714d0434d3 Merge "Rename sharesheet started atom proto fields." into rvc-dev am: 1faa960005 
Change-Id: Ibe864e6a59b447418d7b2e537677e65a84d78f2f
 2020-04-14 11:08:23 +00:00
Susi Kharraz-Post
1faa960005 Merge "Rename sharesheet started atom proto fields." into rvc-dev 2020-04-14 10:49:57 +00:00
JW Wang
9662e100fd Merge "Remove the workaround" into rvc-dev am: 21f457f470 
Change-Id: I16aa135259d4732b901ec2383742cf7d569cb339
 2020-04-14 10:16:23 +00:00
JW Wang
21f457f470 Merge "Remove the workaround" into rvc-dev 2020-04-14 10:01:54 +00:00
SongFerng Wang
3f77974bf9 Merge "For NR (non-standalone), use LTE signal strength as primary rule" into rvc-dev am: 6cfdd46d4b 
Change-Id: I1b3f23b1203c4673bf558067a9220697486e1fb0
 2020-04-14 09:45:46 +00:00
Mark Chien
ecb1962fac [automerger skipped] Merge "Change tethering file structure to respect its package name" into rvc-dev am: ee6107e51c -s ours 
am skip reason: Change-Id I7401c550fbafd17a5ed2d925b5d0e17e358af467 with SHA-1 711d8b4e4a is in history

Change-Id: I0994b834ff0af2ebee3cd7e5bc9c73c4b08a4c99
 2020-04-14 09:45:14 +00:00
SongFerng Wang
6cfdd46d4b Merge "For NR (non-standalone), use LTE signal strength as primary rule" into rvc-dev 2020-04-14 09:30:42 +00:00
Lorenzo Colitti
8cedb513b6 Merge "Don't crash when receiving an RTM_DELNEIGH or NUD_FAILED." am: 17917f7bb0 am: 54d650a492 
Change-Id: Ie7060e6408acd73f1a5d2456d030a1958df32847
 2020-04-14 09:21:19 +00:00
Paul Hu
5d739b512b Merge "Update tethering notification strings" am: 2d377066e6 am: 4f5ef756ba 
Change-Id: If9d8e5945160b6def527e7f3ee372dfe533140e9
 2020-04-14 09:20:54 +00:00
Mark Chien
32dd13363c [automerger skipped] Merge "Change tethering file structure to respect its package name" am: c31e88ace6 am: e6c78e3e6f -s ours 
am skip reason: skipped by user markchien

Change-Id: I23b0ffb1f366f980bc7c9c3b4c061214b8199307
 2020-04-14 09:19:38 +00:00
Mark Chien
ee6107e51c Merge "Change tethering file structure to respect its package name" into rvc-dev 2020-04-14 09:18:37 +00:00
PETER LIANG
76a496305a Merge "Migrate AccessibilityButtonChooserActivity into dialog folder and renaming." into rvc-dev am: 40dff7cd01 
Change-Id: Ie78d4914ce91702dc3bc990eb441c628426825c7
 2020-04-14 09:02:34 +00:00
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
PETER LIANG
40dff7cd01 Merge "Migrate AccessibilityButtonChooserActivity into dialog folder and renaming." into rvc-dev 2020-04-14 08:56:55 +00:00
TreeHugger Robot
3002b11fb6 Merge "CEC: Filter certain message arguments from logging" into rvc-dev 2020-04-14 08:41:57 +00:00
Lorenzo Colitti
54d650a492 Merge "Don't crash when receiving an RTM_DELNEIGH or NUD_FAILED." am: 17917f7bb0 
Change-Id: I62dd1888231eb13c4c5bcc2c4c4d95e47c5b8aaa
 2020-04-14 08:40:35 +00:00
Lorenzo Colitti
17917f7bb0 Merge "Don't crash when receiving an RTM_DELNEIGH or NUD_FAILED." 2020-04-14 08:22:30 +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
Paul Hu
4f5ef756ba Merge "Update tethering notification strings" am: 2d377066e6 
Change-Id: I1af1b1a8664662ebdffba1b08725b4e505c222f4
 2020-04-14 07:32:32 +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
Paul Hu
2d377066e6 Merge "Update tethering notification strings" 2020-04-14 07:15:16 +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
markchien
503be61a6e Change tethering file structure to respect its package name 
Bug: 145099347
Test: atest TetheringTests
      atest CtsTetheringTest
Change-Id: I7401c550fbafd17a5ed2d925b5d0e17e358af467
Merged-In: I7401c550fbafd17a5ed2d925b5d0e17e358af467
 2020-04-14 14:33:45 +08: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
Lorenzo Colitti
210ac1e145 Don't crash when receiving an RTM_DELNEIGH or NUD_FAILED. 
These events don't have MAC addresses, so the code attempts to
create an Ipv6ForwardingRule with a null MAC address. This
crashes when attempting to get the raw MAC address bytes to send
to netd in the TetherOffloadRuleParcel.

This was not caught by unit tests because the test exercise this
code path in a way that is not correct (by sending RTM_DELNEIGH
and NUD_FAILED events with MAC addresses). Fix the unit tests to
properly pass in null MAC addresses for these events.

Bug: 153697068
Test: fixed existing tests to be more realistic
Change-Id: I26d89a81f1c448d9b4809652b079a5f5eace3924
 2020-04-14 15:02:17 +09: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
Mark Chien
e6c78e3e6f Merge "Change tethering file structure to respect its package name" am: c31e88ace6 
Change-Id: Ib7db789690b64ca00905577ee9ed7ed993293967
 2020-04-14 04:50:53 +00:00
Mark Chien
c31e88ace6 Merge "Change tethering file structure to respect its package name" 2020-04-14 04:29:01 +00: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
Peter_Liang
8b7c9dada1 Migrate AccessibilityButtonChooserActivity into dialog folder and renaming. 
1. Migrate and renaming file, functions.
2. Revise java doc and annotations.

Bug: 151294664
Bug: 147655054
Test: manual test
Change-Id: Ie791bce32b21495f9c2bf499feb8f6601c941f1d
 2020-04-14 03:24:59 +00:00
SongFerngWang
68c58a57b0 For NR (non-standalone), use LTE signal strength as primary rule 
There are two signal strengths, NR and LTE signal strength,
during NR (non-standalone). A lot of carriers' requirement define
UE show LTE signal strength on status bar during
NR (non-standalone).
Add a carrier config whether to use LTE signal strength as
primary during NR (non-standalone)

Bug: 152864241
Test: make pass.
Change-Id: Ib13d73719dace2d80aee5669181f4f934316ffd1
 2020-04-14 11:16:47 +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