Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
615,375 Commits 3 Branches 0 Tags
599aa30dd783f668f9449fe739abdcc04dea94de
Commit Graph

615375 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kriti Dang
513188ade3 Merge "Adding Match content frame rate setting preferences" 2020-12-11 12:56:48 +00:00
Orion Hodson
9e21ecbcb4 Merge "Revert "Keystore 2.0 SPI: Move keymint spec to security namespace."" am: bc641a41d8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1525805

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41900ac6d25d2c97b9222f116675ef0834e7196d
 2020-12-11 12:51:16 +00:00
TreeHugger Robot
f5e3ec56aa Merge "DPM: Deprecate password quality-related methods" 2020-12-11 12:46:14 +00:00
Vadim Caen
5f092e38a6 Merge "Adding Natanieljr@ to flicker owners" am: 51fa9312f4 am: 36a33d2e04 am: 1d746f6ece 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1518586

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I589c75fe2032fb010e2df53fcf2c30a7341fb6b4
 2020-12-11 12:40:47 +00:00
Orion Hodson
bc641a41d8 Merge "Revert "Keystore 2.0 SPI: Move keymint spec to security namespace."" 2020-12-11 12:29:46 +00:00
Vadim Caen
1d746f6ece Merge "Adding Natanieljr@ to flicker owners" am: 51fa9312f4 am: 36a33d2e04 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1518586

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba16feeff3ea7e316bf2426a05820f6ddc3c9f28
 2020-12-11 12:12:34 +00:00
Antonella Dellanzo
f17e9aebfc Merge "Updating IME tests" 2020-12-11 11:56:16 +00:00
Vadim Caen
36a33d2e04 Merge "Adding Natanieljr@ to flicker owners" am: 51fa9312f4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1518586

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I474f709ba96e5ebd2244f97160448a6ae8296344
 2020-12-11 11:38:01 +00:00
Vadim Caen
51fa9312f4 Merge "Adding Natanieljr@ to flicker owners" 2020-12-11 11:23:22 +00:00
Charles Chen
09f4e85ac2 Add more OWNERS coverages 
Test: manual
Bug: 174932174
Change-Id: Ia798bdbce8516a3d675c55028ab637ad7f0695cf
 2020-12-11 19:16:38 +08:00
Chloris Kuo
1f8634ec20 New DeviceConfig flags for NAS 
Add ENABLE_NAS_RANKING, ENABLE_NAS_PRIORITIZER, ENABLE_NAS_FEEDBACK

Test: atest NotificationManagerServiceTest; manual test on device
Bug: 175363481
Change-Id: I63ee375c14435e50ecaf755da6b7068af9afe57f
 2020-12-11 03:14:41 -08:00
Paul Hu
c70f1a8aee Merge "Replace PackageManager @hide APIs" am: 18cf9c197a am: 8804e02285 am: 5503eaee00 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523340

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I553db1721ab56fce663bc6db10aa23735f5788d8
 2020-12-11 11:06:55 +00:00
Robert Luo
2115e3c332 [automerger skipped] Merge "Migrate media output switcher metrics - 1/n" into rvc-qpr-dev am: 08652b64e2 -s ours am: 1826155ca1 -s ours 
am skip reason: Change-Id I0fea0c59afcb44fc1d22920036107524f221a7be with SHA-1 616339c1d0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icd556bf1108e793eac516c81959cfe1e3a741e63
 2020-12-11 11:04:37 +00:00
Paul Hu
60fefd4efe Merge "Expose TcpRepairWindow as module-lib API" am: f24f42ad0f am: 993efbdf84 am: 39f344f26b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519961

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae69946c88267eca4c350d902df0af50fca9de5b
 2020-12-11 11:04:22 +00:00
Chalard Jean
03867a2590 Merge changes from topic "remove_legacy_NA" am: 362fc1ca1f am: c65281e9c4 am: 0e91f659ba 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456097

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9cd6ce929a7103d2d6b7195a71ee64ea0a4ee0a
 2020-12-11 11:03:36 +00:00
