Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
417,923 Commits 3 Branches 0 Tags
27c2dc5f554e2cab5b2633c92178f247c640d235
Commit Graph

417923 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lucas Dupin
27c2dc5f55 Merge "Do not hide media metadata when bypassing LS" into qt-r1-dev 2019-06-04 04:06:45 +00:00
Yao Chen
ae8cff710b Merge "Fix a bug in saving local history of the metrics report." into qt-dev 
am: 6d647b78d3

Change-Id: I69258e0cb237f501e2962f216396889ec0521098
 2019-06-03 20:38:49 -07:00
Yao Chen
6d647b78d3 Merge "Fix a bug in saving local history of the metrics report." into qt-dev 2019-06-04 03:31:15 +00:00
Matt Casey
358b037079 Merge "Ignore setAssistHintVisible if overlays are not available." into qt-dev 
am: 5eab79db10

Change-Id: Ic01fff552325358e84743da927b1331d50a0f3d4
 2019-06-03 19:51:49 -07:00
TreeHugger Robot
5eab79db10 Merge "Ignore setAssistHintVisible if overlays are not available." into qt-dev 2019-06-04 02:27:26 +00:00
Kevin Yao
0d2970d912 Merge "User education support on disambiguation dialog" into qt-dev 
am: 327751f18f

Change-Id: I0ab37bd7b5cf4b00df4dc70d35a1387e3f348680
 2019-06-03 18:40:43 -07:00
Winson Chung
466b5dfd34 Merge "Fix regression in swiping up from lockscreen" into qt-dev 
am: fafe6dd571

Change-Id: Ie6a8a8983c4fa9340309353670f7940b12f2c18b
 2019-06-03 18:38:38 -07:00
Kevin Yao
327751f18f Merge "User education support on disambiguation dialog" into qt-dev 2019-06-04 01:29:21 +00:00
TreeHugger Robot
fafe6dd571 Merge "Fix regression in swiping up from lockscreen" into qt-dev 2019-06-04 01:20:51 +00:00
Jean-Michel Trivi
1b432c135f Merge "AudioService: hearing aid volume updates for voice vs media" into qt-dev 
am: ed97f7b762

Change-Id: I2751187d6843ed32a84ff90f98505a4a0c9243d9
 2019-06-03 17:59:37 -07:00
TreeHugger Robot
ed97f7b762 Merge "AudioService: hearing aid volume updates for voice vs media" into qt-dev 2019-06-04 00:54:05 +00:00
Lorenzo Colitti
74f7be63fc Merge "Don't auto-connect to networks that have no/limited connectivity." into qt-dev 
am: a85d8ba084

Change-Id: Ia8c3102d583e3a07b656cf60609cf1c2dddfcdbe
 2019-06-03 17:12:14 -07:00
TreeHugger Robot
19a91def43 Merge "Remove all eSIM Invisible Profiles during FDR" into qt-r1-dev 2019-06-04 00:01:56 +00:00
TreeHugger Robot
a85d8ba084 Merge "Don't auto-connect to networks that have no/limited connectivity." into qt-dev 2019-06-03 23:58:17 +00:00
TreeHugger Robot
c2dc9d31ab Merge "Update attention config" into qt-r1-dev 2019-06-03 23:32:59 +00:00
Alex Salo
e6f9fdbc5e Update attention config 
Bug: 134433577
Test: manually
Change-Id: Iff0d039b5399ca1a7d622d2c9f5f0556ea471e2a
 2019-06-03 23:30:49 +00:00
Matt Casey
603c697d89 Ignore setAssistHintVisible if overlays are not available. 
Fixes: 134066197
Test: TBD
Change-Id: If18322aa939e3433f5c3543699f91d06af7989e1
 2019-06-03 19:21:34 -04:00
Adrian Roos
09ed7c9762 Merge "RootViewImpl: Fix measure size hint for WRAP_CONTENT windows" into qt-dev 
am: 952bcb8ffe

Change-Id: Id02b19a73bc5b19a67cd93ac394c8ec356602096
 2019-06-03 16:02:26 -07:00
TreeHugger Robot
952bcb8ffe Merge "RootViewImpl: Fix measure size hint for WRAP_CONTENT windows" into qt-dev 2019-06-03 22:52:59 +00:00
Svetoslav Ganov
d89a61cc34 Merge "[DO NOT MERGE] Handle config override via settings correctly" into qt-dev 
am: 526ab77a51

