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
Aaron Huang
7b30d4ce1f [automerger skipped] Merge "Add unit test for NetworkStatsSubscriptionsMonitor" am: ad9a0e7713 am: 4535e1ddca -s ours am: cf15e30f81 -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: I2058092be5426269fc93e209517a0d01c2fab1ec
 2020-06-17 09:34:01 +00:00
Vadim Caen
a8849f27bc Ignore rotation update during recent animation. 
During the recent animation, the closing app is still considered on top
and its required orientation is used for the next rotation computation.

When going to launcher and rotating the device at the same time, a
rotation update is triggered by the sensor and if the closing app allows
a change of orientation, the display ends up rotating at the end of the
animation, which make the launcher rotate even if it is not supposed to
do so.

Test: atest
WmTests: com.android.server.wm.DisplayContentTests#testRecentsNotRotatingWithFixedRotation
Fixes: 157447718
Change-Id: I3f2a46ddfe5e76ad3200ea27ad272ae36b6bcc8d
 2020-06-17 11:32:13 +02: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
cc32026e39 Merge "Fix clipping while scrolling" into rvc-dev am: 4c6f3ff3e2 am: f010710204 am: 63711e0d44 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11889960

Change-Id: I2e9702a02172d0dde93b46f911e02cdc31ce115a
 2020-06-17 08:23:48 +00:00
Lucas Dupin
63711e0d44 Merge "Fix clipping while scrolling" into rvc-dev am: 4c6f3ff3e2 am: f010710204 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11889960

Change-Id: Id9886fc11b96e3f39d3a38bf32d9d2e74892d96e
 2020-06-17 08:09:56 +00:00
Aaron Huang
3a2e972406 Dynamically enable/disable watch for RAT type changes 
Add ContentObserver to observe the status of
NETSTATS_COMBINE_SUBTYPE_ENABLED to determine that
NetworkStatsSubscriptionsMonitor start or stop
monitoring data usage per RAT type changes.

Bug: 154080515
Test: atest NetworkStatsServiceTest#testDynamicWatchForNetworkRatTypeChanges
Change-Id: I272d589633c9186b45753228b05aa0b40b7c7b89
 2020-06-17 17:09:10 +09:00
Ming-Shin Lu
1a9f73878f Fix NPE on WindowContainer#isOnTop 
RecentsAnimationController#removeTask will use WC#isOnTop
to check if can accept the remote animation task target removal.

However, it may hit the timing that the parent of the task might be
removed prior than removeTask called, so caued exception during
WC#getParent().

Add null check in WC#inOnTop to return false when WC#getParent is null.

Bug: 158937083
Test: atest WindowContainerTests
Change-Id: I17b1f709722f573af6efcd00523d434766bca800
 2020-06-17 16:02:25 +08: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
Tiger Huang
ef01714ef7 Merge "Exclude translation caused by surface insets from the matrix" into rvc-dev am: 126e671343 am: 3f94c62f03 am: 430f4f1a37 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788480

Change-Id: Ibf00576005bc2ef615240d680d30806507953729
 2020-06-17 07:51:32 +00:00
Nucca Chen
b9ad0b1833 [BOT.13] Make offload coordinator poll interval configurable 
Bug: 150736748
Test: BpfCoordinatorTest

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1315576
Merged-In: I7f8dde3b57ee14eb33edbe2fd383df33cccc231c
Change-Id: I70a6e5c8e765daf40cb738feb7fd70cf3c8f052d
(cherry picked from commit bea90943cd)
 2020-06-17 07:45:57 +00:00
Nucca Chen
1c63ba39fa [BOT.12] Add unit test for disabling BpfCoordinator by config 
Bug: 150736748
Test: BpfCoordinatorTest
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313802
Merged-In: Iedb936b7592b6be773d1b84a2498bfc5a440a198
Change-Id: I298ae39a1fa61b2cf97752aa908aa2d7d0f9783d
(cherry picked from commit abd6c03d22)
 2020-06-17 07:43:41 +00:00
Nucca Chen
3f856b48f9 [BOT.11] BpfCoordinator could be disabled by device config 
Bug: 150736748
Test: BpfCoordinatorTest
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313955
Merged-In: Id413b7f2f7edb2e5c3e02d5677fe536ed52fbbcb
Change-Id: I48a8de478c9200b8c9f88e785340fc7973e4a13f
(cherry picked from commit 41d61b6702)
 2020-06-17 07:40:40 +00:00