Lucas Lin
314d474511 Merge "Use getUserHandles() instead of getUsers() to get user id" am: 6bb994193c am: b35b88df27 am: f8816479a3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513050

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7fa8802614bf28453501cdc2bc1989b3531b2280
 2020-12-11 11:02:48 +00:00
Robert Luo
b8dfee3e63 [automerger skipped] Merge "Migrate media output switcher metrics - 2/n" into rvc-qpr-dev-plus-aosp am: 55bb21ba01 -s ours 
am skip reason: Change-Id I0fea0c59afcb44fc1d22920036107524f221a7be with SHA-1 530e9c28df is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I75304940619a39edcccfb3be382f7d2e0db62d4f
 2020-12-11 11:02:06 +00:00
Treehugger Robot
b51c302f66 Merge "Add O-O TLMs to top-level owners" am: 0c04c92306 am: 736b9d9629 am: 1c60ee31ac 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523822

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6191d0ee702f119476ddcea19d1498bc5cf066b6
 2020-12-11 11:01:40 +00:00
Shawn Willden
577c22a23e Merge "Keystore 2.0 SPI: Move keymint spec to security namespace." am: f0c3865132 am: 50df7a46cf am: ce6b4c47e2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1521879

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I085ddcc310b6189ae313959c9a0f349404faa178
 2020-12-11 11:01:03 +00:00
Hui Wang
cf0c70a5da [automerger skipped] Merge "Support Gba Api" am: 4c9e7a8d0c am: 3c7ba99acf am: 864505529c -s ours 
am skip reason: Change-Id I9aea4c8bc2123b6d00c4a8ddf9901c885d2742d2 with SHA-1 b23fb332fc is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51bb3d4d266b370d34df103e08611e1b0e495417
 2020-12-11 11:00:00 +00:00
Jordan Liu
a07eacba3b [automerger skipped] Merge "Add API for setting SIM power "synchronously"" am: beb163c655 am: 5a9aa7c8d2 am: bccf3aa384 -s ours 
am skip reason: Change-Id I958d6c3a46cc6e99e8addf2628361e37bc178464 with SHA-1 9a081450c2 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94877a636d877c05f8798a8ae6d2e57cf06b07a2
 2020-12-11 10:57:45 +00:00
Jeff Sharkey
d25af5c84a Merge "configure owners for ShortcutInfo" am: 694df14654 am: 2948fb99c5 am: e6d38e61cc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520446

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If5877f9fc510c553e3299d1e33fc3ec4f2d74137
 2020-12-11 10:57:13 +00:00
Hansong Zhang
345634607e Merge "Bluetooth airplane listener: Check for null" am: 2b7a7f8ec9 am: 38a83f01dc am: e2654876bf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1522300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a788dbd9c3f57b44261a4fa3b1d575166d0274f
 2020-12-11 10:56:32 +00:00
TreeHugger Robot
cf890eaf03 Merge "Update rotary highlight on bordered buttons" into rvc-qpr-dev am: 773641f557 am: ae05f9703a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13181025

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I84a1bcf390366d45792a974256a61b82291d0100
 2020-12-11 10:55:59 +00:00
Brad Ebinger
f6712beb30 Merge "Add SipDelegateConnection#closeDialog" am: 39dd3d8868 am: 8a047dba42 am: c17829d67c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1518210

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia4d1f19e8011a17f1bb8519177d9986a5056481c
 2020-12-11 10:55:12 +00:00
Michael Groover
202f0a9e7b Merge "Add OWNERS for sensor privacy" am: 05c699d02e am: f2c250acb9 am: 272b06dce4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520165

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib7e85018f7677944dbdd7417bbfbbc8a6824be68
 2020-12-11 10:54:34 +00:00
TreeHugger Robot
ade62a72f8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 2ca34ba0a3 -s ours am: 9a96522244 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idcce1810aa357a1bd01c7efc1c16d6af86fb1d1f
 2020-12-11 10:53:51 +00:00
