Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
519,022 Commits 3 Branches 0 Tags
c19fd3c4cba0f02a1ef8a897a4aa6e00a6e3df93
Commit Graph

519022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
149ef2b6c6 Merge changes from topic "am-79f86a8dcf76422daca2ee482cf222f3" into rvc-d1-dev-plus-aosp 
* changes:
  Merge changes I7d98ab42,I8753e681 into rvc-dev am: 7368ed7d03 am: 8c4224a070
  [automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: 232afa51d9 am: 259ec64f48 -s ours
 2020-07-17 04:19:57 +00:00
TreeHugger Robot
6add7f27d1 Merge changes I7d98ab42,I8753e681 into rvc-dev am: 7368ed7d03 am: 8392b1b8ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166028

Change-Id: I55405a76b8eb3ab7833d0521f6cea5d3b2f3de44
 2020-07-17 04:19:48 +00:00
junyulai
3c9653a3bc [automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: 232afa51d9 -s ours am: 166e9be284 -s ours 
am skip reason: Change-Id I8753e68140c0993773017c9a49bd8a666a364071 with SHA-1 20b027ed2b is in history

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

Change-Id: I02095d84ee19167ca7e254e977e1e38ba7ba87f0
 2020-07-17 04:19:45 +00:00
TreeHugger Robot
542eb09002 Merge changes I7d98ab42,I8753e681 into rvc-dev am: 7368ed7d03 am: 8c4224a070 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166028

Change-Id: I3225856c1d532c67af724b341ec3397e4e4a5817
 2020-07-17 04:19:36 +00:00
junyulai
7e4b17dd8c [automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: 232afa51d9 am: 259ec64f48 -s ours 
am skip reason: Change-Id I8753e68140c0993773017c9a49bd8a666a364071 with SHA-1 20b027ed2b is in history

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

Change-Id: I5e06da5cbb80d02e8d216d63c9c9c0f96a11fc6c
 2020-07-17 04:19:23 +00:00
TreeHugger Robot
8392b1b8ba Merge changes I7d98ab42,I8753e681 into rvc-dev am: 7368ed7d03 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166028

Change-Id: I2d6eb9bbc142e7da1a270a9bea22d645b6f54885
 2020-07-17 04:03:39 +00:00
junyulai
166e9be284 [automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: 232afa51d9 -s ours 
am skip reason: Change-Id I8753e68140c0993773017c9a49bd8a666a364071 with SHA-1 20b027ed2b is in history

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

Change-Id: I7e48e1b94107d84a1b828b005437ad2e24a92850
 2020-07-17 04:03:35 +00:00
TreeHugger Robot
8c4224a070 Merge changes I7d98ab42,I8753e681 into rvc-dev am: 7368ed7d03 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166028

Change-Id: I5cd61dd963ab57273ce6ee457c02bd6e10383f1c
 2020-07-17 04:03:19 +00:00
junyulai
259ec64f48 Attribute data usage to virtual RAT type for 5G non-standalone mode am: 232afa51d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166464

Change-Id: I77a3455318db44cf28ca4cfddf86a9767efe6302
 2020-07-17 04:03:07 +00:00
Pinyao Ting
b4444ff0a1 Fixes the issue multi-touch causing launcher icons to be not clickable. 
The issue occurs because TextView#isFromPrimePointer assumes multi-touch
events are happening on the same TextView and relies on
ACTION_UP/ACTION_CANCEL to reset the Prime pointer id.

consider following scenario:
1. ACTION_DOWN (pointer 0) landed on ViewA,
   ACTION_DOWN (pointer 1) landed on ViewB.
2. ACTION_MOVE landed on both ViewA and ViewB, triggering a drag.
3. When all fingers are released, ACTION_CANCEL (pointer 0) will be
   landed on both ViewA and ViewB, so the prime pointer in ViewB is not
   reset due to pointer index mismatch.

This CL always reset prime pointer id whenever ACTION_UP/ACTION_CANCEL
is triggered.

Bug: 157399040
Test: manual
Change-Id: Id35d9eac939378482fa50e85bb5cda58469240ad
 2020-07-16 20:59:10 -07:00
TreeHugger Robot
7368ed7d03 Merge changes I7d98ab42,I8753e681 into rvc-dev 
* changes:
  Report NR connected state to provide resolution of 5G NSA mode
  Attribute data usage to virtual RAT type for 5G non-standalone mode
 2020-07-17 03:45:56 +00:00
Sudheer Shanka
748b9cddbd Merge "Evaluate and sync firewall rules when parole state changes." into rvc-dev am: 311f3508f7 am: 4a0a8de3d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12162118

Change-Id: Ie4ee33dcd238f2192df300e3a08d7adf2ef8509d
 2020-07-17 01:51:02 +00:00
Sudheer Shanka
4f0be2c657 Merge "Evaluate and sync firewall rules when parole state changes." into rvc-dev am: 311f3508f7 am: e103d5f04c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12162118

Change-Id: Ia05344b618d7e55247d14d74d79e119cd246ec4a
 2020-07-17 01:50:22 +00:00
Sudheer Shanka
4a0a8de3d5 Merge "Evaluate and sync firewall rules when parole state changes." into rvc-dev am: 311f3508f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12162118

Change-Id: If76e203cb617172f594de9a627060df1164fda5d
 2020-07-17 01:39:05 +00:00
Sudheer Shanka
e103d5f04c Merge "Evaluate and sync firewall rules when parole state changes." into rvc-dev am: 311f3508f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12162118

Change-Id: I69c7de2e726c7d3151633e2b34dcc9748ace6984
 2020-07-17 01:39:02 +00:00
Aman Gupta
48a06806f1 Add KEYCODE_LAST_CHANNEL mapping to LKC KEY_LAST 
Change-Id: Idcf987c6e5541e29cac1b8a89263580bfcdc9636
Signed-off-by: Aman Gupta <aman@tmm1.net>
 2020-07-16 18:27:02 -07:00
android-build-team Robot
ca4c384a9b Snap for 6687127 from 274ce4442a to rvc-release 
Change-Id: If582ddcb8253396c34a144f07fa2cc94bd83b573
 2020-07-17 01:01:13 +00:00
Sudheer Shanka
311f3508f7 Merge "Evaluate and sync firewall rules when parole state changes." into rvc-dev 2020-07-17 01:00:47 +00:00
Stan Iliev
6b8abeba40 Fix TextureView calling eglCreateImage with a destructed buffer 
Fix an issue with hardware buffer passed from the SurfaceTexture
being destroyed before an SkImage is created. This CL is matched
by a change in frameworks/native
I2e025e683052168546f2e271a20a857b1e556b64.

Test: Ran TextureView CTS tests and a few apps that use TextureView.
Test: Fix verified by partner Mediatek
Bug: 160930384
Bug: 152781833
Bug: 153045874
Bug: 156047948
Bug: 160514803
Bug: 155545635
Bug: 155171712
Change-Id: I4d121f087fc842ce317745e7b7e2656f80a52b7d
(cherry picked from commit d125b447d7)
 2020-07-16 23:40:13 +00:00
Sarah Chin
c363a3a148 Add HANDLE_CAR_MODE_CHANGED permission 
Required to allow DeviceStateMonitor to monitor changes in car mode to
get an accurate state of when all screens are on/off.

Test: build
Bug: 160898432
Change-Id: If3ad86a2564ce3ba53afea44e8ad5bf02b8d51e0
 2020-07-16 21:50:38 +00:00
Yu-Han Yang
5f549c40fc DO NOT MERGE: Move updateSatelliteBlacklist after handleInitialize 
- updateSatelliteBlacklist should be called after HAL initialization is
done.
- The bug is likely triggered after ag/11960757 where the initialization
order changed.

Bug: 161443390
Test: on device

Change-Id: If771783b8be22b08631bee6fe2e8b575956597cd
 2020-07-16 21:39:31 +00:00
Hui Yu
e56069ae78 Merge "Add logcat message for background started FGS." into rvc-dev am: 274ce4442a am: 6e4f802c62 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12172784

Change-Id: Ib5f97d5779e9f910a10e3c7013a2c2576dcee8d1
 2020-07-16 21:05:29 +00:00
Hui Yu
76cc6e415e Merge "Add logcat message for background started FGS." into rvc-dev am: 274ce4442a am: b6fa5d4f8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12172784

Change-Id: Ib4183b5a2e26bd5c77884e5776ff3745ea4e160d
 2020-07-16 21:00:51 +00:00
Hui Yu
6e4f802c62 Merge "Add logcat message for background started FGS." into rvc-dev am: 274ce4442a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12172784

Change-Id: Ied84e6a56f77c7b5dfb21442c9208d73d5f1fbe3
 2020-07-16 20:47:19 +00:00
Hui Yu
b6fa5d4f8a Merge "Add logcat message for background started FGS." into rvc-dev am: 274ce4442a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12172784

Change-Id: Iaaaca230d17df0a2686403c1f04afd8f2ab78710
 2020-07-16 20:46:46 +00:00
Hui Yu
274ce4442a Merge "Add logcat message for background started FGS." into rvc-dev 2020-07-16 20:29:50 +00:00
Jing Ji
d08c81411b Merge "Fix the ordering of the result of app kill info" into rvc-dev am: da0d734c7d am: ce9935ffba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12172785

Change-Id: I2b2e3bd2f0fdb1a9279f590be4c871b5e02d4273
 2020-07-16 20:07:51 +00:00
Jing Ji
3e52afd5e5 Merge "Fix the ordering of the result of app kill info" into rvc-dev am: da0d734c7d am: 6030f05717 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12172785

Change-Id: Ic790209e40872eb0d2412e22a4f98bd6032d1686
 2020-07-16 20:07:15 +00:00
Sudheer Shanka
4eca322f61 Evaluate and sync firewall rules when parole state changes. 
Earlier we used to just toggle the appstandby firewall chain.
This mostly works because even though the firewall chain is
disabled, we ensure the rules are up-to-date but if the
idle state of an app changes at the same time as the parole
state change, it is possible that NPMS will not receive the idle
state change callback. So, the firewall rule for that app
would be obsolete until it is re-evaluated on some other trigger.

Bug: 160855861
Test: atest ./hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Change-Id: I3f8d0d172ac415fbd133b32c6ec5952c2743b6f0
 2020-07-16 12:49:20 -07:00
Jing Ji
6030f05717 Merge "Fix the ordering of the result of app kill info" into rvc-dev am: da0d734c7d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12172785

Change-Id: I172da8beec8a6b526db905f5f2b24f468622567d
 2020-07-16 19:47:22 +00:00
Jing Ji
ce9935ffba Merge "Fix the ordering of the result of app kill info" into rvc-dev am: da0d734c7d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12172785

Change-Id: I519d420a61e2a3926bbb56b8a0e7e05aad356ac9
 2020-07-16 19:47:15 +00:00
Jing Ji
da0d734c7d Merge "Fix the ordering of the result of app kill info" into rvc-dev 2020-07-16 19:31:24 +00:00
Automerger Merge Worker
121269f25e Merge "Merge "Fix MediaCas CTS failure TRM is checking input parameters and won't allow null executor. Use context main executor to call Tuner Resource Manager (TRM)" into rvc-dev am: bdc05af123 am: 0b7ea54a86" into rvc-d1-dev-plus-aosp 2020-07-16 19:31:07 +00:00
Henry Fang
3991579def Merge "Fix MediaCas CTS failure TRM is checking input parameters and won't allow null executor. Use context main executor to call Tuner Resource Manager (TRM)" into rvc-dev am: bdc05af123 am: 0b7ea54a86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12162120

Change-Id: I911351d06023e38d54a1f6b85b2597e40726a830
 2020-07-16 19:31:01 +00:00
Henry Fang
b029113aa8 Merge "Fix MediaCas CTS failure TRM is checking input parameters and won't allow null executor. Use context main executor to call Tuner Resource Manager (TRM)" into rvc-dev am: bdc05af123 am: 1278c0bcaf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12162120

Change-Id: I620a0e668540ca0b4d43f5b7a944fdd4173d37fc
 2020-07-16 19:30:43 +00:00
Henry Fang
1278c0bcaf Merge "Fix MediaCas CTS failure TRM is checking input parameters and won't allow null executor. Use context main executor to call Tuner Resource Manager (TRM)" into rvc-dev am: bdc05af123 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12162120

Change-Id: I72094ab1309e6df201ca136111c6ae9d61653372
 2020-07-16 19:07:54 +00:00
Henry Fang
0b7ea54a86 Merge "Fix MediaCas CTS failure TRM is checking input parameters and won't allow null executor. Use context main executor to call Tuner Resource Manager (TRM)" into rvc-dev am: bdc05af123 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12162120

Change-Id: Icdb03ffdb5056b7023a491424c24996fe31ba69b
 2020-07-16 19:07:36 +00:00
Henry Fang
bdc05af123 Merge "Fix MediaCas CTS failure TRM is checking input parameters and won't allow null executor. Use context main executor to call Tuner Resource Manager (TRM)" into rvc-dev 2020-07-16 18:49:50 +00:00
Jing Ji
0875efe134 Fix the ordering of the result of app kill info 
Bug: 161454542
Test: atest ApplicationExitInfoTest
Test: atest CtsAppExitTestCases:ActivityManagerAppExitInfoTest
Change-Id: I9b2b189f83bac29bda54b485294da9d9d58375e7
 2020-07-16 10:51:30 -07:00
Nathan Harold
14bac37773 Merge "Migrate LTE_CA flag to NRI from DSRI" am: 83cbf59a70 am: 0f6ee9e766 am: e2505847e4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1357995

Change-Id: Icf9a64921db1ff14eff5970b0714c83e74856ac2
 2020-07-16 17:47:22 +00:00
Hui Yu
23f0b1842a Add logcat message for background started FGS. 
Bug: 161392994
Test: reboot device and observe adb logcat
Change-Id: I29a1d916c1f1c203ae06c5a94fe95592b3b7e968
 2020-07-16 10:46:27 -07:00
Nathan Harold
e2505847e4 Merge "Migrate LTE_CA flag to NRI from DSRI" am: 83cbf59a70 am: 0f6ee9e766 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1357995

Change-Id: I99467fc9f568f626997e0571e688b9f04cc14491
 2020-07-16 17:27:20 +00:00
Nathan Harold
0f6ee9e766 Merge "Migrate LTE_CA flag to NRI from DSRI" am: 83cbf59a70 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1357995

Change-Id: I5e7928549900090b700857e73db1c2f144504e36
 2020-07-16 17:12:02 +00:00
Makoto Onuki
2cb250d6a5 Merge "Merge module-lib-api-stubs-docs and -non-updatable" am: def1e68ead am: 2f20e9afe7 am: 10d116d1ec 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1363799

Change-Id: I6893404a3be32848b3344ecf69d5161da27777b0
 2020-07-16 17:12:00 +00:00
Nathan Harold
83cbf59a70 Merge "Migrate LTE_CA flag to NRI from DSRI" 2020-07-16 16:59:34 +00:00
Makoto Onuki
10d116d1ec Merge "Merge module-lib-api-stubs-docs and -non-updatable" am: def1e68ead am: 2f20e9afe7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1363799

Change-Id: I17cb9dc98f6b8299871a82bd29be8bdf78effbfc
 2020-07-16 16:55:57 +00:00
Makoto Onuki
2f20e9afe7 Merge "Merge module-lib-api-stubs-docs and -non-updatable" am: def1e68ead 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1363799

Change-Id: Ib2e7f6b0575ee13fc1c341f1fb566e60920a621e
 2020-07-16 16:37:48 +00:00
Makoto Onuki
def1e68ead Merge "Merge module-lib-api-stubs-docs and -non-updatable" 2020-07-16 16:12:52 +00:00
Eric Laurent
6915e2ff50 AudioService: Add metrics for audio mode 
A metrics for audio mode changes and failure to release IN_COMMUNICATION
mode when inactive.

Bug: 153934174
Bug: 161444687
Test: repro steps in Bug and verify logs and metrics
Change-Id: Ib3beab2e8b64e7354ff1a32f04561e7b95f61855
 2020-07-16 08:39:22 -07:00
Victor Chang
8ee3807a01 Make a copy of DateIntervalFormat from libcore 
It allows the removal of @CorePlatformApi in libcore.icu

Bug: 160606356
Test: n/a
Change-Id: Id0ed2d212b6cd84ff73edc70794e002ea5f63cd0
 2020-07-16 16:23:58 +01:00