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
Matt Pietal
2020f93a13 Merge "Controls UI - Fix icon tint for custom icons" into rvc-dev 2020-06-22 15:11:47 +00:00
Matt Pietal
c472565de6 Merge "Controls UI - Use custom icon for favoriting" into rvc-dev 2020-06-22 15:11:26 +00:00
Ken Chen
0dcddd3b06 Update DnsManagerTest for AIDL interface change 
Check one more parameter enforceDnsUid in ResolverOptionsParcel in
DnsManagerTest.

Bug: 159587277
Test: atest
com.android.server.connectivity.DnsManagerTest#testSendDnsConfiguration

Change-Id: Ic53f42b968626294c851dac252a70769846ba427
Merged-In: Ic53f42b968626294c851dac252a70769846ba427
 2020-06-22 15:10:12 +00:00
TreeHugger Robot
ee9ca628ca Merge "Update DnsManagerTest for AIDL interface change" into rvc-dev 2020-06-22 15:09:54 +00:00
TreeHugger Robot
d3a0198031 Merge "Ignore onStartInput when WINDOW_FOCUS_GAIN_REPORT_WITH_SAME_EDITOR" into rvc-dev am: 70ad33113f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11863061

Change-Id: I44a6add590bdc70b99201a2c0e517d0815b8f9b5
 2020-06-22 15:01:26 +00:00
TreeHugger Robot
2d8df39d7c Merge "Ignore onStartInput when WINDOW_FOCUS_GAIN_REPORT_WITH_SAME_EDITOR" into rvc-dev am: 70ad33113f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11863061

Change-Id: If8d0a8fc85b7c595665d6b6cfe1cc8d31889fb67
 2020-06-22 14:59:51 +00:00
TreeHugger Robot
436cd0d488 [automerger skipped] Merge "Support DNS-over-TLS probes in NetworkDiagnostics" into rvc-dev am: b3d84ac6dd am: b677954b08 am: d2b01940b0 -s ours 
am skip reason: Change-Id I1b54abed0e931ca4b8a97149459cde54da1c3d6f with SHA-1 1a5e45e37d is in history

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

Change-Id: Id6193d59c9a5d82262e5200e6df321b03e299102
 2020-06-22 14:52:51 +00:00
TreeHugger Robot
b586b99ba9 [automerger skipped] Merge "Support DNS-over-TLS probes in NetworkDiagnostics" into rvc-dev am: b3d84ac6dd -s ours am: 3d98d21ffd -s ours am: 6cebb467c1 -s ours 
am skip reason: Change-Id I1b54abed0e931ca4b8a97149459cde54da1c3d6f with SHA-1 1a5e45e37d is in history

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

Change-Id: I2e0d589fc92ea58c256538562b7e6a6eb7b95d42
 2020-06-22 14:52:44 +00:00
TreeHugger Robot
72ab6c2bc4 [automerger skipped] Merge "Support DNS-over-TLS probes in NetworkDiagnostics" into rvc-dev am: b3d84ac6dd am: b677954b08 -s ours am: 6c55728545 -s ours 
am skip reason: Change-Id I1b54abed0e931ca4b8a97149459cde54da1c3d6f with SHA-1 6a49d466d2 is in history

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

Change-Id: Ib37a0e74c92305a3e52f152b586a84fc9d0c57e4
 2020-06-22 14:52:31 +00:00
TreeHugger Robot
70ad33113f Merge "Ignore onStartInput when WINDOW_FOCUS_GAIN_REPORT_WITH_SAME_EDITOR" into rvc-dev 2020-06-22 14:51:15 +00:00
TreeHugger Robot
6cebb467c1 [automerger skipped] Merge "Support DNS-over-TLS probes in NetworkDiagnostics" into rvc-dev am: b3d84ac6dd -s ours am: 3d98d21ffd -s ours 
am skip reason: Change-Id I1b54abed0e931ca4b8a97149459cde54da1c3d6f with SHA-1 1a5e45e37d is in history

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

Change-Id: Ifed6a7754342dd88b38832fb188876a77a733af1
 2020-06-22 14:41:25 +00:00