Treehugger Robot
7dc46c2967 Merge "Add a mutability flag to the PendingIntent" am: e80c5b3335 am: e533762175 am: c5de5cc502 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1505734

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d71235f8a61e617f95094da1154342c00e9b8d5
 2020-12-11 10:53:02 +00:00
Treehugger Robot
7bf6618a7c Merge "HDMICEC: Change hashcode for HdmiPortInfo" am: d8cd3c7d2d am: 8f4bb0a2a5 am: d489358491 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483970

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b51ab9aca8ae4708dc1b276eb23f549f3e13fcc
 2020-12-11 10:52:27 +00:00
Paul Hu
a50b72cff9 Merge "Address leftover comments" am: 1ddb4889b6 am: 5c19cb00cc am: b91a2d415f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495899

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3f46b0c6d5c2dcce540fcb1f9d7f2cc22c934f93
 2020-12-11 10:51:37 +00:00
Jeff Sharkey
3ae096f1be Merge "Additional per-file OWNERS for shared directories." am: 8b102a5988 am: 7a9f3e10de am: 845bfdd0ba 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523618

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id32f96bb4acc5bd3a41cfd0750abfbba274c42cb
 2020-12-11 10:51:09 +00:00
Paul Duffin
24c79cdb88 Merge "Unbundle i18n API from android-non-updatable" am: 17e6d5b6a3 am: 3322b2800a am: f358ccece0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513291

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I576e27b966d5e7b731a3f944bdee353e2cac9106
 2020-12-11 10:50:29 +00:00
TreeHugger Robot
9b1405c676 Merge "Fix wrong target launches in Chooser." into rvc-qpr-dev am: 14692e3d21 am: 0277812fc3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13157627

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I61de05f8b4b8642d41573f408e02d818c898f052
 2020-12-11 10:49:57 +00:00
Jeff Sharkey
41859c2353 Merge "Update OWNERS info for NetworkPolicy related files." am: c9dc68f063 am: 532338d7ce am: 05c024c6a1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1522897

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b90977342f2d8aecf0b8348ee56ad0d673b6017
 2020-12-11 10:49:07 +00:00
Paul Hu
5503eaee00 Merge "Replace PackageManager @hide APIs" am: 18cf9c197a am: 8804e02285 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523340

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I018004ee98ac6b9fada57972ca2affeb94ef4956
 2020-12-11 10:49:04 +00:00
Orion Hodson
6acd9c63e7 Revert "Keystore 2.0 SPI: Move keymint spec to security namespace." 
Revert "Keystore 2.0: Move keymint spec to security namespace."

Revert "Keystore 2.0: Move keymint spec to security namespace."

Revert "Move keymint to android.hardware.security."

Revert "Configure CF to start KeyMint service by default."

Revert "Move keymint to android.hardware.security."

Revert "Move keymint to android.hardware.security."

Revert submission 1522123-move_keymint

Reason for revert: Build breakage
Bug: 175345910
Bug: 171429297
Reverted Changes:
Ief0e9884a:Keystore 2.0: Move keymint spec to security namesp...
Idb54e8846:Keystore 2.0: Move keymint spec to security namesp...
I9f70db0e4:Remove references to keymint1
I2b4ce3349:Keystore 2.0 SPI: Move keymint spec to security na...
I2498073aa:Move keymint to android.hardware.security.
I098711e7d:Move keymint to android.hardware.security.
I3ec8d70fe:Configure CF to start KeyMint service by default.
Icbb373c50:Move keymint to android.hardware.security.
I86bccf40e:Move keymint to android.hardware.security.

Change-Id: Icd279f358db2387bf2bf232b0548762fab51e67d
 2020-12-11 10:45:43 +00:00
Martijn Coenen
9da97c2d39 Don't kill apps receiving OP_REQUEST_INSTALL_PACKAGES. 
We used to kill these apps to give them the correct OBB mount view; but
very few apps use OBBs in the first place, and those that do can
manually restart to make sure they have the correct access permissions.