Lucas Dupin
4c6f3ff3e2 Merge "Fix clipping while scrolling" into rvc-dev 2020-06-17 07:35:01 +00:00
Kyunglyul Hyun
a8f2a06b51 Enable transfer to hearing aid routes. 
There was a bug that transfer fails when a BT route has the route ID
different from its hardware address.

Bug: 157708273
Bug: 152585170

Test: run CTS & manually by assigning random ID to BT devices, which
failed without this CL

Change-Id: Ib2183f96b135bd2cef317234a8532b10994ca86b
 2020-06-17 16:34:21 +09:00
Tiger Huang
430f4f1a37 Merge "Exclude translation caused by surface insets from the matrix" into rvc-dev am: 126e671343 am: 3f94c62f03 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788480

Change-Id: I25e4b6cd2c82848f58ac18de809baaf66d9fde60
 2020-06-17 07:34:01 +00:00
Nucca Chen
1f9efaff8d [BOT.8] Dump BPF offload information in dumpsys 
$ adb shell dumpsys tethering
BPF offload:
  Polling started
  Stats provider registered
  Upstream quota: {rmnet_data2=9223372036854775807}
  Forwarding stats:
    12(rmnet_data2) - ForwardedStats(rxb: 1065, rxp: 5, txb: 0, txp: 0)
  Forwarding rules:
    [wlan1]: iif(iface) oif(iface) v6addr srcmac dstmac
      12(rmnet_data2) 31(wlan1) /2401:e180:8831:77ae:a900:a03b:41fb..

Bug: 150736748
Test: Enable tethering on mobile data and check dumpsys tethering
Original-Change: https://android-review.googlesource.com/1302438
Merged-In: I95ea3050d92f3ba8136a63cd399d3450d183c8dc
Change-Id: I95ea3050d92f3ba8136a63cd399d3450d183c8dc
 2020-06-17 07:29:10 +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
8b24f0a028 Merge "[BOT.13] Make offload coordinator poll interval configurable" am: 8b7c9a2f87 am: 558d3e3ad2 am: 437b7d740e am: 56164f8462 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1315576

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

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

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

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

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

Change-Id: I843709e8daa6ae49417cb1749d0880ffefda6cee
 2020-06-17 06:49:06 +00:00
SongFerngWang
d1b164401e Add a carrier config for WFC's carrier name override by ef_pnn 
To override wifi calling's carrier name string using ef_pnn
from sim card.

Bug: 157108864
Test: UE with TMO sim card to test in Roaming and WFC on, and then
check operator name. (PASS)

Change-Id: Id72ce2a9a0fb8f45efa8a975e8052808f726a971
 2020-06-17 14:40:52 +08:00
Nucca Chen
56164f8462 Merge "[BOT.13] Make offload coordinator poll interval configurable" am: 8b7c9a2f87 am: 558d3e3ad2 am: 437b7d740e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1315576

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

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

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

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

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

Change-Id: Ie42e9d3f4310bc8e42eafda1e420bcdc3d8557f5
 2020-06-17 06:37:33 +00:00
Nucca Chen
796ee2f306 [BOT.10] Add unit test for data limit and rule change in BpfCoordinator 
The applying data limit is based on the forwarding rule changes.
Add the tests for verifying their interactions with netd.

Bug: 150736748
Test: BpfCoordinatorTest
Original-Change: https://android-review.googlesource.com/1311659
Merged-In: I5a98c4cd74e2de6005ee05defa761f6af3fd4e75
Change-Id: I5a98c4cd74e2de6005ee05defa761f6af3fd4e75
 2020-06-17 06:35:43 +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
TreeHugger Robot
3d34c594b0 Merge changes Ic92e29c6,I6e044606 into rvc-dev am: eb18301bd5 am: ef2ec0dbb4 am: 8579b272ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11886117

Change-Id: I895b5617e481580a3e69983f7a2f7f30f6dd0766
 2020-06-17 06:13:39 +00:00
Patrick Baumann
7a2c4b7762 Pre-cache filter results am: 0192f737ff am: 182b5f238a am: 1389bda829 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817533

Change-Id: Iffb7147ff14208505acb5fce32a79ab6c1f109bf
 2020-06-17 06:13:29 +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
TreeHugger Robot
db21d8643e Merge "Check resolved override bounds for attaching IME to activity" into rvc-dev am: 4e11c2445b am: cbab1a347b am: 617e143113 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881940

Change-Id: If1fb13a21f68a07d62443dcf25bf5782936f495e
 2020-06-17 06:12:39 +00:00