Change-Id: I8e50c05b71d1333f37d579a56f2efed008eff0c8
 2019-06-03 15:49:59 -07:00
Lucas Dupin
940e490753 Do not hide media metadata when bypassing LS 
Bug: 130327302
Test: manual
Test: atest KeyguardSliceProviderTest
Change-Id: I50bfd88d8d812ce7b64294a7bc68d8b28e9a6a0d
 2019-06-03 15:47:47 -07:00
Svet Ganov
603304bd4e [DO NOT MERGE] Handle config override via settings correctly 
am: aa5ba4f75f

Change-Id: I690b9d81b1d3c72c9df3134d7ad92153cf3c9c5c
 2019-06-03 15:47:33 -07:00
Svetoslav Ganov
526ab77a51 Merge "[DO NOT MERGE] Handle config override via settings correctly" into qt-dev 2019-06-03 22:38:35 +00:00
Chavi Weingarten
248189d5b9 Merge "Clear VISIBLE_FOR_USER flag when isHiddenFromUser is true" into qt-dev 
am: f8b8c20c76

Change-Id: I4a15e33fe6ffc304c57ed28d31a3383f397d5c56
 2019-06-03 15:36:14 -07:00
Chavi Weingarten
f8b8c20c76 Merge "Clear VISIBLE_FOR_USER flag when isHiddenFromUser is true" into qt-dev 2019-06-03 22:22:49 +00:00
Winson Chung
241e63d2ff Fix regression in swiping up from lockscreen 
Bug: 134391878
Test: Swipe up to assistant from lockscreen

Change-Id: I32fe638de507775c5744344bc5e71509e4a5b0e1
 2019-06-03 22:16:11 +00:00
Hai Zhang
c75355ce48 Merge "Revert "Offload role manager work to background thread"" into qt-dev 
am: b13d88af52

Change-Id: Ib75d72f1a2bb74ff85d408fd3ddc403091f5ddcb
 2019-06-03 15:07:34 -07:00
Yao Chen
5c10cb48a9 Fix a bug in saving local history of the metrics report. 
A condition was reversed in code refactoring during previous code review.

Test: unit tests added for all 4 combination cases.
Bug: 134417583
Change-Id: Id79a827ec7a5404b9006769f9595de773b4724ef
 2019-06-03 15:02:30 -07:00
TreeHugger Robot
b13d88af52 Merge "Revert "Offload role manager work to background thread"" into qt-dev 2019-06-03 21:48:24 +00:00
Jean-Michel Trivi
b97b3980f4 AudioService: hearing aid volume updates for voice vs media 
Fix interactions between hearing aid volume control and Sound
Settings and Slice UIs with the following changes:

  When receiving volume change, only change the hearing aid volume
if the device is hearing aid and the stream type to change matches
the stream type returned by AudioService.getHearingAidStreamType().

  Modify AudioService.getHearingAidStreamType() to rely on the
audio mode OR the activity of the VOICE_COMMUNICATION* usage.

  Add a listener of audio playback activity to monitor the start
and end of the use of VOICE_COMMUNICATION* to reset the hearing
aid volume to that of media.
Do this only when HEARING_AID device is connected: register/unregister
callback for playback activity according to hearing aid connections.

Bug: 129163231
Test: use Sound Settings UI to control voice vol outside of call, verify
volume is unchanged when listening to media later.

Change-Id: I7af9554d04139e1a3929efa53cdcb04e37878571
 2019-06-03 14:44:05 -07:00
Matt Pietal
7b2c7ce436 Merge "Sharesheet - Adjust dark mode colors for GAR" into qt-dev 
am: 575f58e26c

Change-Id: Ib411e44f0e33869775c9c938728ae9fff829294c
 2019-06-03 14:37:27 -07:00
Heemin Seog
79dd503f84 Merge "Small fixes to CarSysUI Volume Dialog" into qt-dev 
am: 0247f19816

Change-Id: I13a2eae16ed63eec7fd2f3181f00ab982c695b80
 2019-06-03 14:31:43 -07:00
TreeHugger Robot
575f58e26c Merge "Sharesheet - Adjust dark mode colors for GAR" into qt-dev 2019-06-03 21:29:16 +00:00
Heemin Seog
0247f19816 Merge "Small fixes to CarSysUI Volume Dialog" into qt-dev 2019-06-03 21:17:01 +00:00
Makoto Onuki
5e13e05a06 Merge "Remove STOPSHIP (disable debug flag) in WatchDog.java" into qt-dev 
am: c1fb7dd218

