Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
490,492 Commits 3 Branches 0 Tags
7dfe98eb630f4ba392a8e74cd5b2d6d1168d326c
Commit Graph

490492 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
7dfe98eb63 [automerger skipped] Merge "Set correct owner UID for VPN agentConnect()" into rvc-dev am: b85fc66146 -s ours 
am skip reason: Change-Id Ic979dad73983d722365849fbfb0becfd432b894c with SHA-1 212b7e9edb is in history

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

Change-Id: I7df1004e885ff680a48d57e41987eb12f990875c
 2020-06-17 15:35:35 +00:00
Taran Singh
11f5d41c2d Merge "Don't allow pinned window to be IME target" into rvc-dev am: 218e017d93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11875421

Change-Id: Iaa05008515db5f8c1d3e653f900a31988f7dffd7
 2020-06-17 15:35:08 +00:00
TreeHugger Robot
94ba1f28c4 Merge "Statsd log for app notification bans." into rvc-dev am: 4c3e345502 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881552

Change-Id: I3add0231a90e5eb8a84ecce4bf93fcdce33b89f9
 2020-06-17 15:34:55 +00:00
TreeHugger Robot
460f96dddc [automerger skipped] Merge "Treat RouteInfo with different interfaces as different routes" into rvc-dev am: 70e3f56147 -s ours 
am skip reason: Change-Id I57987233d42a0253eaee2e1ca5f28728c2354620 with SHA-1 c3dec3448d is in history

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

Change-Id: I0b5d3d42ac9310e71262a7e8cf21af51b75837c4
 2020-06-17 15:34:30 +00:00
TreeHugger Robot
b85fc66146 Merge "Set correct owner UID for VPN agentConnect()" into rvc-dev 2020-06-17 15:26:22 +00:00
Taran Singh
218e017d93 Merge "Don't allow pinned window to be IME target" into rvc-dev 2020-06-17 15:25:07 +00:00
TreeHugger Robot
4c3e345502 Merge "Statsd log for app notification bans." into rvc-dev 2020-06-17 15:25:01 +00:00
TreeHugger Robot
70e3f56147 Merge "Treat RouteInfo with different interfaces as different routes" into rvc-dev 2020-06-17 15:22:03 +00:00
Antoan Angelov
909af45cf0 Merge "Re-setup viewpager on configuration change for RTL languages" into rvc-dev am: acfac74964 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11894160

Change-Id: I94e13a55fc5923ed0272524e2746bd1f2acc2144
 2020-06-17 15:11:43 +00:00
Antoan Angelov
e0624684c9 Merge "Disable side swiping on RTL languages" into rvc-dev am: 46b4296beb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11880480

Change-Id: I073bad6ae93865dac49ff8715cf7e969cd5f11a7
 2020-06-17 15:10:55 +00:00
Antoan Angelov
acfac74964 Merge "Re-setup viewpager on configuration change for RTL languages" into rvc-dev 2020-06-17 15:00:51 +00:00
Antoan Angelov
46b4296beb Merge "Disable side swiping on RTL languages" into rvc-dev 2020-06-17 14:59:51 +00:00
Treehugger Robot
faa8d92090 Merge "Preserve interrupted state across waiting for future" am: 3a91c75184 am: f6574a21c2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340128

Change-Id: Ica523ae5269ba5e2a339653024870fefa581ad64
 2020-06-17 14:53:00 +00:00
Treehugger Robot
f6574a21c2 Merge "Preserve interrupted state across waiting for future" am: 3a91c75184 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340128

Change-Id: Ida3616549a4d42d381ac414c2e82a638e38c17a2
 2020-06-17 14:34:44 +00:00
TreeHugger Robot
0b235515ce Merge "Revert "Add logs that indicate why a surface is invalid"" into rvc-dev am: d82080094e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11874469

Change-Id: I744413842bbc74724268c1fe58187a74f4d90461
 2020-06-17 14:15:17 +00:00
Treehugger Robot
3a91c75184 Merge "Preserve interrupted state across waiting for future" 2020-06-17 14:08:13 +00:00
TreeHugger Robot
d82080094e Merge "Revert "Add logs that indicate why a surface is invalid"" into rvc-dev 2020-06-17 14:00:34 +00:00
Will Brockman
7575e053b2 Statsd log for app notification bans. 
I accidentally omitted logging for the event of banning/unbanning
notifications for the entire app, when I added notification
channel ban logging in ag/10450892.

Change-Id: Ibf2be1367bf41ad2b431cfcd2fef820ff270fed9
Test: atest PreferencesHelperTest
Bug: 156398451
 2020-06-17 13:59:26 +00:00
TreeHugger Robot
8ce6beda23 Merge "Controls UI - Properly sort, and set default on seed" into rvc-dev am: f21036b4e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11851787

