Bill Yi
9a0801dfa4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I76acee8bb5fad886f9b181f81c86467ddca25423
2020-11-12 15:38:07 -08:00
Mark Renouf
c2ae2b1299
Merge "Fix off-by-one error in scroll capture page limit check"
2020-11-12 14:54:22 +00:00
Wilson Wu
35ff914619
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix Keyboard shown after force stopped app package" into rvc-qpr-dev am: 61d1458157 am: 5d9e485533 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12999438
Change-Id: Idfc331653290b11d6e9280328fed9248a48321c9
2020-11-12 14:54:01 +00:00
Ming-Shin Lu
b74b4b24d1
[automerger skipped] [RESTRICT AUTOMERGE] Fix Keyboard shown after force stopped app package am: be3f005f01 am: 759b390f04 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12999438
Change-Id: Ibd4f2941b734cd85ad02c787e59cc4ec56dba18f
2020-11-12 14:53:46 +00:00
Anton Hansson
1a9cceff66
Merge "Remove the system-api-stubs-docs target" am: d0fb632e4b am: cca63b3099 am: 4d6f4e1374 am: 557f955774
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1496267
Change-Id: I4ab40120d1d2e6a2e4d70ea0fc9138a2f6c0e088
2020-11-12 14:53:24 +00:00
Wilson Wu
5d9e485533
Merge "[RESTRICT AUTOMERGE] Fix Keyboard shown after force stopped app package" into rvc-qpr-dev am: 61d1458157
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12999438
Change-Id: Iee8234c98f944d1bf5acb109da4eb199c010dee7
2020-11-12 14:32:09 +00:00
Ming-Shin Lu
759b390f04
[RESTRICT AUTOMERGE] Fix Keyboard shown after force stopped app package am: be3f005f01
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12999438
Change-Id: I709e4dc13d3d1659ca8214c6b0659a66fdca65a2
2020-11-12 14:32:00 +00:00
Anton Hansson
557f955774
Merge "Remove the system-api-stubs-docs target" am: d0fb632e4b am: cca63b3099 am: 4d6f4e1374
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1496267
Change-Id: Ic5d2a35176454a8bd3b921da5d87f7c083c5e588
2020-11-12 13:54:09 +00:00
Wilson Wu
61d1458157
Merge "[RESTRICT AUTOMERGE] Fix Keyboard shown after force stopped app package" into rvc-qpr-dev
2020-11-12 13:51:09 +00:00
Anton Hansson
4d6f4e1374
Merge "Remove the system-api-stubs-docs target" am: d0fb632e4b am: cca63b3099
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1496267
Change-Id: I17702d355bf1df961cb1b65332a83eb183567f5f
2020-11-12 13:36:38 +00:00
Anton Hansson
cca63b3099
Merge "Remove the system-api-stubs-docs target" am: d0fb632e4b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1496267
Change-Id: I5bd6ddf615d32ad6c7cb4aabadbfe9434c8ab78e
2020-11-12 13:00:06 +00:00
Anton Hansson
d0fb632e4b
Merge "Remove the system-api-stubs-docs target"
2020-11-12 12:28:16 +00:00
Chiachang Wang
503a0f8af1
Remove unnecessary jarjar rule
...
BasicShellCommandHandler will be interpreted to
com.android.connectivity.utils as defined in the jarjar rule for
ConnectivityService module but it cannot be applied in cts.
ConnectivityService does not need this rule currently. Remove it
to fix the missing class issue in the test.
Bug: 170598012
Fix: 173097447
Test: atest CtsNetTestCasesLatestSdk FrameworksNetTests
Change-Id: I3eff40e7dbee82ab902b0d59a62497f4c55cc2ff
2020-11-12 12:17:10 +00:00
Junyu Lai
983c0eff05
Merge changes I6a48d4db,I6741c41c,Ifec6bde5,Icd0717c5 am: 02bd168520 am: de83629fc1 am: 9672f71a14 am: f3fe586b5d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490617
Change-Id: I2c5895c223a5843cfe11a1736a243b6847ad1b9a
2020-11-12 10:19:29 +00:00
Ming-Shin Lu
be3f005f01
[RESTRICT AUTOMERGE] Fix Keyboard shown after force stopped app package
...
CL[1] add a check in IMMS#hideCurrentInputLocked to
ignore hide request when the current client or the current
input session is null for preventing switching IME may have
unexpected keyboard hidden when focusing the same window to
start input case.
A regression happens when forcing stop the app with focusing a editor
and show soft-keyboard, because the hide request ignored as the above
mentioned, so keyboard will be shown after the next input connection
started since the mShowRequested didn't set to false by hidden request.
As CL[2] uses sameWindowFocused to check all possible hide current
keyboard call places in startInputOrWindowGainedFocusInternalLocked to
hide soft-keyboard only when the window focus changes, so we should
revert the check in IMMS#hideCurrentInputLocked to fix this keyboard
visiblity issue.
[1]: I37ae6e30d1de581ba15131c2a90396b3a522a4d6
[2]: I20e8076acc5fec3c055af0740e2e2a64b1fb6f0d
Note that the QPR version of [1] already includes the follow-up
changes in [2].
Fixes: 171009669
Test: atest KeyboardVisibilityControlTest
Change-Id: I92accb513b728820a3043b365aa5fa4f3a1a34a5
2020-11-12 10:12:59 +00:00
Shubang Lu
19bb47aa4f
Merge "Add media playback atom"
2020-11-12 10:10:36 +00:00
Junyu Lai
f3fe586b5d
Merge changes I6a48d4db,I6741c41c,Ifec6bde5,Icd0717c5 am: 02bd168520 am: de83629fc1 am: 9672f71a14
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490617
Change-Id: Ie76caf460ac86251cd0ceca981bdf2c7e4bcfc44
2020-11-12 09:47:50 +00:00
Junyu Lai
9672f71a14
Merge changes I6a48d4db,I6741c41c,Ifec6bde5,Icd0717c5 am: 02bd168520 am: de83629fc1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490617
Change-Id: I11a56ed8d67f321a66fecc7550383db7d9f9c897
2020-11-12 09:35:38 +00:00
Junyu Lai
de83629fc1
Merge changes I6a48d4db,I6741c41c,Ifec6bde5,Icd0717c5 am: 02bd168520
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490617
Change-Id: I5545dddcb5c8499ac9c53325cbafd424124429e1
2020-11-12 09:02:13 +00:00
Alex Johnston
6fa73c8e20
Merge "Move isAdminTestOnlyLocked inside synchronized block"
2020-11-12 08:55:53 +00:00
TreeHugger Robot
9c68993941
Merge "Add benchmarks for ViewRootImpl InputStage"
2020-11-12 08:46:45 +00:00
Junyu Lai
02bd168520
Merge changes I6a48d4db,I6741c41c,Ifec6bde5,Icd0717c5
...
* changes:
Remove unused variables
Return offloaded traffic when querying from TrafficStats API
Add hardware tethering traffic in testTethering test
Remove unused getTetherStats
2020-11-12 08:45:15 +00:00
shubang
25d4184190
Add media playback atom
...
Bug: 159337195
Test: make
Change-Id: Id0fef718bbcf131c71f50fccc020115e3a9481d4
2020-11-12 00:19:44 -08:00
TreeHugger Robot
54e28edd2f
Merge "Remove unused variable in VolumeControlAction"
2020-11-12 07:04:14 +00:00
Soonil Nagarkar
c1d8bffb36
Merge "Give ServiceWatcher a proper lifecycle"
2020-11-12 06:55:24 +00:00
junyulai
845f3a61ae
Remove unused variables
...
From aosp/537809, variables that used to fetch realtime
stats are defined in NetworkStatsService. These varialbles
are filled by JNI in boot up stage in order to keep
definitions sync with native layer.
However, there is still a copy in TrafficStats.java, and this
copy cannot be filled in boot-up stage since it is in app
process. Besides, making a binder call to fetch these
constants from service is considered an overkill.
Thus, since there is no caller to these variables and callers
should use definitions in TrafficStats, remove these variables.
Test: atest FrameworksNetTests
Bug: 16229221
Change-Id: I6a48d4dbb1b824cfc6c4a47395b2a76aa28cf5c9
2020-11-12 14:22:31 +08:00
junyulai
e5d0585e2c
Return offloaded traffic when querying from TrafficStats API
...
TrafficStats API are being used for querying realtime network
statistics for years. However, on certain devices, some network
traffic are produced by hardware components and not be
able to seen by kernel counters.
Thus, include statistics for those missing network traffic is
necessary. Note that the included statistics might be stale
since polling newest stats from hardware might impact system
health and not suitable for TrafficStats API use cases.
Test: atest FrameworksNetTests TetheringTests
Bug: 16229221
Change-Id: I6741c41cb5145ca8748f9b083b9c15e7e2735681
2020-11-12 14:22:31 +08:00
junyulai
f917b8b786
Add hardware tethering traffic in testTethering test
...
Test: atest com.android.server.net.NetworkStatsServiceTest#testTethering
Bug: 162292214
Change-Id: Ifec6bde5fd3231f2135f12536c42e42ec6b707de
2020-11-12 14:22:31 +08:00
TreeHugger Robot
5bba6f62ab
Merge "Partial config update: various metadata"
2020-11-12 06:11:59 +00:00
Sergey Nikolaienkov
af5c8ad1cd
Merge "More TvPipMenuTests tests in WmShell"
2020-11-12 06:07:21 +00:00
Yi Kong
df2aa886c4
Merge "profcollect: Use DeviceConfig to control trace parameters" am: be52daface am: 1bd94db820 am: 765230c02c am: e41ccb21d4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495717
Change-Id: Ie83759f299d6cf4eea2ece4a7fca5d322ba7da39
2020-11-12 05:31:45 +00:00
Chiachang Wang
c91ed0851e
Merge "Move BasicShellCommandHandler to frameworks/lib/modules-utils"
2020-11-12 05:08:48 +00:00
Yi Kong
e41ccb21d4
Merge "profcollect: Use DeviceConfig to control trace parameters" am: be52daface am: 1bd94db820 am: 765230c02c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495717
Change-Id: I6bf776649ae9135e77a28d5cdb2b9c7e1f7ae746
2020-11-12 04:59:53 +00:00
Remi NGUYEN VAN
6730f6aacc
[automerger skipped] Merge "Add dependency on modules-utils-build" am: 4c85126591 am: 68933c3e39 am: a41f16a27d am: 5df8a1b189 -s ours
...
am skip reason: Change-Id I8fca04fa22d6053aff0f58730adfa87f0bafaa3a with SHA-1 80417683df is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494037
Change-Id: I1f8cbe547e7bfd8593fdb8cb7ec5639c54e1017e
2020-11-12 04:55:37 +00:00
David Su
f17b792b57
Merge "services.net-module-wifi - set min_sdk_level to 30" am: ad8a87b69e am: 6c9fe5a3e7 am: 87cbfbff71 am: 0b6002dbf2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1475776
Change-Id: I70cf893293ed5a396cfb725a0dba1d124b2b1716
2020-11-12 04:54:49 +00:00
Treehugger Robot
b7bf21ddaf
Merge "Remove UWB RangingParams" am: 412a12977c am: 3943ca7598 am: 5869a2d3c4 am: 41e647efce
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487526
Change-Id: Ic41ce9b6f483239bfff2c5385bbd0f1489bb474f
2020-11-12 04:54:23 +00:00
Shawn Lin
f076bba8e2
Merge "Support hide display cutout with display area"
2020-11-12 04:49:35 +00:00
Yi Kong
765230c02c
Merge "profcollect: Use DeviceConfig to control trace parameters" am: be52daface am: 1bd94db820
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495717
Change-Id: Ib1f746e3fe41043b09091b773a2153e842ed2197
2020-11-12 04:47:38 +00:00
Remi NGUYEN VAN
5df8a1b189
Merge "Add dependency on modules-utils-build" am: 4c85126591 am: 68933c3e39 am: a41f16a27d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494037
Change-Id: I5466080426f9c2715c7b836f6bd7269d8414f955
2020-11-12 04:40:41 +00:00
David Su
0b6002dbf2
Merge "services.net-module-wifi - set min_sdk_level to 30" am: ad8a87b69e am: 6c9fe5a3e7 am: 87cbfbff71
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1475776
Change-Id: Icbec3aa5f645e915bda85c9e37755e7ae60d0331
2020-11-12 04:40:07 +00:00
Treehugger Robot
41e647efce
Merge "Remove UWB RangingParams" am: 412a12977c am: 3943ca7598 am: 5869a2d3c4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487526
Change-Id: Ic419afcf0ec595d9f4dfd316b420ebccd3e8b1d0
2020-11-12 04:39:51 +00:00
Yi Kong
1bd94db820
Merge "profcollect: Use DeviceConfig to control trace parameters" am: be52daface
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495717
Change-Id: Ib775fb17b8e9acff0c1f3e2ad4ec1f9873df4ad3
2020-11-12 04:13:16 +00:00
Remi NGUYEN VAN
a41f16a27d
Merge "Add dependency on modules-utils-build" am: 4c85126591 am: 68933c3e39
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494037
Change-Id: I02b37698cf810dfb1ddd564eda140a39b1884612
2020-11-12 04:07:24 +00:00
David Su
87cbfbff71
Merge "services.net-module-wifi - set min_sdk_level to 30" am: ad8a87b69e am: 6c9fe5a3e7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1475776
Change-Id: Ibd3d7f61619327529e35ad2817f3227936d8230b
2020-11-12 04:07:01 +00:00
Treehugger Robot
5869a2d3c4
Merge "Remove UWB RangingParams" am: 412a12977c am: 3943ca7598
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487526
Change-Id: Ifb22b4273ba5553d374fdaad43414bcd2e6a63ff
2020-11-12 04:06:36 +00:00
Yi Kong
be52daface
Merge "profcollect: Use DeviceConfig to control trace parameters"
2020-11-12 03:42:12 +00:00
Remi NGUYEN VAN
68933c3e39
Merge "Add dependency on modules-utils-build" am: 4c85126591
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494037
Change-Id: Iefa773a7dc55a2edbcc9142baf62e185d18507de
2020-11-12 03:35:39 +00:00
Remi NGUYEN VAN
4c85126591
Merge "Add dependency on modules-utils-build"
2020-11-12 03:32:49 +00:00
David Su
6c9fe5a3e7
Merge "services.net-module-wifi - set min_sdk_level to 30" am: ad8a87b69e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1475776
Change-Id: I639b05c29d4ab88a0c9eaa5278ad5b97db3dcb00
2020-11-12 03:31:40 +00:00
Treehugger Robot
b8608e3693
Merge "Kibosh the NrState Strings" am: 7e42554a0a am: 959570eb57 am: 0009280c26 am: 6359b5a655
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1496998
Change-Id: Ia99bd29f89e67f8bdd53ffa4039a0e02e8d08b38
2020-11-12 03:31:39 +00:00