Change-Id: I7685f50eced23924007ca5c7e7735ffeeb45222c
 2019-06-03 14:03:14 -07:00
Makoto Onuki
c1fb7dd218 Merge "Remove STOPSHIP (disable debug flag) in WatchDog.java" into qt-dev 2019-06-03 20:57:21 +00:00
Qingxi Li
e06624716d Remove all eSIM Invisible Profiles during FDR 
Bug: 132360644
Test: E2E
Change-Id: Ic4e58ed7c8cf5892d8f49605e268c3d131b35ea9
(cherry picked from commit 1854f47f80)
 2019-06-03 20:46:58 +00:00
Ryan Mitchell
90b70e5cea Merge "Remove stopship for idmap2 vendor sdk checking" into qt-dev 
am: f5671d390d

Change-Id: If78cd6fdd133f526aea475c42bc124c98bc01ce7
 2019-06-03 13:43:46 -07:00
TreeHugger Robot
f5671d390d Merge "Remove stopship for idmap2 vendor sdk checking" into qt-dev 2019-06-03 20:31:59 +00:00
Jeff Sharkey
eb366a5f25 Merge "Collect NeededUriGrants without holding locks." into qt-dev 
am: aac39e204d

Change-Id: I1c2720586a74d248219c275fe7a7986e47117766
 2019-06-03 13:27:16 -07:00
Jeff Sharkey
aac39e204d Merge "Collect NeededUriGrants without holding locks." into qt-dev 2019-06-03 20:11:33 +00:00
Ritwika Mitra
7463a313b5 Merge "Initializing the Telephony Sms DB based on RoleManager.ROLE_SMS" into qt-dev 
am: d1ca4823d5

Change-Id: I1ecd43dbf9c84f10dd92a0aa2b06efd0bfaa823c
 2019-06-03 12:36:56 -07:00
Ritwika Mitra
d1ca4823d5 Merge "Initializing the Telephony Sms DB based on RoleManager.ROLE_SMS" into qt-dev 2019-06-03 19:15:49 +00:00
Hai Zhang
c00c31e97e Revert "Offload role manager work to background thread" 
This reverts commit f105c93c4a.

Reason for revert: b/132974796#23 the offloaded thread will be holding a lock for a noticeable period of time and cause contention.

Bug: 132974796
Change-Id: Ic81a2e3ee7226266c8f97b606fc1a2834240f689
 2019-06-03 18:50:55 +00:00
Philip P. Moltmann
3027477760 Merge changes from topic "SoftHardStoragePerm" into qt-dev 
am: 7a9a83f6a1

Change-Id: Ia7abc97fdcd81d2317c0ca2cfb3072735419d37f
 2019-06-03 11:38:27 -07:00
TreeHugger Robot
7a9a83f6a1 Merge changes from topic "SoftHardStoragePerm" into qt-dev 
* changes:
  Link to SoftRestrictedPermissionPolicy twin
  Pre-Q storage perm should behave hard restricted
  Factor out soft restricted permissions policy
 2019-06-03 18:29:30 +00:00
Ned Burns
57f42f5031 Merge "Allow notification reordering after user adjusts importance" into qt-dev 
am: 798aa80cf5

Change-Id: I303d5277f07b43601f1fb986ffc135e4808681dc
 2019-06-03 11:26:17 -07:00
Tiger Huang
07fb28b0af Merge "Fix a bug about missing onConfigurationChanged" into qt-dev 
am: a54b943d59

Change-Id: Ia2ee444aebae7f6f891fe6cfdff9e09cd840bc3c
 2019-06-03 11:24:24 -07:00
Ryan Mitchell
56db15b843 Remove stopship for idmap2 vendor sdk checking 
Idmap now checks if the version of the vendor partition is greater than
or equal to 29 or a development codename to enable enforcement of
overlayable resources.

Bug: 119390857
Test: manual
Change-Id: Ica25800432993beb7464436d4fba7cb391e621ef
 2019-06-03 11:22:36 -07:00
Ned Burns
798aa80cf5 Merge "Allow notification reordering after user adjusts importance" into qt-dev 2019-06-03 18:21:19 +00:00