Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
617,297 Commits 3 Branches 0 Tags
b326a72a2fdfd1ee0adcee654112ab7282acaf21
Commit Graph

15433 Commits

Author SHA1 Message Date
TreeHugger Robot
b326a72a2f Merge "Revert "Add shared transitions for screenshot->markup"" 2021-01-06 17:56:38 +00:00
Miranda Kephart
524336dbbd Revert "Add shared transitions for screenshot->markup" 
This reverts commit 6b330ef7ee.

Reason for revert: cause of bug: 176874121

Change-Id: Icc87484f7cbe26bbe479fc47dca0aadae82e377b
 2021-01-06 17:27:55 +00:00
TreeHugger Robot
9df7512c55 Merge "Demonstrate per Uid screen energy measurement in BatteryStatsViewer" 2021-01-06 09:07:05 +00:00
Michael Wachenschwanz
4546304f47 Demonstrate per Uid screen energy measurement in BatteryStatsViewer 
Bug: 172361024
Test: mp :BatteryStatsViewer && adb shell am start -n com.android.frameworks.core.batterystatsviewer/.BatteryStatsViewerActivity
Change-Id: I1da2b5f23a216b45915921bd43ea5d5e14ddd23a
 2021-01-05 16:46:19 -08:00
TreeHugger Robot
209f3ff1f0 Merge "Clean up dead code in NetInitiatedActivity" 2021-01-05 21:49:17 +00:00
TreeHugger Robot
7365a93174 Merge "Revert "Revert "Flip off use of old Chooser targets by default.""" 2021-01-05 21:36:59 +00:00
Miranda Kephart
9c8ca97586 Merge "Add shared transitions for screenshot->markup" 2021-01-05 19:58:52 +00:00
Jeff Sharkey
4b2191ad09 Merge "Update OWNERS for NetInitiatedActivity.java" am: 7283ceda9b am: 23519fbda4 am: 4079cfc439 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536356

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I32a7a0acc9297b266cfa3cc2d3d898e77e924c47
 2021-01-05 17:35:52 +00:00
Jeff Sharkey
4079cfc439 Merge "Update OWNERS for NetInitiatedActivity.java" am: 7283ceda9b am: 23519fbda4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536356

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf148f26961add3f0b43c6e853b3ab526a53008c
 2021-01-05 17:16:55 +00:00
Jeff Sharkey
7283ceda9b Merge "Update OWNERS for NetInitiatedActivity.java" 2021-01-05 16:40:01 +00:00
Alison Cichowlas
5efbc0f929 Revert "Revert "Flip off use of old Chooser targets by default."" 
This reverts commit 94c73953e4.

Reason for revert: 90% of clicks use new targets - let's go for it.

Bug: 170144291

Change-Id: Ia899c15b691aeb27e75056ce5a7673a5be8a3490
 2021-01-05 16:18:02 +00:00
Miranda Kephart
6b330ef7ee Add shared transitions for screenshot->markup 
Bug: 170138961
Bug: 159419046
Test: manual

Change-Id: I3a9c7487cbc36a4a7183030d2e3aa432958f7e1a
 2021-01-05 14:41:30 +00:00
Jeff Sharkey
179ed2b7d8 Fix FastDataOutput performance bug. 
The underlying CharsetUtils methods accept the total length of the
underlying byte[] array; the bug in the existing logic was attempting
to pass the remaining length, which caused much more aggressive
one-off buffer allocation when not needed.

Bug: 171832118
Test: atest FrameworksCoreTests:com.android.internal.util.FastDataTest
Test: atest FrameworksCoreTests:android.util.CharsetUtilsTest
Test: atest FrameworksCoreTests:android.util.XmlTest
Test: atest FrameworksCoreTests:android.util.BinaryXmlTest
Change-Id: If257f75446d2f99313eecc3c11822d770f920687
 2021-01-04 21:42:21 -07:00
TreeHugger Robot
0883daddf1 Merge "Add HIDE_REMOVE_CLIENT into InputMethodDebug" 2020-12-31 06:02:37 +00:00
Wilson Wu
1778037875 Add HIDE_REMOVE_CLIENT into InputMethodDebug 
CL [1] introduced the HIDE_REMOVE_CLIENT reason in
SoftInputShowHideReason.

Add this reason into InputMethodDebug to avoid dump
unknown reason unexpectedly.

[1]: Ifb91111f7136952462678ff6d0a5e917abb5005e

Bug: 167780081
Test: atest InputMethodDebugTest
Change-Id: I23a8deea66600e3e31bdcb5fbf8fb87d91c57e4d
 2020-12-31 13:58:56 +08:00
Michael Sun
236cc4b08b Merge "Revert "Add more logging for wakelock stats inquiries"" am: 4f1774283c am: d051fbac00 am: 9660a9256e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534146

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib81f8e12efdbb2c23d87d6a1ade4e451d8f4df6d
 2020-12-30 19:05:02 +00:00
Michael Sun
9660a9256e Merge "Revert "Add more logging for wakelock stats inquiries"" am: 4f1774283c am: d051fbac00 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534146

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I737867f97653ab76aa2a50d0c2323b0337574262
 2020-12-30 18:27:59 +00:00
