Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
489,909 Commits 3 Branches 0 Tags
dd01438a76d3a474f474772bb571ed90de01e89a
Commit Graph

489909 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Laurent
dd01438a76 Merge "AudioService: fix volume group mute" into rvc-dev am: ff373b4676 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844163

Change-Id: Idfe190bda150dd084914ca5698b4b18af022c6a5
 2020-06-12 15:25:53 +00:00
Eric Laurent
ff373b4676 Merge "AudioService: fix volume group mute" into rvc-dev 2020-06-12 15:12:40 +00:00
Robert Snoeberger
8dfbbc2a6e Merge "Reject flings on seek bar" into rvc-dev am: 8140ae8d22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11831680

Change-Id: Icd197e2a12c78c865d5bdb6fc9362e1e9c75f5c8
 2020-06-12 13:29:56 +00:00
Robert Snoeberger
8140ae8d22 Merge "Reject flings on seek bar" into rvc-dev 2020-06-12 13:15:06 +00:00
Kyunglyul Hyun
b10bbe5efc Merge "Handle a pair of hearing aid devcies" into rvc-dev am: 93e4930a97 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833792

Change-Id: Ib9bba72c878cc981e9bf7a56f5c74c61a88ce924
 2020-06-12 13:07:02 +00:00
Kyunglyul Hyun
93e4930a97 Merge "Handle a pair of hearing aid devcies" into rvc-dev 2020-06-12 12:55:24 +00:00
Issei Suzuki
6663f2cc3a Merge "Ensure to trigger Activity#onEnterAnimationComplete" into rvc-dev am: b749be45c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838100

Change-Id: Id5a86d54a09106f322597f4094284c36f558405d
 2020-06-12 11:44:26 +00:00
Issei Suzuki
b749be45c7 Merge "Ensure to trigger Activity#onEnterAnimationComplete" into rvc-dev 2020-06-12 11:31:55 +00:00
Kyunglyul Hyun
f6d5b3c7c4 Handle a pair of hearing aid devcies 
This CL assigns the same ID for a pair of hearing aid devices and
filter out one of them.
It also fixes a potential system crash from BT devices having
the same hardware address.

Bug: 157708273
Test: cts test

Change-Id: Ia60623615ab1f4e931405f839b9f4110b463e51d
 2020-06-12 18:53:05 +09:00
TreeHugger Robot
238232ad88 Merge "GnssStats atom entity name change" into rvc-dev am: 6dca466770 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838738

Change-Id: Iadcc4ef7548a6ffe3bc009897f81112393f721ac
 2020-06-12 08:32:44 +00:00
TreeHugger Robot
3631562142 Merge "Increase configs per uid limit to 20" into rvc-dev am: d4d283e67d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844170

Change-Id: If2d387e308bb725e4cdc6af9a3a5c0f89236b730
 2020-06-12 08:31:26 +00:00
TreeHugger Robot
6dca466770 Merge "GnssStats atom entity name change" into rvc-dev 2020-06-12 08:17:59 +00:00
TreeHugger Robot
d4d283e67d Merge "Increase configs per uid limit to 20" into rvc-dev 2020-06-12 08:12:53 +00:00
Remi NGUYEN VAN
88591584c6 [automerger skipped] Merge "Remove IpClientCallbacks dependency on DhcpResults" into rvc-dev am: 0109b8da49 -s ours 
am skip reason: Change-Id I5b85c1a541ecdf9dd3e9403b9fb1c2b5aba98dd8 with SHA-1 ac0c8988ce is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835422

Change-Id: I25b899027b1712a63694c40c5b377e89360a6841
 2020-06-12 07:03:14 +00:00
TreeHugger Robot
b8e0bafbd5 Merge "Reset app routes when global a2dp state changed" into rvc-dev am: 70b9d348eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833779

Change-Id: If3a14335833a78b0306d0f3fa9bcdd15820697c1
 2020-06-12 07:02:56 +00:00