TreeHugger Robot
d2b01940b0 Merge "Support DNS-over-TLS probes in NetworkDiagnostics" into rvc-dev am: b3d84ac6dd am: b677954b08 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11940428

Change-Id: I94df565a023865fe75836c3b8bdf886786177d04
 2020-06-22 14:41:18 +00:00
TreeHugger Robot
6c55728545 [automerger skipped] Merge "Support DNS-over-TLS probes in NetworkDiagnostics" into rvc-dev am: b3d84ac6dd am: b677954b08 -s ours 
am skip reason: Change-Id I1b54abed0e931ca4b8a97149459cde54da1c3d6f with SHA-1 6a49d466d2 is in history

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

Change-Id: I8c007e82bb1f6c53c98678f2c3667dc615fdb6ac
 2020-06-22 14:41:14 +00:00
TreeHugger Robot
3d98d21ffd [automerger skipped] Merge "Support DNS-over-TLS probes in NetworkDiagnostics" into rvc-dev am: b3d84ac6dd -s ours 
am skip reason: Change-Id I1b54abed0e931ca4b8a97149459cde54da1c3d6f with SHA-1 6a49d466d2 is in history

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

Change-Id: I8c9e94f26b3fd0d72e718fc39d5047604b741868
 2020-06-22 14:28:08 +00:00
TreeHugger Robot
b677954b08 Merge "Support DNS-over-TLS probes in NetworkDiagnostics" into rvc-dev am: b3d84ac6dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11940428

Change-Id: Icb40fc91833cdcfb3c79303e4f08cabd60343242
 2020-06-22 14:27:54 +00:00
Tiger Huang
fc1c6b187d Merge "Only notify insets changed caused by z-order under some conditions" into rvc-dev am: 0d145e89c6 am: 4b164573c9 am: e760b2ce98 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11947521

Change-Id: I85eb981dcc8b67077a52223440b5c35b679ded3b
 2020-06-22 14:19:16 +00:00
Automerger Merge Worker
f6aa676fe1 Merge "Merge "Only notify insets changed caused by z-order under some conditions" into rvc-dev am: 0d145e89c6 am: 17a684fff4" into rvc-d1-dev-plus-aosp am: fc45e26095 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11947521

Change-Id: I5fdc084384859853fcfefb202414106c207a7a69
 2020-06-22 14:19:01 +00:00
Automerger Merge Worker
0b2e88890a Merge "Merge "Merge "Finish fixed rotation while the task has done transition" into rvc-dev am: 1a3468740a am: eb4731a06c" into rvc-d1-dev-plus-aosp am: b45df911a7" into rvc-qpr-dev-plus-aosp 2020-06-22 14:18:42 +00:00
Tiger Huang
c11f6bf86a Merge "Only notify insets changed caused by z-order under some conditions" into rvc-dev am: 0d145e89c6 am: 4b164573c9 am: 0131bc669e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11947521

Change-Id: Ib0ce059bb3d21f6f74b5f824b37e4ccae9c9866f
 2020-06-22 14:18:32 +00:00
Automerger Merge Worker
9746b9f973 Merge "Merge "Finish fixed rotation while the task has done transition" into rvc-dev am: 1a3468740a am: eb4731a06c" into rvc-d1-dev-plus-aosp am: b45df911a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11894999

Change-Id: If6b6eb5e5a0ea68962223712318ed92168526b55
 2020-06-22 14:18:32 +00:00
Automerger Merge Worker
3ef1f5dbd6 Merge "Merge "Finish fixed rotation while the task has done transition" into rvc-dev am: 1a3468740a am: eb4731a06c am: 76afce6ff0" into rvc-qpr-dev-plus-aosp 2020-06-22 14:18:26 +00:00
Will Brockman
61ae286a0f Update section enum for statsd notif panel logs. 
Add explicit mapping to reduce churn in the logs as notification section list changes.

Fixes: 159568541
Test: statsd_testdrive
Test: atest NotificationLoggerTest
Change-Id: I7f0fe1a4dbed4a4b965154230b937659026b7493
 2020-06-22 10:18:24 -04:00
TreeHugger Robot
ee81338525 Merge "Finish fixed rotation while the task has done transition" into rvc-dev am: 1a3468740a am: eb4731a06c am: 76afce6ff0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11894999