Change-Id: I9ac3608af845f6d5a02523ff8e787e6053300181
 2020-06-17 13:38:38 +00:00
Treehugger Robot
2f2dab0158 Treat RouteInfo with different interfaces as different routes 
On Android different interfaces usually use different routing tables.
As a result, a change in interface should not be treated as route
update, but rather a remove and an add.

This change fixes a bug in VPN seamless handover where routes
failed to be updated when a new tunnel interface replaces the existing
one within the same network.

Bug: 158696878
Test: atest com.android.cts.net.HostsideVpnTests
Test: atest NetworkStackTests
Test: atest CtsNetTestCases
Test: atest FrameworksNetTests
Original-Change: https://android-review.googlesource.com/1331916
Merged-In: I57987233d42a0253eaee2e1ca5f28728c2354620
Change-Id: I57987233d42a0253eaee2e1ca5f28728c2354620
 2020-06-17 13:34:11 +00:00
TreeHugger Robot
f21036b4e7 Merge "Controls UI - Properly sort, and set default on seed" into rvc-dev 2020-06-17 13:27:11 +00:00
Treehugger Robot
4f52c1aa0d Merge "Treat RouteInfo with different interfaces as different routes" am: 4156ab6937 am: 4c3d479c7d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331916

Change-Id: I2f4d88aa74588e8ed27c5d0abcb9a6919f26f27d
 2020-06-17 13:21:06 +00:00
Treehugger Robot
4c3d479c7d Merge "Treat RouteInfo with different interfaces as different routes" am: 4156ab6937 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331916

Change-Id: Ibe919ea7c2096094fdb48fc91881d9f19678ac50
 2020-06-17 13:07:42 +00:00
arangelov
5f416b9452 Re-setup viewpager on configuration change for RTL languages 
Otherwise rotating the device while showing a tab with RTL
shows blank tab content. This could be due to ViewPager
bugs when handling RTL.

Fixes: 158862939
Test: manually rotating the device with RTL layout
Test: manually rotating the device with LTR layout
Change-Id: Iba4c71cf88747d6fbbc36d19b5102460e8aa7cec
 2020-06-17 12:57:47 +00:00
Treehugger Robot
4156ab6937 Merge "Treat RouteInfo with different interfaces as different routes" 2020-06-17 12:51:08 +00:00
Jorim Jaggi
e1f741becf Revert "Add logs that indicate why a surface is invalid" 
This reverts commit 0fd6748bf6.

Bug: 159056748
Change-Id: I850c0d29e07c74143868c6c63cef63649a449c9e
 2020-06-17 14:12:50 +02:00
Rubin Xu
c3dec3448d Treat RouteInfo with different interfaces as different routes 
On Android different interfaces usually use different routing tables.
As a result, a change in interface should not be treated as route
update, but rather a remove and an add.

This change fixes a bug in VPN seamless handover where routes
failed to be updated when a new tunnel interface replaces the existing
one within the same network.

Bug: 158696878
Test: atest com.android.cts.net.HostsideVpnTests
Test: atest NetworkStackTests
Test: atest CtsNetTestCases
Test: atest FrameworksNetTests
Change-Id: I57987233d42a0253eaee2e1ca5f28728c2354620
 2020-06-17 12:01:41 +01:00
arangelov
9a960b740e Disable side swiping on RTL languages 
The internal ViewPager seems to not handle RTL well. This CL
disables side swiping in that case.

Fixes: 159110029
Test: manually confirmed side swiping does not happen on RTL
languages
Test: manually side swiped on non-RTL languages

Change-Id: I30272426d1d1ef4f17ec656630cee01505f66c59
 2020-06-17 10:15:38 +00:00
TreeHugger Robot
e250de1539 Merge "CEC: Prevent overwriting volume control Settings" into rvc-dev am: 58fd58dea7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11859734

Change-Id: I8a4046dbf8dddd944d666eb9317725e253f17617
 2020-06-17 09:27:05 +00:00
Aaron Huang
cf15e30f81 [automerger skipped] Merge "Add unit test for NetworkStatsSubscriptionsMonitor" am: ad9a0e7713 am: 4535e1ddca -s ours 
am skip reason: Change-Id I4ef3f1ab2e5ea1322133edd80db3ccd0022e9c91 with SHA-1 e4e86e1cad is in history

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

Change-Id: I11b25c0832d6959e77bbabbfce53cdedce922279
 2020-06-17 09:21:52 +00:00
TreeHugger Robot
58fd58dea7 Merge "CEC: Prevent overwriting volume control Settings" into rvc-dev 2020-06-17 09:13:15 +00:00
Aaron Huang
4535e1ddca Merge "Add unit test for NetworkStatsSubscriptionsMonitor" am: ad9a0e7713 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1298476