Remi NGUYEN VAN
0109b8da49 Merge "Remove IpClientCallbacks dependency on DhcpResults" into rvc-dev 2020-06-12 06:38:02 +00:00
TreeHugger Robot
70b9d348eb Merge "Reset app routes when global a2dp state changed" into rvc-dev 2020-06-12 06:37:46 +00:00
Wei Sheng Shih
cd86ac588f Merge "Fix task root bounds be overwritten when dismiss split screen." into rvc-dev am: 49ded46160 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818545

Change-Id: I92908055859e715ee9cb0cabff5be48a93822b58
 2020-06-12 06:19:51 +00:00
Wei Sheng Shih
49ded46160 Merge "Fix task root bounds be overwritten when dismiss split screen." into rvc-dev 2020-06-12 06:09:33 +00:00
TreeHugger Robot
4ea2e2e0cc [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: cab8a73c6d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843138

Change-Id: Ide242eee20ba455139d61bed576e0c3a3470c609
 2020-06-12 05:31:43 +00:00
Hyundo Moon
a6760a6ce0 Merge "MediaRouter2: Prevent printing same logs from different lines" into rvc-dev am: 6d8d91dcfb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835420

Change-Id: Ifcdc722cd1a581846012a0406f04821e8f398d1a
 2020-06-12 05:31:32 +00:00
TreeHugger Robot
78c9a17f91 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 0f8165ffdb -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846125

Change-Id: I5e59dc72904cbadab535518a769d15181239fad2
 2020-06-12 05:31:17 +00:00
TreeHugger Robot
5afca7b12c [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7eb6cf298f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843401

Change-Id: I1111e5d6bad8b7d0b85244d1c915e12a3520a2b9
 2020-06-12 05:30:42 +00:00
TreeHugger Robot
cab8a73c6d Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-06-12 05:26:37 +00:00
Hyundo Moon
6d8d91dcfb Merge "MediaRouter2: Prevent printing same logs from different lines" into rvc-dev 2020-06-12 05:23:25 +00:00
TreeHugger Robot
0f8165ffdb Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-06-12 05:19:36 +00:00
TreeHugger Robot
7eb6cf298f Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-06-12 05:17:01 +00:00
Chalard Jean
e6527eef99 [automerger skipped] Merge "Document the limitation to a hundred callbacks." into rvc-dev am: 8aafdcc328 -s ours 
am skip reason: Change-Id I5911d01984695550b6c9afe7a8eb535bf5e320a1 with SHA-1 c022b0c7ea is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835429

Change-Id: I819ea5e14c6eaf108ac7252768014aa5d33891b3
 2020-06-12 04:58:29 +00:00
Frank Li
f572adce1e Merge "Adding NetworkStack Metrics/atoms" into rvc-dev am: 64a3cb03e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11629772

Change-Id: I4b789b7c68ede5dd6d73cb5b1c4030855d49940f
 2020-06-12 04:58:01 +00:00
TreeHugger Robot
7dda5946b7 Merge "Help reduce falsing on the seek bar" into rvc-dev am: 70bec8cc36 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11702457

Change-Id: Id560b7d80d6e7130e4bc9828421305c0a7fd45db
 2020-06-12 04:57:34 +00:00
Chalard Jean
8aafdcc328 Merge "Document the limitation to a hundred callbacks." into rvc-dev 2020-06-12 04:54:02 +00:00
Frank Li
64a3cb03e7 Merge "Adding NetworkStack Metrics/atoms" into rvc-dev 2020-06-12 04:50:57 +00:00
TreeHugger Robot
70bec8cc36 Merge "Help reduce falsing on the seek bar" into rvc-dev 2020-06-12 04:44:55 +00:00
Ruchir Rastogi
49efb08d79 Merge "Add libincident_test to MTS" into rvc-dev am: 003ef4903a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11816592

Change-Id: Ibb041b389a8f2ce24f351c46bbe9500b877aeaf7
 2020-06-12 04:25:53 +00:00
Ruchir Rastogi
003ef4903a Merge "Add libincident_test to MTS" into rvc-dev 2020-06-12 04:11:44 +00:00
Beth Thibodeau
bcd7297083 Merge "Disable buttons with no action intent" into rvc-dev am: fd10b83c2c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11843853

Change-Id: Ib569729dd607d60d0897da86095bc3092ba86974
 2020-06-12 03:51:21 +00:00
Beth Thibodeau
fd10b83c2c Merge "Disable buttons with no action intent" into rvc-dev 2020-06-12 03:38:29 +00:00
Yunfan Chen
13212d164e Merge "Remove IME surface when occured in multi-window mode" into rvc-dev am: b55bc82d13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11612967

Change-Id: Ica2e2cf709d05df0eadd340c42a7c2d976627953
 2020-06-12 03:25:47 +00:00
Tony Huang
dbe759768c Merge "Only add divider when it need to show" into rvc-dev am: a73d6ecb84 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11612936

Change-Id: I2274b246c949846a48d622090c17be3d0baed4b3
 2020-06-12 03:24:57 +00:00
Sungsoo Lim
07e40316f8 Reset app routes when global a2dp state changed 
Bug: 156549746
Test: manual
Change-Id: I8985136220c9cb96bd4da013653a69f12bfbb6b1
 2020-06-12 12:13:08 +09:00
Yunfan Chen
b55bc82d13 Merge "Remove IME surface when occured in multi-window mode" into rvc-dev 2020-06-12 03:05:54 +00:00
Tony Huang
a73d6ecb84 Merge "Only add divider when it need to show" into rvc-dev 2020-06-12 03:04:26 +00:00
wilsonshih
d601ad1120 Fix task root bounds be overwritten when dismiss split screen. 
WindowManagerProxy#applyDismissSplit is getting the root task of
secondary split screen instead of freeHomeAndRecents tasks then set
the bounds to empty, and becuase the transaction is queued with
applySyncTransaction, so even the correct root task bounds should
applied when DividerView#exitSplitMode, the bounds could be
overwritten if the SyncTransactionQueue apply to WM later.

Next time when we start an activity with a new task on the secondary
split screen, the activity will be relaunch because the initialization
bounds is full screen.

Fixes: 158637716
Test: atest ActivityLifecycleSplitScreenTests, repeat several times.
Test: run testResumedWhenRecreatedFromInNonFocusedStack then verify
the bounds of split-screen-secondary doesn't become empty.

Change-Id: Ie344b573f42a47d703ad15f7c1983b6c18905665
 2020-06-12 10:42:16 +08:00
Bill Yi
b6ae3133a1 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I60e234bfec327d56820dbae083054a51108fe355
 2020-06-12 02:30:38 +00:00
Hyundo Moon
369be956e0 MediaRouter2: Prevent printing same logs from different lines 
This CL prevents duplicate logs which are printed from
different code locations, which makes investigating future bugs easier.
Also modifies some logs to make them clearer.

Bug: 157873330
Test: Builds successfully
Change-Id: I90ca0e6b46e2b796d069dbecef4a8000cca85b4b
 2020-06-12 11:28:13 +09:00
Aaron Huang
ea43b62474 Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 32f8a56636 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484

Change-Id: Iac633487b359d751206e06b2352a2a9cb475811e
 2020-06-12 02:11:29 +00:00
Aaron Huang
32f8a56636 Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev 2020-06-12 01:58:59 +00:00
Eric Laurent
b94b9c60f1 AudioService: fix volume group mute 
Make sure the volume applied to audio policy by a volume group follows
the mute state of the associated public stream if any.

Bug: 156559315
Test: repro steps in bug
Test: atest AudioManagerTest#testVolume
Test: atest AudioVolumeGroupTest

Change-Id: I95e96f3524b27600c59a2cf093cd3309430d28ca
 2020-06-12 01:56:21 +00:00
Beth Thibodeau
f96f4fbf05 Disable buttons with no action intent 
Fixes: 158728328
Test: manual
Change-Id: I8ed112b5106830943b69d8fef48a9b9e128babf3
 2020-06-11 21:54:14 -04:00
TreeHugger Robot
485c2cb549 Merge "Fix IME hanging around" into rvc-dev am: a7ef29df9e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844159

Change-Id: I8f33d8e673131e918f5f4af95675bb4910ac8123
 2020-06-12 01:53:56 +00:00