Michael Sun
4f1774283c Merge "Revert "Add more logging for wakelock stats inquiries"" 2020-12-30 17:38:41 +00:00
Yu-Han Yang
44e633e40a Update OWNERS for NetInitiatedActivity.java 
Test: OWNERS update only
Change-Id: I3685a54c7f27880a99f8962530de87a61208bcc9
 2020-12-29 11:03:07 -08:00
Yu-Han Yang
b5765cc3e7 Clean up dead code in NetInitiatedActivity 
Bug: 174151048
Test: on device
Change-Id: I5a3a77557720571b455ffec296cdd4e2e1a02f7b
 2020-12-29 10:42:33 -08:00
Chiachang Wang
9545203f3f Merge "[IT4.2] Update argument type of interfaceClassDataActivityChanged" am: dcb4051101 am: 8495b1b1dc am: 67cba56eff 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531806

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I992dd2f78c0f7334bbe97a03faba161d09a03a71
 2020-12-28 02:32:19 +00:00
Chiachang Wang
67cba56eff Merge "[IT4.2] Update argument type of interfaceClassDataActivityChanged" am: dcb4051101 am: 8495b1b1dc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531806

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e255f46fc8b3d9fb3f4e1af4bd66b4a0e38369e
 2020-12-28 02:02:08 +00:00
Chiachang Wang
dcb4051101 Merge "[IT4.2] Update argument type of interfaceClassDataActivityChanged" 2020-12-28 01:05:28 +00:00
Serik Beketayev
db38c539cf Merge "[Mainline] Migrate ProxyInfo" am: 3c3711dffd am: 5565118666 am: 40e7949c5f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1506616

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6f5bf74bf461f762472ea1d88553db3b9719c80
 2020-12-25 09:58:40 +00:00
Serik Beketayev
40e7949c5f Merge "[Mainline] Migrate ProxyInfo" am: 3c3711dffd am: 5565118666 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1506616

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica0e0965296e3bf843fa73fc6d687da6a9ae721d
 2020-12-25 09:45:54 +00:00
Serik Beketayev
4abaecefc2 [Mainline] Migrate ProxyInfo 
Bug: 173455434
Test: atest FrameworksNetTests
Change-Id: I924aed710b62a0c91b888a9e04ac2c90cdfd88d0
 2020-12-23 22:15:51 -08:00
Chiachang Wang
4dd4e08c4e [IT4.2] Update argument type of interfaceClassDataActivityChanged 
The argument type of interfaceClassDataActivityChanged takes a
string for the network type. It requires both the receivers and
NMS to do type transformation. The transformation is a redundant
work. Update it to take integer directly and rename to
understandable naming.

Bug: 170598012
Test: atest FrameworksNetTests
Change-Id: Ibe9fa7a1b71af2dab916b5d615742e77e4174c39
 2020-12-23 17:34:08 +08:00
Chiachang Wang
0930c03c9e Merge "[IT04] Add uid as parameter of interfaceClassDataActivityChanged" am: baef452e38 am: 04aa5eac85 am: a817ecd4b5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523339

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieafdf569c13b1421c18fa3086827e6e432b498d7
 2020-12-23 07:31:25 +00:00
Chiachang Wang
a817ecd4b5 Merge "[IT04] Add uid as parameter of interfaceClassDataActivityChanged" am: baef452e38 am: 04aa5eac85 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523339

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3dea98c80dd4d6f29739b26cf120957c58364445
 2020-12-23 06:49:23 +00:00
Chiachang Wang
baef452e38 Merge "[IT04] Add uid as parameter of interfaceClassDataActivityChanged" 2020-12-23 05:20:33 +00:00
TreeHugger Robot
a52a79f7dd Merge "Make IInputMethodManager to oneway (7/N)" 2020-12-23 04:40:21 +00:00
TreeHugger Robot
9df82ca4cc Merge "Make IInputMethodManager to oneway (6/N)" 2020-12-23 03:52:54 +00:00
Wilson Wu
4a820ccc41 Make IInputMethodManager to oneway (7/N) 
1. Create InputMethodInfoList result callback and apply it to :
   -. getInputMethodList
   -. getEnabledInputMethodList

2. Apply IntResultCallback to getInputMethodWindowVisibleHeight

Bug: 163453493
Test: Manual test with keyboard
Test: atest CtsInputMethodTestCases
Change-Id: Iaa63e01453da4ff0e3f446eac036b3be3180cb73
 2020-12-23 10:27:05 +08:00
Remi NGUYEN VAN
23f93322c2 Merge "Split NetworkUtils and NetworkUtilsInternal" am: 3ed4fd3a89 am: 635d60201d am: edc6b0fb67 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513140

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief9d6a1fae360dbe1c43d5d6bac4dad5850c004b
 2020-12-23 02:22:35 +00:00
Remi NGUYEN VAN
edc6b0fb67 Merge "Split NetworkUtils and NetworkUtilsInternal" am: 3ed4fd3a89 am: 635d60201d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513140

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b2eae7f9988ae8fa8c858709cafc17c1420f4b7
 2020-12-23 02:07:05 +00:00
