Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
542,466 Commits 3 Branches 0 Tags
56936beddd997d381a4e893c437d396caabbe02e
Commit Graph

542466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Laurent
ff373b4676 Merge "AudioService: fix volume group mute" into rvc-dev 2020-06-12 15:12:40 +00:00
Riddle Hsu
9b1843eae3 Avoid unexpected screen off during perf testing 
The plugged-in type may be BATTERY_PLUGGED_AC in test environment.
And the precondition of the device may have set stay-on with any
type, then it is enough to keep device interactive. Previously
the usb type doesn't match the current state that causes device to
sleep if the screen off timeout has occurred.

Bug: 131727899
Test: atest WmPerfTests
Change-Id: Ia76a0f55e967a2d52fc4b1057b19a8af921260f3
 2020-06-12 22:42:12 +08:00
Andy Hung
48cffa3f31 statsd: Add audio device usage protos. 
MediaMetricsAudioRecordDeviceUsageReported
MediaMetricsAudioThreadDeviceUsageReported
MediaMetricsAudioTrackDeviceUsageReported
MediaMetricsAudioDeviceConnectionReported

Test: adb shell dumpsys stats --metadata (check 294-297)
Test: statsd_testdrive (294-297)
Bug: 149850236
Bug: 158038205
Change-Id: Idf4e324c06ed3586ba71745d110e721d290a5726
 2020-06-12 07:06:28 -07:00
Automerger Merge Worker
26fd2e4527 Merge "Merge "Reject flings on seek bar" into rvc-dev am: 8140ae8d22 am: 1d31d572a3 am: c0c9981e13" into rvc-qpr-dev-plus-aosp 2020-06-12 13:55:59 +00:00
Robert Snoeberger
b9b6697319 Merge "Reject flings on seek bar" into rvc-dev am: 8140ae8d22 am: 8dfbbc2a6e am: 48081dd129 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11831680

Change-Id: Ib5da987f621733f154396205b59432bb55be4f97
 2020-06-12 13:55:44 +00:00
Robert Snoeberger
906ebbedcb Merge "Reject flings on seek bar" into rvc-dev am: 8140ae8d22 am: 1d31d572a3 am: c0c9981e13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11831680

Change-Id: Ic2ad65d1f9f1c451b0e874e9385a825b3661bc89
 2020-06-12 13:55:41 +00:00
Robert Snoeberger
d84f0fad7e Merge "Reject flings on seek bar" into rvc-dev am: 8140ae8d22 am: 1d31d572a3 am: 2772d88fd0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11831680

Change-Id: I7163204614d013d338f3e2a40bd3cd3c01e70ea6
 2020-06-12 13:55:25 +00:00
Robert Snoeberger
48081dd129 Merge "Reject flings on seek bar" into rvc-dev am: 8140ae8d22 am: 8dfbbc2a6e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11831680

Change-Id: Ic1e4887bcb76efe298d06717f4bcd79c0d5b6c88
 2020-06-12 13:49:42 +00:00
Robert Snoeberger
c0c9981e13 Merge "Reject flings on seek bar" into rvc-dev am: 8140ae8d22 am: 1d31d572a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11831680

Change-Id: I82bd469b0817bbc1e50224fab3df39410b28a8ed
 2020-06-12 13:42:33 +00:00
Robert Snoeberger
2772d88fd0 Merge "Reject flings on seek bar" into rvc-dev am: 8140ae8d22 am: 1d31d572a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11831680

Change-Id: If2e38075cfae98e467f7a776013ae1f119729b02
 2020-06-12 13:42:12 +00:00
Automerger Merge Worker
40a795dbe2 Merge "Merge "Handle a pair of hearing aid devcies" into rvc-dev am: 93e4930a97 am: 81d14d3d6e am: 8bf90c041b" into rvc-qpr-dev-plus-aosp 2020-06-12 13:36:53 +00:00
Kyunglyul Hyun
6d367c5c69 Merge "Handle a pair of hearing aid devcies" into rvc-dev am: 93e4930a97 am: 81d14d3d6e am: 8bf90c041b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833792

Change-Id: Id1f6788cf82bbab83ce8bc6e5e91cfd2427f0e09
 2020-06-12 13:36:38 +00:00
Automerger Merge Worker
17e2cd4d13 Merge "Merge "Handle a pair of hearing aid devcies" into rvc-dev am: 93e4930a97 am: b10bbe5efc" into rvc-d1-dev-plus-aosp am: a666b7238a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833792

Change-Id: Ic7343816eb48068464bad062feb86387229836ac
 2020-06-12 13:36:36 +00:00
Kyunglyul Hyun
d1bc4952cc Merge "Handle a pair of hearing aid devcies" into rvc-dev am: 93e4930a97 am: 81d14d3d6e am: ce3e1b7f94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833792

