Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
622,087 Commits 3 Branches 0 Tags
ea7f3662da33f602d55dbbf1e05df5e109ee3bc4
Commit Graph

622087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Junyu Lai
ea7f3662da Merge "[FUI20] Expose UnderlyingNetworkInfo as system Api" am: 75b50a5c73 am: ce1b075b2b am: 93af32819c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563496

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia294d4ec349db10f5486b27f733d4f6d223079bf
 2021-02-03 04:32:04 +00:00
Jack Yu
3b35ad2fda [automerger skipped] Merge "Add attr for nfc applications to configure support power states" am: 809b2f2459 am: 87e9535aa3 am: 73b63e3819 -s ours 
am skip reason: Change-Id I03bd537082117e595a7badfb2d8ca6ee7cae08cf with SHA-1 ad9223f687 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd37207790f6ab84ca0e089c7fb7a17765667607
 2021-02-03 04:31:10 +00:00
Jeongik Cha
d647902ca6 Merge "Specify version for aidl_interface explicitly" am: 4561d23a6a am: 66783f7bb6 am: 274d92c6a3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569000

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad0b9a4fecbf0082a839a7b47fc036acc8a04f9e
 2021-02-03 04:28:30 +00:00
Julia Reynolds
5846da7a7b Merge "Fix NPE" into sc-dev 2021-02-03 04:18:57 +00:00
TreeHugger Robot
12442e7ab9 Merge "Dump install permission states for non-system users." into sc-dev 2021-02-03 04:10:51 +00:00
Alex Buynytskyy
297b6fe036 Merge "Per UID DataLoader API." into sc-dev 2021-02-03 03:59:47 +00:00
TreeHugger Robot
f983fdecf3 Merge "Fix function return type" into sc-dev 2021-02-03 03:47:34 +00:00
Kevin Chyn
dcb5ed7804 Merge "Refactor UdfpsView into FrameLayout containing 2 views" into sc-dev 2021-02-03 03:41:46 +00:00
Junyu Lai
93af32819c Merge "[FUI20] Expose UnderlyingNetworkInfo as system Api" am: 75b50a5c73 am: ce1b075b2b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563496

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2cb57c40fd5679dbd710396f3c69deafbac9d1c3
 2021-02-03 03:31:59 +00:00
Jack Yu
73b63e3819 Merge "Add attr for nfc applications to configure support power states" am: 809b2f2459 am: 87e9535aa3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470724

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5eaefb99522965e3f776868be11bb663712f6deb
 2021-02-03 03:31:45 +00:00
Jeongik Cha
274d92c6a3 Merge "Specify version for aidl_interface explicitly" am: 4561d23a6a am: 66783f7bb6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569000

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I67455ea4e8268e00c946cd82e9da77492157ed79
 2021-02-03 03:29:57 +00:00
Tracy Zhou
d9ae4ce860 Merge "Show floating rotation button in visual immersive mode" into sc-dev 2021-02-03 03:28:41 +00:00
Riddle Hsu
6ab44a81d6 Merge "Restore overridePendingTransition to a sync binder call" into sc-dev 2021-02-03 03:05:20 +00:00
Junyu Lai
ce1b075b2b Merge "[FUI20] Expose UnderlyingNetworkInfo as system Api" am: 75b50a5c73 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563496

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icbc3c9f8e1ac8064e2e006587b4d4870d74cee2d
 2021-02-03 03:03:01 +00:00
Lucy Chang
ce003478e6 Merge "Clear data after calling ViewGroup#buildOrderedChildList" into sc-dev 2021-02-03 03:02:11 +00:00
Jack Yu
87e9535aa3 Merge "Add attr for nfc applications to configure support power states" am: 809b2f2459 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470724

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3d789cfa9ba6cc199e53663eda34f8c4586b1dbf
 2021-02-03 03:00:32 +00:00
Jeongik Cha
66783f7bb6 Merge "Specify version for aidl_interface explicitly" am: 4561d23a6a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569000

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id433b0dc1a6619df372a050a98d8cb76bc40f5d2
 2021-02-03 02:57:26 +00:00