Bug: 157493954
Bug: 157674306
Test: atest CtsPackageInstallTestCases
Change-Id: Ia97c9f70b4184edf83c030b8a8ee0e5c7de127ec
 2020-12-11 11:17:14 +01:00
TreeHugger Robot
340da879d2 Merge "Cache font data." 2020-12-11 10:11:38 +00:00
Paul Hu
8804e02285 Merge "Replace PackageManager @hide APIs" am: 18cf9c197a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523340

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id4e2fab962ba401f2c941c58c0eb2210a8f835e7
 2020-12-11 10:05:38 +00:00
Fiona Campbell
85e44fd033 Merge "Fix up LogicalDisplayMapper" 2020-12-11 10:02:13 +00:00
Paul Hu
18cf9c197a Merge "Replace PackageManager @hide APIs" 2020-12-11 09:50:28 +00:00
Jason Chang
35909fc175 Merge "Fix one-handed-tutorial-overlay connection is permanently present" 2020-12-11 09:30:54 +00:00
Bill Lin
60ae7ac35b 6-1/ Integrate SplitScreen rotation flicker tests 
Enable the rotation tests and aling the structure of WMShell
Flicker test cases

Bug: 169271943
Test: atest WMShellFlickerTests:RotateOneLaunchedAppTest
Test: atest WMShellFlickerTests:RotateTwoLaunchedAppTest

Change-Id: Ieeafc42562e99c5aa26547625b13ec2af35871c1
 2020-12-11 17:13:54 +08:00
Bill Lin
3e2cf2ea9c 5-1/ Migrate CTS split screen testNonResizeable tests 
1. testNonResizeableNotDocked
2. testNonResizeableWhenAlreadyInSplitScreenPrimary
3. testNonResizeableWhenAlreadyInSplitScreenSecondary
4. Refine the test flow to be more effeciency

Test: atest WMShellFlickerTests:EnterSplitScreenTest
Test: atest WMShellFlickerTests:AppPairsTest
Bug: 161435597

Change-Id: I271a522f220a65b1be7de6599a9ed185f06888b3
 2020-12-11 17:13:54 +08:00
Chih-Yu Huang
a77c8dff43 MediaMetadataRetriever: Fix null pointer exception 
This CL fixes a null pointer exception by adding a null check.

Bug: 170357507
Test: run android.media.cts.ThumbnailUtilsTest and no crash
Change-Id: I60645e4382700993ff7e1bc992b970d89b5b600e
(cherry picked from commit fc24bd264ef1f599efa834fc120bc6d1ed304af3)
 2020-12-11 09:12:50 +00:00
Nicolas Geoffray
0874a6fb49 Remove FastNative annotations on synchronized methods. 
FastNative doesn't work on synchronized methods.

Bug: 175016705
Test: 004-JniTest
Change-Id: I1e34c78a8438c67e5a1bedb83eb977389ee9a82d
Merged-In: I1e34c78a8438c67e5a1bedb83eb977389ee9a82d
(cherry picked from commit 7c4c101a7b)
 2020-12-11 09:11:44 +00:00
Terry Wang
55afae1f51 Merge "Revert "Porting AppSearch jetpack upstream changes to platform"" 2020-12-11 09:02:35 +00:00
Terry Wang
b000576dff Revert "Porting AppSearch jetpack upstream changes to platform" 
This reverts commit 93e2122828.

Reason for revert: <Bad merge, doesn't compile on top of ag/13173954>

Change-Id: I240ebae5eccc81c3c7e6fad7f755f2de0f4ba54b
 2020-12-11 08:59:37 +00:00
Nicolas Geoffray
2fe5ed0076 Merge "Remove FastNative annotations on synchronized methods." 2020-12-11 08:52:40 +00:00
Terry Wang
8e06779efb Merge "Porting AppSearch jetpack upstream changes to platform" 2020-12-11 08:21:56 +00:00