Change-Id: I57f6c76878c2f0d1db67e36ef1111479b94ba286
 2020-06-12 13:36:20 +00:00
Adrian Roos
cb32080a8f Settings: make SHOW_IME_WITH_HARD_KEYBOARD TestApi 
Bug: 158637229
Test: atest WindowInsetsAnimationControllerTests
Change-Id: Ic4e1c97e728aa170670356db22d66677710ac2a3
 2020-06-12 15:31:20 +02:00
Robert Snoeberger
1d31d572a3 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: I81e469393c91cbb60b55a34dcfc13dadd5d9581c
 2020-06-12 13:29:56 +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
Automerger Merge Worker
a666b7238a Merge "Merge "Handle a pair of hearing aid devcies" into rvc-dev am: 93e4930a97 am: b10bbe5efc" into rvc-d1-dev-plus-aosp 2020-06-12 13:25:11 +00:00
Kyunglyul Hyun
50ec3ecae5 Merge "Handle a pair of hearing aid devcies" into rvc-dev am: 93e4930a97 am: b10bbe5efc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833792

Change-Id: I52dbb96c9994a92ae1e6c4d19896d29afeaeeef7
 2020-06-12 13:24:57 +00:00
Kyunglyul Hyun
ce3e1b7f94 Merge "Handle a pair of hearing aid devcies" into rvc-dev am: 93e4930a97 am: 81d14d3d6e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833792

Change-Id: I20a09b22836c30e770effb806c91e116715a1df6
 2020-06-12 13:24:39 +00:00
Kyunglyul Hyun
8bf90c041b Merge "Handle a pair of hearing aid devcies" into rvc-dev am: 93e4930a97 am: 81d14d3d6e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833792

Change-Id: I392e917aaebbe7218da1e86cee6cec3d8d854bb7
 2020-06-12 13:24:34 +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
81d14d3d6e 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: If329169388e283f656d0a379e935d995a8393ff7
 2020-06-12 13:06:40 +00:00
Kyunglyul Hyun
93e4930a97 Merge "Handle a pair of hearing aid devcies" into rvc-dev 2020-06-12 12:55:24 +00:00
Automerger Merge Worker
886b72eca2 Merge "Merge "Merge "Ensure to trigger Activity#onEnterAnimationComplete" into rvc-dev am: b749be45c7 am: 6663f2cc3a" into rvc-d1-dev-plus-aosp am: 727ea0a54a" into rvc-qpr-dev-plus-aosp 2020-06-12 12:22:13 +00:00
Automerger Merge Worker
ec9419ac13 Merge "Merge "Ensure to trigger Activity#onEnterAnimationComplete" into rvc-dev am: b749be45c7 am: 6663f2cc3a" into rvc-d1-dev-plus-aosp am: 727ea0a54a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838100

Change-Id: Id4e0b0e8e3a307523d3a6d551ddbce1d39b094a6
 2020-06-12 12:21:58 +00:00
Issei Suzuki
08ae1f06df Merge "Ensure to trigger Activity#onEnterAnimationComplete" into rvc-dev am: b749be45c7 am: ca6e2b7211 am: 047c325a60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838100

Change-Id: I076a72de29ce9947ea935f800a1d07729333e6b1
 2020-06-12 12:21:38 +00:00
Issei Suzuki
ab7d5bb60a Merge "Ensure to trigger Activity#onEnterAnimationComplete" into rvc-dev am: b749be45c7 am: ca6e2b7211 am: 010fa13378 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838100

Change-Id: I7bc51d3bf268e26ad4f113e0388c8044bd82816b
 2020-06-12 12:21:18 +00:00
Automerger Merge Worker
727ea0a54a Merge "Merge "Ensure to trigger Activity#onEnterAnimationComplete" into rvc-dev am: b749be45c7 am: 6663f2cc3a" into rvc-d1-dev-plus-aosp 2020-06-12 12:05:57 +00:00
Issei Suzuki
95adf31988 Merge "Ensure to trigger Activity#onEnterAnimationComplete" into rvc-dev am: b749be45c7 am: 6663f2cc3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838100

Change-Id: Iaf274d2f40f7f06831e276f4bc2242f7e0ffd947
 2020-06-12 12:05:43 +00:00
Issei Suzuki
010fa13378 Merge "Ensure to trigger Activity#onEnterAnimationComplete" into rvc-dev am: b749be45c7 am: ca6e2b7211 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838100

Change-Id: Ide7e8bcdf93323313775a8883f859245cccc44ec
 2020-06-12 12:05:37 +00:00
Issei Suzuki
047c325a60 Merge "Ensure to trigger Activity#onEnterAnimationComplete" into rvc-dev am: b749be45c7 am: ca6e2b7211 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838100