Ahaan Ugale
b7fd9a7814 Merge "VIMS: Clarify NonNullability of PackageMonitor#onPackageModified." into sc-dev 2021-02-03 02:57:18 +00:00
Junyu Lai
75b50a5c73 Merge "[FUI20] Expose UnderlyingNetworkInfo as system Api" 2021-02-03 02:57:10 +00:00
Matt Casey
081a843f37 Merge "Add CropView for long screenshots" into sc-dev 2021-02-03 02:32:49 +00:00
Jack Yu
809b2f2459 Merge "Add attr for nfc applications to configure support power states" 2021-02-03 02:28:03 +00:00
Jeongik Cha
4561d23a6a Merge "Specify version for aidl_interface explicitly" 2021-02-03 02:21:26 +00:00
TreeHugger Robot
b44f228ef0 [automerger skipped] Merge changes from topic "cdm_overlay-rvc-dev" into rvc-dev am: f82228a753 -s ours am: 5ba75303b2 -s ours am: 57211d9b8e -s ours 
am skip reason: Change-Id I78673b7b95f4c3cb31fab180201eb17c9123bddf with SHA-1 43e8c61bee is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43c261eaa0c5402d6ab38930f0527b7e438dc7a4
 2021-02-03 02:20:55 +00:00
Bill Yi
bdc804fbf2 [automerger skipped] Merge "Merge RQ1A.210205.004 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 1f8d77630b -s ours am: bae4b28af4 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd9c74a8bbcfdf31e87fca59da5aa6500ba8e742
 2021-02-03 02:20:16 +00:00
TreeHugger Robot
2ba86c63f9 Merge "Update Javadoc of AGC" into sc-dev 2021-02-03 02:18:08 +00:00
Greg Kaiser
33d192d243 Fix function return type 
Test: TreeHugger
Bug: 162993824
Change-Id: I2336a0c2bf3f71cc0b0bc1ef491a1043e88f359e
Merged-In: I2336a0c2bf3f71cc0b0bc1ef491a1043e88f359e
(cherry picked from commit c74d7163b0)
 2021-02-03 02:18:05 +00:00
TreeHugger Robot
57211d9b8e [automerger skipped] Merge changes from topic "cdm_overlay-rvc-dev" into rvc-dev am: f82228a753 -s ours am: 5ba75303b2 -s ours 
am skip reason: Change-Id I78673b7b95f4c3cb31fab180201eb17c9123bddf with SHA-1 43e8c61bee is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I638e37c4577c772091c331983c14890bfda89947
 2021-02-03 02:04:34 +00:00
Bill Yi
bae4b28af4 [automerger skipped] Merge "Merge RQ1A.210205.004 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 1f8d77630b -s ours 
am skip reason: Change-Id Ie9567c088e4fff075cce5b6f44bd73199377c91b with SHA-1 84e0d68f06 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99669e9f9f59c317bb8adfdde24e3ef49a938371
 2021-02-03 01:34:43 +00:00
Hongwei Wang
58b9a4e48e Merge "Add an invisible layer to trap focus" into sc-dev 2021-02-03 01:22:03 +00:00
TreeHugger Robot
5ba75303b2 [automerger skipped] Merge changes from topic "cdm_overlay-rvc-dev" into rvc-dev am: f82228a753 -s ours 
am skip reason: Change-Id I78673b7b95f4c3cb31fab180201eb17c9123bddf with SHA-1 43e8c61bee is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia351d28d32bb05f90e6fb0a2cac32b43da8a4592
 2021-02-03 01:21:42 +00:00
Kohsuke Yatoh
18d5330860 Merge "Integration test for updatable system font." into sc-dev 2021-02-03 01:11:59 +00:00
Bill Yi
1f8d77630b Merge "Merge RQ1A.210205.004 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master 2021-02-03 01:00:40 +00:00
Ray Essick
c82197a055 Merge "Audio encoder specifies channel-range" into sc-dev 2021-02-03 00:51:05 +00:00
Kevin Chyn
45bc1fc352 Refactor UdfpsView into FrameLayout containing 2 views 
1) Views are shown mutually exclusively.
2) No longer need to drawImmediately(clearRunnable) in stopIllumination,
   since the view is set to View.INVISIBLE
3) Moved setOnIlluminatedRunnable to startIllumination as a param

Fixes: 179080247

Test: atest com.android.systemui.biometrics

Change-Id: I7e94df165020401685c91922924724f142585832
 2021-02-02 16:49:10 -08:00
TreeHugger Robot
f82228a753 Merge changes from topic "cdm_overlay-rvc-dev" into rvc-dev 
* changes:
  Allow CDM to hide overlays
  Prevent non-system overlays from showing over CDM UI
 2021-02-03 00:48:45 +00:00
Evan Severson
1892798a28 Merge "Make some small fixes to sensor privacy ui" into sc-dev 2021-02-03 00:44:33 +00:00
TreeHugger Robot
32b5e4cf7a [automerger skipped] Merge "Fix thread safety issue on clearing cache" into rvc-dev am: 5d559ac700 -s ours am: 557c900d60 -s ours am: 36b1178692 -s ours 
am skip reason: Change-Id I47d53a6d9d274bca4c78dbfd87e0097091b7b8cb with SHA-1 db097214b1 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I71861fce273fe5f1ce15b7e0a721edc4d5386aa1
 2021-02-03 00:43:06 +00:00
