David Su
252ca6d57a
Merge "frameworks/base/wifi: configure TEST_MAPPING" am: 804240d840 am: bef16da6aa am: 4611b7f473
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537285
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7c3b4aafaecc6451c088350761f94477f71871f7
2020-12-30 05:15:13 +00:00
TreeHugger Robot
8bce3e1d0b
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-12-30 04:59:21 +00:00
David Su
4611b7f473
Merge "frameworks/base/wifi: configure TEST_MAPPING" am: 804240d840 am: bef16da6aa
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537285
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I809963e8ddffed24c22be562822c7e7bf25028f9
2020-12-30 04:54:00 +00:00
David Su
bef16da6aa
Merge "frameworks/base/wifi: configure TEST_MAPPING" am: 804240d840
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537285
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I49d00386d6079b9b3d8d26cc5e5eb0f065dde2d1
2020-12-30 04:28:21 +00:00
David Su
804240d840
Merge "frameworks/base/wifi: configure TEST_MAPPING"
2020-12-30 03:26:18 +00:00
Bill Yi
e382613962
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idecbafc79e7e4dfbd102e41101c2fe734c186ecb
2020-12-29 17:24:50 -08:00
David Su
3e167c1243
frameworks/base/wifi: configure TEST_MAPPING
...
Run FrameworksWifiNonUpdatableApiTests
Bug: 176260047
Test: presubmit
Change-Id: Ic2a10e992263bfbc62a9012a2739060d5f4c9ff1
2020-12-30 00:38:48 +00:00
Tracy Zhou
7db32da533
Merge "Add the missing call to write mInputToken in SurfacePackage to parcel"
2020-12-30 00:17:47 +00:00
Jean-Michel Trivi
3693be0b5e
Merge "AudioService: updates to death of focus requester"
2020-12-29 23:54:04 +00:00
TreeHugger Robot
280a59600c
[automerger skipped] Merge "frameworks/base/wifi: unpack non-updatable/ folder" into mainline-prod am: ed6633122e -s ours
...
am skip reason: Change-Id I6e1bd3fe6335b5dbe5f8ffa84a84df6434c95674 with SHA-1 b1e84779fe is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13275026
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I194babfff4e9f0371e942e1783b888112fdfcbd3
2020-12-29 23:26:34 +00:00
TreeHugger Robot
ed6633122e
Merge "frameworks/base/wifi: unpack non-updatable/ folder" into mainline-prod
2020-12-29 23:08:45 +00:00
David Su
5fefb12f64
Merge "frameworks/base/wifi: unpack non-updatable/ folder"
2020-12-29 22:35:14 +00:00
Jayant Chowdhary
36ad891fe0
Merge "camera2: Avoid boxing primitives while unmarshalling primitive arrays."
2020-12-29 22:22:54 +00:00
David Su
8faead2af8
[automerger skipped] Merge "frameworks/base/wifi: unpack non-updatable/ folder" am: 8196aaaaee am: 479da6944f am: 5931d5830c -s ours
...
am skip reason: skipped by user dysu
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535762
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8cba8f4c19de76f615860c46566c1569779029fc
2020-12-29 21:08:18 +00:00
David Su
b1e84779fe
frameworks/base/wifi: unpack non-updatable/ folder
...
Everything remaining in frameworks/base/wifi is non-updatable.
Thus, unpack non-updatable/ folder and move everything under
wifi/.
Bug: 137323948
Test: presubmit
Change-Id: I6e1bd3fe6335b5dbe5f8ffa84a84df6434c95674
2020-12-29 13:01:24 -08:00
Steven Moreland
7459f6eba0
Merge "OWNERS - for binders" am: 55fe3d16a4 am: 8461e26292 am: 3965021b86
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532277
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5fee8f9fe076024eedfb8c60008dbe0dc6edbaa3
2020-12-29 20:20:12 +00:00
David Su
5931d5830c
Merge "frameworks/base/wifi: unpack non-updatable/ folder" am: 8196aaaaee am: 479da6944f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535762
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5679409252b53e4127adb9f1ee48d07ac637fa21
2020-12-29 19:42:35 +00:00
Steven Moreland
3965021b86
Merge "OWNERS - for binders" am: 55fe3d16a4 am: 8461e26292
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532277
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1fa886ccd48215983d6669ef09d80f528e1c73e8
2020-12-29 19:42:21 +00:00
Jayant Chowdhary
1a29434234
camera2: Avoid boxing primitives while unmarshalling primitive arrays.
...
Bug: 174742989
Test: GCA (basic validity)
Test: Without this CL, capture many images with GCA, profile with
simpleperf, stack traces with java.lang.Float.valueOf in
mm_fault_count kprobes : 21% (most of them coming from
MarshalQueryableArray.unmarshal)
Test: Without this CL, capture many images with GCA, profile with
simpleperf, stack traces with java.lang.Float.valueOf in
mm_fault_count kprobes : 3.92%
Test: camera CTS, no new failures.
Change-Id: If359c828a231df41ba7b586bdda36255656a5a76
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2020-12-29 11:37:25 -08:00
David Su
479da6944f
Merge "frameworks/base/wifi: unpack non-updatable/ folder" am: 8196aaaaee
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535762
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I31477da0778d453ddc884ddef7f5901d5f6f4ef6
2020-12-29 19:24:29 +00:00
David Su
5da04524ce
frameworks/base/wifi: unpack non-updatable/ folder
...
Everything remaining in frameworks/base/wifi is non-updatable.
Thus, unpack non-updatable/ folder and move everything under
wifi/.
Bug: 137323948
Test: presubmit
Change-Id: I6e1bd3fe6335b5dbe5f8ffa84a84df6434c95674
Merged-In: I6e1bd3fe6335b5dbe5f8ffa84a84df6434c95674
2020-12-29 11:23:15 -08:00
Automerger Merge Worker
9a5d6bfe3b
Merge "Adjust visibility rules for migration am: a958b1a811"
2020-12-29 19:22:22 +00:00
TreeHugger Robot
370e631ea5
Merge "AudioSystem: Fix null check"
2020-12-29 19:22:06 +00:00
Steven Moreland
8461e26292
Merge "OWNERS - for binders" am: 55fe3d16a4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532277
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4744eefd92ed6ea133dd88014cc4f911c5e19b28
2020-12-29 19:21:24 +00:00
Baligh Uddin
6551570dc4
Adjust visibility rules for migration am: a958b1a811
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13273931
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I37cea94a20b51c992a280a043820b2774f6fbfc4
2020-12-29 19:20:47 +00:00
David Su
8196aaaaee
Merge "frameworks/base/wifi: unpack non-updatable/ folder"
2020-12-29 19:19:08 +00:00
TreeHugger Robot
c18877fe70
Merge "Fix passive request for NLP"
2020-12-29 18:45:06 +00:00
Steven Moreland
55fe3d16a4
Merge "OWNERS - for binders"
2020-12-29 18:43:29 +00:00
TreeHugger Robot
2f1cedb30a
Merge "Text gets 2 lines for Standard expanded and BigPicture notifications."
2020-12-29 17:53:53 +00:00
Treehugger Robot
0c423bee8f
Merge "Add some comments about thread-safety" am: d0c6e0fa08 am: 8b1745b2eb am: 964778feb8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1503391
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If64310c84837082a2172a4d9b30c2068370bd6fb
2020-12-29 17:29:22 +00:00
Jean-Michel Trivi
50daa70e0d
AudioService: updates to death of focus requester
...
On the death of a focus requester that is in the focus stack:
- keep track of event in AudioService event log
- notify focus follower policies of the focus loss
Bug: 155098568
Test: "adb shell dumpsys audio | grep died" after killing a focus client
Test: atest com.google.android.gts.audio.AudioHostTest#testFocusChangeMediaToGuidance
Change-Id: I455ca4c5292c609421b5ed37176ff94e756dd00b
2020-12-29 09:11:26 -08:00
Treehugger Robot
964778feb8
Merge "Add some comments about thread-safety" am: d0c6e0fa08 am: 8b1745b2eb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1503391
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If74f558d5dd3dc64902ea55f8effa626532d4b86
2020-12-29 17:05:33 +00:00
Treehugger Robot
8b1745b2eb
Merge "Add some comments about thread-safety" am: d0c6e0fa08
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1503391
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I547e6031e095b5d70e288332dd451635b048333f
2020-12-29 16:38:56 +00:00
Treehugger Robot
d0c6e0fa08
Merge "Add some comments about thread-safety"
2020-12-29 16:03:08 +00:00
Baligh Uddin
a958b1a811
Adjust visibility rules for migration
...
Adjusting visibility to accomodate migration of
frameworks/opt/net/wifi to packages/modules/Wifi.
BUG: 137323948
Test: TH
Change-Id: Ib4c481f6e17507fb5a423be83e04f4cbebfd10f5
Exempt-From-Owner-Approval: Internal CP of aosp/* CL.
2020-12-29 16:00:24 +00:00
Jeff DeCew
d14d72f6d2
Text gets 2 lines for Standard expanded and BigPicture notifications.
...
Test: manual
Fixes: 175325206
Change-Id: I01c693b1b990b7ac3538eb0a9d1fe3ee77e14c72
2020-12-29 14:40:27 +00:00
Anton Hansson
b5048e482e
Merge "Unbundle ART API from android-non-updatable" am: 5a4fc1d6e1 am: a81a5f1bdb am: f31935f2e9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533282
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibae612368c7cedd9812925f632bfbbf5e7c844d1
2020-12-29 12:27:11 +00:00
Anton Hansson
f31935f2e9
Merge "Unbundle ART API from android-non-updatable" am: 5a4fc1d6e1 am: a81a5f1bdb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533282
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I10733ea6a254c85ec624b271caa7dcfb05f72cc0
2020-12-29 11:48:51 +00:00
Anton Hansson
a81a5f1bdb
Merge "Unbundle ART API from android-non-updatable" am: 5a4fc1d6e1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533282
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I453e8e0ffd9d4c09c7e8d70c166b107df071d77c
2020-12-29 11:22:48 +00:00
Jing Ji
55e73cbf0b
Merge "[Bugfix] Fix the wrong lastBackgroundTime in UidRecord" am: 3d455315b4 am: 1eb96f8569 am: f8c208d072
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536309
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8988e285826214d8a127e3b6a02498f4ad5d57f8
2020-12-29 11:15:23 +00:00
Jing Ji
f8c208d072
Merge "[Bugfix] Fix the wrong lastBackgroundTime in UidRecord" am: 3d455315b4 am: 1eb96f8569
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536309
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifb1a6e643563098ffa29fc64c5d95fb3a30ac65f
2020-12-29 11:02:35 +00:00
Anton Hansson
5a4fc1d6e1
Merge "Unbundle ART API from android-non-updatable"
2020-12-29 10:31:44 +00:00
Jing Ji
1eb96f8569
Merge "[Bugfix] Fix the wrong lastBackgroundTime in UidRecord" am: 3d455315b4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536309
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id28c09fcf5e0014a7509a6873f55c02f19cf9c55
2020-12-29 10:19:05 +00:00
Jing Ji
3d455315b4
Merge "[Bugfix] Fix the wrong lastBackgroundTime in UidRecord"
2020-12-29 09:56:16 +00:00
TreeHugger Robot
b982261975
Merge "Reland "Do not add display area features for untrusted display""
2020-12-29 07:53:05 +00:00
Riddle Hsu
ac6d791c75
Reland "Do not add display area features for untrusted display"
...
Untrusted display (e.g. virtual display created by app, a common
case is screen recorder) doesn't support system decorations. There
is nothing to do with additional features.
This saves 31 areas (according to current features) per untrusted
display. And also reduce the cost of traversing entire hierarchy.
Reland since making DisplayContent#getWindowingLayer() valid by
commit 941ad3a.
Fixes: 175179353
Test: DisplayAreaPolicyTests#testEmptyFeaturesOnUntrustedDisplay
Test: Start Desktop Head Unit (simulation of Auto)
Change-Id: I3929d17eab6bed3f1358d6782e363120f0edd385
2020-12-29 05:33:11 +00:00
Alexander Dorokhine
fb182aebae
Merge "Update framework from Jetpack"
2020-12-29 05:24:10 +00:00
David Su
3976a1d61b
frameworks/base/wifi: unpack non-updatable/ folder
...
Everything remaining in frameworks/base/wifi is non-updatable.
Thus, unpack non-updatable/ folder and move everything under
wifi/.
Bug: 137323948
Test: presubmit
Change-Id: I6e1bd3fe6335b5dbe5f8ffa84a84df6434c95674
2020-12-29 04:49:50 +00:00
Paul Hu
7b848d34b7
Merge "Add DnsResolverServiceManager" am: 6bc7032b85 am: b3ea5a5a71 am: 206c66213e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1465502
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia89725249d9d6fca7a56b426a4bcb024ac8b1bb8
2020-12-29 03:45:34 +00:00
Paul Hu
206c66213e
Merge "Add DnsResolverServiceManager" am: 6bc7032b85 am: b3ea5a5a71
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1465502
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7e03c2432d2c0e95a8f157b94208cc81ad32ab3d
2020-12-29 03:29:34 +00:00