Change-Id: I1b191cd4706a7409794d382bda95ef6933b019a1
 2020-06-17 09:09:13 +00:00
Aaron Huang
ad9a0e7713 Merge "Add unit test for NetworkStatsSubscriptionsMonitor" 2020-06-17 08:52:20 +00:00
Lucas Dupin
f010710204 Merge "Fix clipping while scrolling" into rvc-dev am: 4c6f3ff3e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11889960

Change-Id: I3726096568f444d43fdea56840d022b62c493cb0
 2020-06-17 07:51:59 +00:00
Lucas Dupin
4c6f3ff3e2 Merge "Fix clipping while scrolling" into rvc-dev 2020-06-17 07:35:01 +00:00
Tiger Huang
3f94c62f03 Merge "Exclude translation caused by surface insets from the matrix" into rvc-dev am: 126e671343 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788480

Change-Id: Icb4d916b6fc6334852625b744158922b411946cb
 2020-06-17 07:17:02 +00:00
Tiger Huang
126e671343 Merge "Exclude translation caused by surface insets from the matrix" into rvc-dev 2020-06-17 07:04:33 +00:00
Nucca Chen
437b7d740e Merge "[BOT.13] Make offload coordinator poll interval configurable" am: 8b7c9a2f87 am: 558d3e3ad2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1315576

Change-Id: Ia1befc327f71df979bd60cb4fcb96a0ed69afbef
 2020-06-17 06:33:42 +00:00
Nucca Chen
c4883a6dab Merge "[BOT.12] Add unit test for disabling BpfCoordinator by config" am: 6241525504 am: d36e818816 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313802

Change-Id: Ica3e4752091c3460296f7d06ccb1e0827aec29f6
 2020-06-17 06:33:31 +00:00
Nucca Chen
e75aaeef1d Merge "[BOT.11] BpfCoordinator could be disabled by device config" am: e8c985be78 am: 36e37ff125 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313955

Change-Id: If0f1df54216517aff5af0ce4ae120b25d7fdbaf6
 2020-06-17 06:32:52 +00:00
Nucca Chen
0fd40db219 Merge "[BOT.8] Dump BPF offload information in dumpsys" am: e765ab3d36 am: 52d3db170e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1302438

Change-Id: Ifd56fe444a7610736eb9f915f8df70f73eec8c02
 2020-06-17 06:32:35 +00:00
Nucca Chen
4333e09e98 Merge "[BOT.10] Add unit test for data limit and rule change in BpfCoordinator" am: 8392e11329 am: 0d295a8642 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1311659

Change-Id: I9e6a6c89a080d7b168d31f390cc6241c252e7341
 2020-06-17 06:31:45 +00:00
Mark Chien
fab93a708c Merge "Revert "Revert "Pass entitlement configuration to Settings for entitlement check""" into rvc-dev am: 36806fa822 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836350

Change-Id: Ibfea2e6f2564942eca60c84a5df5583acc1b9e8b
 2020-06-17 06:24:22 +00:00
Nucca Chen
558d3e3ad2 Merge "[BOT.13] Make offload coordinator poll interval configurable" am: 8b7c9a2f87 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1315576

Change-Id: I6a3c730eb16161fcc9b2555752de1fae4f42905c
 2020-06-17 06:16:43 +00:00
Nucca Chen
d36e818816 Merge "[BOT.12] Add unit test for disabling BpfCoordinator by config" am: 6241525504 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313802

Change-Id: I08e64605c4378b6ad4bcac66ca7054673138f1e0
 2020-06-17 06:15:57 +00:00
Nucca Chen
36e37ff125 Merge "[BOT.11] BpfCoordinator could be disabled by device config" am: e8c985be78 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313955

Change-Id: Ibd4c8dd7af8f61e052c2766f79ad7d90b8f143c8
 2020-06-17 06:14:59 +00:00
Nucca Chen
52d3db170e Merge "[BOT.8] Dump BPF offload information in dumpsys" am: e765ab3d36 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1302438

Change-Id: I2f6006d1b3332be443fbece81492610f971446b0
 2020-06-17 06:13:52 +00:00
Nucca Chen
0d295a8642 Merge "[BOT.10] Add unit test for data limit and rule change in BpfCoordinator" am: 8392e11329 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1311659

Change-Id: Iac09b89bbb93ab1660005dcbf39cb33242ed4db7
 2020-06-17 06:13:05 +00:00
Mark Chien
36806fa822 Merge "Revert "Revert "Pass entitlement configuration to Settings for entitlement check""" into rvc-dev 2020-06-17 06:07:52 +00:00
Nucca Chen
8b7c9a2f87 Merge "[BOT.13] Make offload coordinator poll interval configurable" 2020-06-17 06:03:41 +00:00