Remi NGUYEN VAN
3ed4fd3a89 Merge "Split NetworkUtils and NetworkUtilsInternal" 2020-12-23 01:19:27 +00:00
Treehugger Robot
137003fd24 Merge "Add owner to codegen annotations" am: 7765329813 am: e897f5f8d6 am: ea70d5adc2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530761

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9154535efa649300ee1b7a27e7739f24cf037b5b
 2020-12-23 00:01:23 +00:00
Treehugger Robot
ea70d5adc2 Merge "Add owner to codegen annotations" am: 7765329813 am: e897f5f8d6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530761

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie4370f8059802250c5bd9112a10573effba8551e
 2020-12-22 23:23:24 +00:00
Treehugger Robot
7765329813 Merge "Add owner to codegen annotations" 2020-12-22 22:16:51 +00:00
Benjamin Schwartz
f17961cdd3 Merge "KernelWakelockReader: provide class level lock when updates staleStats" am: b9f60a53c3 am: ec13727383 am: 7805396ee6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534034

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ef1ab620b8a56e62c295d081f714de208d9fa57
 2020-12-22 17:39:58 +00:00
Benjamin Schwartz
7805396ee6 Merge "KernelWakelockReader: provide class level lock when updates staleStats" am: b9f60a53c3 am: ec13727383 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534034

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I32722ae3a7f5fbde2aa7d42402f8f2d670423f4b
 2020-12-22 17:38:56 +00:00
Wilson Wu
38fd020616 Make IInputMethodManager to oneway (6/N) 
Create InputMethodSubtype and InputMethodSubtypeList
result callback and apply it to :

-. getLastInputMethodSubtype
-. getCurrentInputMethodSubtype
-. getEnabledInputMethodSubtypeList

Bug: 163453493
Test: Manual test with keyboard
Test: atest CtsInputMethodTestCases
Change-Id: I646ef4ae0570aae1812ea267f309441fdec6938d
 2020-12-22 10:56:18 +08:00
Chiachang Wang
9c133bc4e9 [IT04] Add uid as parameter of interfaceClassDataActivityChanged 
Add uid into interfaceClassDataActivityChanged in
INetworkManagementEventObserver. This helps the listeners to use
BaseNetworkObserver to listen for target evnets instead of using
whole INetdUnsolicitedEventListener with no-op in other event
that listeners do not care about.

Bug: 170598012
Test: m ; atest FrameworksNetTests
Change-Id: I2a42a522c2ff9b1e0be88261a8574bb7f5292fa6
 2020-12-22 08:39:22 +08:00
Michael Sun
2ab53028af Revert "Add more logging for wakelock stats inquiries" 
This reverts commit 757b01b94b.

Reason for revert: b:173539101 is root caused and AIDL pipeline is proved to transmit wakelock stats flawlessly.

Change-Id: I80c39d55b7d6464a4c8f894406c2393ac554ad66
 2020-12-21 18:36:35 +00:00
Michael Sun
5886ede607 KernelWakelockReader: provide class level lock when updates staleStats 
As the wakelock version number is defined as static to provide
consistent versioning across objects, class level static lock should be
implemented to prevent racing conditions.

To trigger the racing condition, update statsd's stats pulling logic
locally to repeatably requesting wakelock stats then wakeup the phone
to trigger BatteryStats update routine. The racing condition is 100%
reproducible under the setup. The patch has been verified with the
setup, and the racing is no longer seen. See more reproduce details in
the linked bug.

Bug: 173539101
Test: manual
Change-Id: I386afa2f2ecd8678e71ece978da4a9950b21ca4d
 2020-12-21 18:09:04 +00:00
Jeff Sharkey
ea470d5ca8 Merge changes from topic "dec16" 
* changes:
  Enable binary XML by default.
  Prepare for binary XML pivot.
  Migrate SettingsProvider to support typed XML.
 2020-12-20 18:22:30 +00:00
TreeHugger Robot
026102b5c8 Merge "Add SystemBatteryConsumer for the Bluetooth drain type" 2020-12-19 07:36:44 +00:00
Dmitri Plotnikov
8677b4eb5b Add SystemBatteryConsumer for the Bluetooth drain type 
Bug: 175644968
Test: mp :BatteryStatsViewer && adb shell am start -n com.android.frameworks.core.batterystatsviewer/.BatteryStatsViewerActivity

Change-Id: I2adde65a63faf18f0120f281ab1fcd5373f25091
 2020-12-18 18:10:00 -08:00
Alison Cichowlas
dc70bd944e Merge "Fix sharing shortcuts not showing for Work Profile." into rvc-qpr-dev am: ac9d6f53da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13230685

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I141425524486e6a377b6be1062a17b0df13388d0
 2020-12-18 00:34:12 +00:00
Darryl Johnson
c9e9058347 Revert "Use eBPF-based time-in-state monitoring for groups of threads" 
This reverts commit a7b599b824.

Reason for revert: Possible cause of b/175685062

Change-Id: If9a4592fa1c8e4c97ae187e45b509c3753d2f47e
 2020-12-17 14:48:39 -08:00