Change-Id: Ie6a2d3c302cf1608bad5ad6facadd6986d21145c
 2020-06-22 14:18:19 +00:00
Automerger Merge Worker
f6cfb1b53e Merge "Merge "Finish fixed rotation while the task has done transition" into rvc-dev am: 1a3468740a am: 9b5948f616 am: 0e00683b40" into rvc-qpr-dev-plus-aosp 2020-06-22 14:18:18 +00:00
TreeHugger Robot
2df350a13f Merge "Finish fixed rotation while the task has done transition" into rvc-dev am: 1a3468740a am: 9b5948f616 am: 0e00683b40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11894999

Change-Id: I528129f6b3ba7d00e4f90d4e1622b88e44c6da20
 2020-06-22 14:18:12 +00:00
TreeHugger Robot
069ae9664d Merge "Remove fixed-rotation-transform setting" into rvc-dev am: bda3156926 am: 3192bde425 am: 7bd5b7ca50 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11907893

Change-Id: Ifa5454b65210bf7ba5fdfd7c312c4dd4668d68d6
 2020-06-22 14:18:08 +00:00
TreeHugger Robot
f4f06e3b82 Merge "Remove fixed-rotation-transform setting" into rvc-dev am: bda3156926 am: 1bdc7a7092 am: d6add76319 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11907893

Change-Id: I0b0d1902b71ec513fc28b022bb59db865de7075a
 2020-06-22 14:17:58 +00:00
TreeHugger Robot
407109c246 Merge "Remove fixed-rotation-transform setting" into rvc-dev am: bda3156926 am: 3192bde425 am: 6790f66607 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11907893

Change-Id: Ie6708cfb4a1518f6b800d58e4350980f3bd6befe
 2020-06-22 14:17:29 +00:00
TreeHugger Robot
b3d84ac6dd Merge "Support DNS-over-TLS probes in NetworkDiagnostics" into rvc-dev 2020-06-22 14:15:40 +00:00
Mohammad Samiul Islam
f75619ecaf Verify staged session remain unchanged on system server reboot 
Since rebooting system server requires root, we had to create a new
internal test suite with root access.

Bug: 158283778
Test: StagedInstallInternalTest#
      testSystemServerRestartDoesNotEffectStagedSessions
Change-Id: Id37111c0e63025aabe58cc9c8ab39b0362f1aed4
 2020-06-22 15:12:11 +01:00
Matt Pietal
850f9387e3 Controls UI - Show timeout msg and not controls on error 
There was some confusion around people seeing all devices with a
status of 'device removed' on timeout. Show the msg instead and not
the favorited controls

Fixes: 159596183
Test: manually set load timeout to 1s
Change-Id: I7cb0f74c2080f3537f8df84ea5eb0fd779285dcf
 2020-06-22 10:08:28 -04:00
Tiger Huang
e760b2ce98 Merge "Only notify insets changed caused by z-order under some conditions" into rvc-dev am: 0d145e89c6 am: 4b164573c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11947521

Change-Id: I36e27e555c8eba32115ed15c747eacc407761aa0
 2020-06-22 14:03:50 +00:00
Automerger Merge Worker
fc45e26095 Merge "Merge "Only notify insets changed caused by z-order under some conditions" into rvc-dev am: 0d145e89c6 am: 17a684fff4" into rvc-d1-dev-plus-aosp 2020-06-22 14:03:49 +00:00
Automerger Merge Worker
b45df911a7 Merge "Merge "Finish fixed rotation while the task has done transition" into rvc-dev am: 1a3468740a am: eb4731a06c" into rvc-d1-dev-plus-aosp 2020-06-22 14:03:43 +00:00
Tiger Huang
c20146e41b Merge "Only notify insets changed caused by z-order under some conditions" into rvc-dev am: 0d145e89c6 am: 17a684fff4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11947521

Change-Id: Ic994f4009c516a4e1c9e7e3dac65530531283611
 2020-06-22 14:03:43 +00:00
Tiger Huang
0131bc669e Merge "Only notify insets changed caused by z-order under some conditions" into rvc-dev am: 0d145e89c6 am: 4b164573c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11947521