TreeHugger Robot
3cdbafaea4 [automerger skipped] Merge "RESTRICT AUTOMERGE Allow CDM to hide overlays" into rvc-qpr-dev am: 40ef3c251c am: cc962fcecc -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id42dcc998c60f347a9435273e7a4235a54c82b48
 2021-02-03 00:42:50 +00:00
Eugene Susla
5471c27e28 [automerger skipped] RESTRICT AUTOMERGE am: 43e8c61bee am: a7b5d8209d -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief20fdedef4f34d62783817b375be4967d980940
 2021-02-03 00:42:41 +00:00
TreeHugger Robot
66fb73c05a [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over CDM UI" into rvc-qpr-dev am: 32cb36ec45 am: a798d995bc -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idcbce1248d5d9287951efc8b920978c5f260a691
 2021-02-03 00:42:32 +00:00
Eugene Susla
82a1d2de1e [automerger skipped] RESTRICT AUTOMERGE am: 3c2fece4a5 am: 73f0570cea -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46cc3698eb16bf0f438288ebfe4e67aa4c38c46d
 2021-02-03 00:42:16 +00:00
TreeHugger Robot
a6921e36df [automerger skipped] Merge "Fix thread safety issue on clearing cache" into rvc-qpr-dev am: 666deabeb8 -s ours am: f18f915e8a -s ours 
am skip reason: Change-Id I47d53a6d9d274bca4c78dbfd87e0097091b7b8cb with SHA-1 5e74205b8b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20c7ef5ce9f202d67466bc3daa0a004b0788950f
 2021-02-03 00:41:51 +00:00
TreeHugger Robot
fcc5aa50be Merge changes from topic "cdm_overlay-pi-dev" into pi-dev am: 99e5a28c5b am: 260d69a4d5 am: 82b0600bfe am: 519201b871 am: 68feffb983 am: 3d6c04b1ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180987

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I00af246090a8ca441e17ac9b14c398c1679777f0
 2021-02-03 00:41:21 +00:00
Eugene Susla
cd470cd604 [automerger skipped] RESTRICT AUTOMERGE am: 486773ff45 -s ours am: 56cc3b82c2 am: 175d275bb9 -s ours am: 282a2a51b4 am: 2c4a99cd30 am: 35b88a2ab3 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd6baa4e172fbcd72782768a9ce265957ce1d2c8
 2021-02-03 00:41:12 +00:00
TreeHugger Robot
9593709b41 [automerger skipped] Merge "[SettingsProvider] extend font size scale range" into qt-dev am: a9638beba3 -s ours am: 146953dfff -s ours am: 0debf904b1 -s ours am: 8af18c0771 -s ours am: 355f521339 -s ours 
am skip reason: Change-Id Icff82d727d63da4353342b0f9a5ca3c2ae1671c1 with SHA-1 9b6c0faca3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b8e30143410cbf445e8555eacf435645be9cf73
 2021-02-03 00:40:29 +00:00
TreeHugger Robot
36b1178692 [automerger skipped] Merge "Fix thread safety issue on clearing cache" into rvc-dev am: 5d559ac700 -s ours am: 557c900d60 -s ours 
am skip reason: Change-Id I47d53a6d9d274bca4c78dbfd87e0097091b7b8cb with SHA-1 db097214b1 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I30fef742e5062d4a027a8eb2f5066e704a255f00
 2021-02-03 00:39:47 +00:00
TreeHugger Robot
cc962fcecc Merge "RESTRICT AUTOMERGE Allow CDM to hide overlays" into rvc-qpr-dev am: 40ef3c251c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180411

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I02d5142bd27cd61c9abbde1f449717e9098ffa75
 2021-02-03 00:39:26 +00:00
Eugene Susla
a7b5d8209d RESTRICT AUTOMERGE am: 43e8c61bee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180411

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1f962e610445417910f38b1e598365083f7b880e
 2021-02-03 00:39:19 +00:00
TreeHugger Robot
a798d995bc Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over CDM UI" into rvc-qpr-dev am: 32cb36ec45 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12931376

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6bf3ebc643f425b4f9efe5312d78922d50954d40
 2021-02-03 00:39:12 +00:00
Eugene Susla
73f0570cea RESTRICT AUTOMERGE am: 3c2fece4a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12931376

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec0d2821646244c13f5de537933abf9c5145b067
 2021-02-03 00:39:07 +00:00