Change-Id: I8b77531a2afd3639c493c5f7ab01bb9077bc5f2e
 2020-06-12 12:05:36 +00:00
Hyundo Moon
ac9df100f5 Clear preferred feature when unregistering MediaRouter2 
MediaRouter2Managers' preferred feature didn't get cleared even when the
MediaRouter2 is unregistered/died. As a result, when an app is
reinstalled/relaunched, the routes for the previous process are still
shown in the MediaRouter2Manager.

This CL fixes the problem.

Bug: 158824569
Test: Passed CTS and mediaroutertest
      Also tested with reinstalling support7Demos.
Change-Id: Ib5d84c41862177af32931e0d69b02f461105bba6
 2020-06-12 21:01:56 +09: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
ca6e2b7211 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: Id86cf8c2b0dd45d1205dd1d851636612401a5e47
 2020-06-12 11:43:59 +00:00
Issei Suzuki
b749be45c7 Merge "Ensure to trigger Activity#onEnterAnimationComplete" into rvc-dev 2020-06-12 11:31:55 +00:00
Neil Fuller
5fa4955154 Fix a remove*Listener call that doesn't remove 
Fix a remove*Listener call that doesn't remove the listener.

Bug: 158819132
Test: Build only
Merged-In: I67b57e8df8a6d39622999634cefdc267fc07ecae
Change-Id: I67b57e8df8a6d39622999634cefdc267fc07ecae
(cherry picked from commit 9a44590efa)
 2020-06-12 11:34:34 +01:00
Lyn Han
1c442e559c Up char limit for dismiss option in manage menu 
Requested by translators

Fixes: 158764580
Test: no effect
Change-Id: I11a4f86b70f6b524f8f6f13aceea3219e92aca8d
 2020-06-12 03:25:54 -07:00
Chiachang Wang
2153861f8e Test extra info sent to NetworkMonitor 
Test extra info sent to NetworkMonitor correctly if network
agent is created through new NetworkAgent constructor without
legacy network info taken as parameter.

Bug: 156173829
Test: atest FrameworkNetTests
Change-Id: I4f827664c528bea30cc957a0a617dd37693f4460
 2020-06-12 18:13:00 +08: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
Automerger Merge Worker
809b88a7f8 Merge "Merge "GnssStats atom entity name change" into rvc-dev am: 6dca466770 am: 617a72f3dc am: 5ffabbbb91" into rvc-qpr-dev-plus-aosp 2020-06-12 09:01:39 +00:00
TreeHugger Robot
b313002a55 Merge "GnssStats atom entity name change" into rvc-dev am: 6dca466770 am: 617a72f3dc am: 5ffabbbb91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838738

Change-Id: If15341e788998816a507d6a358234b425dc16289
 2020-06-12 09:01:23 +00:00
Automerger Merge Worker
5126acd084 Merge "Merge "GnssStats atom entity name change" into rvc-dev am: 6dca466770 am: 617a72f3dc" into rvc-d1-dev-plus-aosp am: b161dfeb3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838738

Change-Id: I43760ef85c23b31a982ce64fcb2613bc043f1cd2
 2020-06-12 09:01:22 +00:00
Automerger Merge Worker
6af313a2a3 Merge "Merge "Increase configs per uid limit to 20" into rvc-dev am: d4d283e67d am: ea74ace506 am: 032062ba12" into rvc-qpr-dev-plus-aosp 2020-06-12 09:01:19 +00:00
TreeHugger Robot
dcb3d74738 Merge "GnssStats atom entity name change" into rvc-dev am: 6dca466770 am: 238232ad88 am: ed3d4489d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838738

Change-Id: Ie5f79ae221fbf85c0564790049df4c4570decce6
 2020-06-12 09:01:04 +00:00
TreeHugger Robot
fc8cc01454 Merge "Increase configs per uid limit to 20" into rvc-dev am: d4d283e67d am: ea74ace506 am: 032062ba12 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844170

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

Change-Id: Ia88d58f4d1f40fc656a2d67081aba1564d5883f3
 2020-06-12 09:00:41 +00:00
TreeHugger Robot
fef95db6d5 Merge "Increase configs per uid limit to 20" into rvc-dev am: d4d283e67d am: ea74ace506 am: 0074b79eb0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844170

Change-Id: I43d6a0ecff10deb503949c07f5c81b7ec6e95a75
 2020-06-12 09:00:04 +00:00
TreeHugger Robot
5ffabbbb91 Merge "GnssStats atom entity name change" into rvc-dev am: 6dca466770 am: 617a72f3dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838738

Change-Id: I789d9d70a9e41d748867493e22b2314c653110db
 2020-06-12 08:46:15 +00:00