Change-Id: If8930329d0618cba6066690f6a5cb8e01f9c2a06
 2020-06-22 14:03:38 +00:00
TreeHugger Robot
6d94f2f4d6 Merge "Finish fixed rotation while the task has done transition" into rvc-dev am: 1a3468740a am: eb4731a06c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11894999

Change-Id: Ic3958ac075e04c7fe027fd0f3bbd55d76fed0cfe
 2020-06-22 14:03:33 +00:00
TreeHugger Robot
76afce6ff0 Merge "Finish fixed rotation while the task has done transition" into rvc-dev am: 1a3468740a am: eb4731a06c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11894999

Change-Id: I6ddc788590ab317277767908b9addfa2c27b2051
 2020-06-22 14:03:31 +00:00
TreeHugger Robot
0e00683b40 Merge "Finish fixed rotation while the task has done transition" into rvc-dev am: 1a3468740a am: 9b5948f616 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11894999

Change-Id: I3f2c2137d07f0a803875653fc69fcc2a3255a395
 2020-06-22 14:03:29 +00:00
TreeHugger Robot
d6add76319 Merge "Remove fixed-rotation-transform setting" into rvc-dev am: bda3156926 am: 1bdc7a7092 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11907893

Change-Id: I0fbd211b9579846a5b0a314cc6e2f876f19b0d07
 2020-06-22 14:03:20 +00:00
TreeHugger Robot
7bd5b7ca50 Merge "Remove fixed-rotation-transform setting" into rvc-dev am: bda3156926 am: 3192bde425 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11907893

Change-Id: Iaa0fae1f3c74f36dcd118059cfdfebb8515c551e
 2020-06-22 14:03:10 +00:00
TreeHugger Robot
6790f66607 Merge "Remove fixed-rotation-transform setting" into rvc-dev am: bda3156926 am: 3192bde425 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11907893

Change-Id: Ie90910ba5dc80d1f8e5e8e0f58c8b8bd5f308bbe
 2020-06-22 14:03:08 +00:00
Tiger Huang
17a684fff4 Merge "Only notify insets changed caused by z-order under some conditions" into rvc-dev am: 0d145e89c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11947521

Change-Id: Ib920759454d583ff7116617c05c1aa48629beb2e
 2020-06-22 13:57:34 +00:00
Tiger Huang
4b164573c9 Merge "Only notify insets changed caused by z-order under some conditions" into rvc-dev am: 0d145e89c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11947521

Change-Id: Iac09f97f9bacbcd5398a0d65b1810a2d7d27be41
 2020-06-22 13:57:33 +00:00
Tiger Huang
0d145e89c6 Merge "Only notify insets changed caused by z-order under some conditions" into rvc-dev 2020-06-22 13:53:57 +00:00
TreeHugger Robot
9b5948f616 Merge "Finish fixed rotation while the task has done transition" into rvc-dev am: 1a3468740a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11894999

Change-Id: I52e62f2f07a12982016db3ae2b62eb19172b293f
 2020-06-22 13:52:02 +00:00
TreeHugger Robot
eb4731a06c Merge "Finish fixed rotation while the task has done transition" into rvc-dev am: 1a3468740a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11894999

Change-Id: I540554a4dc6d2c9b38c38d3ec9e727bfdd945333
 2020-06-22 13:51:51 +00:00
TreeHugger Robot
1bdc7a7092 Merge "Remove fixed-rotation-transform setting" into rvc-dev am: bda3156926 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11907893

Change-Id: Ief183fa62c144ae15cd7ee282e42d75255070b0e
 2020-06-22 13:51:39 +00:00
TreeHugger Robot
3192bde425 Merge "Remove fixed-rotation-transform setting" into rvc-dev am: bda3156926 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11907893

Change-Id: Ib1a4495745f01d3cd5f76dfd43013c458ae9d01c
 2020-06-22 13:51:25 +00:00
Automerger Merge Worker
addd15961b Merge "Merge "Refresh both lists and pinning preferences on change." into rvc-dev am: 582aeba50c am: 45b4885a90 am: 0dfb5908be" into rvc-qpr-dev-plus-aosp 2020-06-22 13:45:56 +00:00