Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
559,825 Commits 3 Branches 0 Tags
5d9e485533f5fa31d17eecab63faa84cd8e97504
Commit Graph

559825 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
3943ca7598 Merge "Remove UWB RangingParams" am: 412a12977c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487526

Change-Id: I33ef7b7fa9245a494b5e94ca9da4aa1c871b1709
 2020-11-12 03:26:22 +00:00
Treehugger Robot
6359b5a655 Merge "Kibosh the NrState Strings" am: 7e42554a0a am: 959570eb57 am: 0009280c26 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1496998

Change-Id: Ib547b888721297104b2652ef791404f439d7b301
 2020-11-12 03:14:29 +00:00
David Su
ad8a87b69e Merge "services.net-module-wifi - set min_sdk_level to 30" 2020-11-12 02:53:27 +00:00
Treehugger Robot
412a12977c Merge "Remove UWB RangingParams" 2020-11-12 02:37:44 +00:00
Treehugger Robot
0009280c26 Merge "Kibosh the NrState Strings" am: 7e42554a0a am: 959570eb57 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1496998

Change-Id: I151e67a230baa260e9e209a3de0757eda51be728
 2020-11-12 02:14:57 +00:00
Treehugger Robot
959570eb57 Merge "Kibosh the NrState Strings" am: 7e42554a0a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1496998

Change-Id: I950efd1d513b0f5eb723e85e7c9e9428a6623677
 2020-11-12 01:52:09 +00:00
Treehugger Robot
7e42554a0a Merge "Kibosh the NrState Strings" 2020-11-12 01:35:47 +00:00
Janis Danisevskis
b90d33bd18 Merge "Keystore 2.0 SPI: Update KeyInfo and KeyGenParameterSpec" am: 17f24b5799 am: 7d49ae705e am: 7662e81e98 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470091

Change-Id: I8a3f19ea8cfe16dd8a6d06007306ccaa9ed7257a
 2020-11-12 00:48:26 +00:00
madym
19cd892b9e Merge "Add mady to Shell/OWNERS" am: 708e1e5995 am: 8ee7052466 am: 8365756bc7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1496467

Change-Id: I0fef5818e1b758d9b80dc3107f1bc3d0bc22026d
 2020-11-12 00:47:09 +00:00
Janis Danisevskis
7662e81e98 Merge "Keystore 2.0 SPI: Update KeyInfo and KeyGenParameterSpec" am: 17f24b5799 am: 7d49ae705e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470091

Change-Id: I6c7bf795d40f6cb28d86b84bbe1162438322301c
 2020-11-12 00:30:08 +00:00
madym
8365756bc7 Merge "Add mady to Shell/OWNERS" am: 708e1e5995 am: 8ee7052466 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1496467

Change-Id: I69bb527107a53fec6b0b90d41ced3f94ad16a251
 2020-11-12 00:29:46 +00:00
Kweku Adams
73498343f7 Merge "Cache network capabilities." into rvc-qpr-dev am: 2a1b3c7408 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12901724

Change-Id: If16b0c7b056e9123926f68fa21b5cd4e298367c3
 2020-11-12 00:28:12 +00:00
Kweku Adams
2a1b3c7408 Merge "Cache network capabilities." into rvc-qpr-dev 2020-11-11 23:56:30 +00:00
Janis Danisevskis
7d49ae705e Merge "Keystore 2.0 SPI: Update KeyInfo and KeyGenParameterSpec" am: 17f24b5799 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470091

Change-Id: I0c7d36564f4d8d976ab28ca475ea41de6a282f14
 2020-11-11 23:49:15 +00:00
Dmitry Dementyev
802972d880 [automerger skipped] Merge "Ignore GrantCredentials call with unexpected calling uid." into pi-dev am: fe16873a33 -s ours am: 2d91b0fcaa -s ours am: 9aaffcb759 -s ours am: 54c839515b -s ours am: ef729aad20 -s ours am: ba55846fde -s ours 
am skip reason: Change-Id I1421c333b6cebb4f7cddcdd8766298f6872e933b with SHA-1 10d8a114bb is in history

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

Change-Id: I0b13d9220a4d94977df90e20d96ec9ed59d9b8bc
 2020-11-11 23:49:10 +00:00
Automerger Merge Worker
04b851242c Merge "Merge "Ignore GrantCredentials call with unexpected calling uid." into qt-dev am: a064b69f18 am: f0263a9369 am: 4290008125 am: 5ec7e0d4f6 am: 273b5c122a" into rvc-qpr-dev-plus-aosp 2020-11-11 23:49:02 +00:00
Dmitry Dementyev
735499e6c7 [automerger skipped] Merge "Ignore GrantCredentials call with unexpected calling uid." into pi-dev am: fe16873a33 -s ours am: 2d91b0fcaa -s ours am: 9aaffcb759 -s ours am: 54c839515b -s ours am: ef729aad20 -s ours am: 96e7f6118f -s ours 
am skip reason: Change-Id I1421c333b6cebb4f7cddcdd8766298f6872e933b with SHA-1 10d8a114bb is in history

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

Change-Id: Id4b8172c871bb12528d530705e42b55f4af1257e
 2020-11-11 23:48:52 +00:00
Dmitry Dementyev
a5a644acd0 Merge "Ignore GrantCredentials call with unexpected calling uid." into qt-dev am: a064b69f18 am: f0263a9369 am: 4290008125 am: 5ec7e0d4f6 am: 273b5c122a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13029782

Change-Id: I9c15ed9ac18e023513e81622584de6376c9e0910
 2020-11-11 23:48:43 +00:00
Dmitry Dementyev
04efc525be Merge "Ignore GrantCredentials call with unexpected calling uid." into qt-dev am: a064b69f18 am: f0263a9369 am: 4290008125 am: 5ec7e0d4f6 am: f22196b923 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13029782

Change-Id: Ie87fdc34427a9df73e682d43ff5ac5d0012cadf5
 2020-11-11 23:48:32 +00:00
Dmitry Dementyev
ba55846fde [automerger skipped] Merge "Ignore GrantCredentials call with unexpected calling uid." into pi-dev am: fe16873a33 -s ours am: 2d91b0fcaa -s ours am: 9aaffcb759 -s ours am: 54c839515b -s ours am: ef729aad20 -s ours 
am skip reason: Change-Id I1421c333b6cebb4f7cddcdd8766298f6872e933b with SHA-1 10d8a114bb is in history

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

Change-Id: I4057d27e6561fa2ca5607532fbc86bf8cca16ea2
 2020-11-11 23:17:32 +00:00
Dmitry Dementyev
96e7f6118f [automerger skipped] Merge "Ignore GrantCredentials call with unexpected calling uid." into pi-dev am: fe16873a33 -s ours am: 2d91b0fcaa -s ours am: 9aaffcb759 -s ours am: 54c839515b -s ours am: ef729aad20 -s ours 
am skip reason: Change-Id I1421c333b6cebb4f7cddcdd8766298f6872e933b with SHA-1 10d8a114bb is in history

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

Change-Id: I009b7a429a38075ebca6263032b46cb296c319c8
 2020-11-11 23:17:03 +00:00
Dmitry Dementyev
273b5c122a Merge "Ignore GrantCredentials call with unexpected calling uid." into qt-dev am: a064b69f18 am: f0263a9369 am: 4290008125 am: 5ec7e0d4f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13029782

Change-Id: I2f40f927b9b44db84463e564df78170730efbff6
 2020-11-11 23:17:01 +00:00