Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
466,324 Commits 3 Branches 0 Tags
7948993c499894dc3c54810f61bef8c193daefbc
Commit Graph

466324 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shu Chen
7948993c49 Merge "Limits the left/right bounds of the magnified text content within the textview." 2020-02-12 01:21:27 +00:00
Shu Chen
3cdd8e53b4 Merge "Don't show magnifier with animation for the new fisheye magnifier." 2020-02-12 01:09:17 +00:00
Shu Chen
2596513c60 Merge "Use the line height to adjust the Y coordinate for touch through." 2020-02-12 01:08:59 +00:00
Robert Shih
b14bb41bb4 Merge "atoms.proto: locally aggregate legacy drm API metrics" 2020-02-12 00:58:38 +00:00
TreeHugger Robot
7ef11494ea Merge "iorap: Disable iorap integration test temporarily." 2020-02-12 00:55:32 +00:00
Automerger Merge Worker
89580dc2ed Merge "Set boot image profile properties in a loop for BootImageProfileTest" am: 33905aa38d am: c0800cfc20 am: 68d208e6fa 
Change-Id: I39a6773363e49b6517cca4761b0221b5ccc3618d
 2020-02-12 00:54:01 +00:00
Automerger Merge Worker
0b49886dca Merge "Fix clang-tidy performance-faster-string-find warnings" am: 57fb318ca3 am: 7c0f0d3cec am: 40ef6319ca 
Change-Id: Id9d31a0c5cf41a0bb4a58326faa79511a1d8cc4a
 2020-02-12 00:53:37 +00:00
Yi Jiang
5040954f68 Merge "Moves Adaptive Sleep's settings from Settings.System to Settings.Secure" 2020-02-12 00:48:58 +00:00
Automerger Merge Worker
68d208e6fa Merge "Set boot image profile properties in a loop for BootImageProfileTest" am: 33905aa38d am: c0800cfc20 
Change-Id: I80e3bc47e902295785a1e999674ac4d408430a16
 2020-02-12 00:39:31 +00:00
Automerger Merge Worker
40ef6319ca Merge "Fix clang-tidy performance-faster-string-find warnings" am: 57fb318ca3 am: 7c0f0d3cec 
Change-Id: I181488a9d4c5aed3f62cf497ae6d092fcf27e7f6
 2020-02-12 00:39:15 +00:00
Ahaan Ugale
be020f681f Merge changes I396c2cb2,If04eb5ab 
* changes:
  Implement filtering for Inline Autofill.
  Some cleanup for autofill.Session.updateLocked()
 2020-02-12 00:31:59 +00:00
Julia Reynolds
d81c5ee32d Merge "Update notification text style" 2020-02-12 00:20:24 +00:00
Automerger Merge Worker
c0800cfc20 Merge "Set boot image profile properties in a loop for BootImageProfileTest" am: 33905aa38d 
Change-Id: Icda0be79e45ac0c61ed0051e6c2a8fc468042024
 2020-02-12 00:15:10 +00:00
Automerger Merge Worker
7c0f0d3cec Merge "Fix clang-tidy performance-faster-string-find warnings" am: 57fb318ca3 
Change-Id: Icdf5d2931d8e2503f0c2ebc5c7f87d349fdc59a8
 2020-02-12 00:14:47 +00:00
Soonil Nagarkar
d84283174a Merge "Fix build break" 2020-02-12 00:12:17 +00:00
TreeHugger Robot
b1a015996b Merge "Camera: Fix an error log spam for external camera" 2020-02-12 00:10:31 +00:00
Soonil Nagarkar
25c589eb78 Fix build break 
Bug: 149339822
Test: builds
Change-Id: Iacbb82c3ac99e282103eab511fb411289ffe3251
 2020-02-12 00:09:47 +00:00
Mathieu Chartier
33905aa38d Merge "Set boot image profile properties in a loop for BootImageProfileTest" 2020-02-12 00:05:58 +00:00
Treehugger Robot
57fb318ca3 Merge "Fix clang-tidy performance-faster-string-find warnings" 2020-02-11 23:57:08 +00:00
Anna Malova
488cc7721c Merge "Implement PacService using WebView's version of libpac." 2020-02-11 23:46:41 +00:00
TreeHugger Robot
f0c72dd6ba Merge "Fix: Use super Builder class for TsFilterConfiguration" 2020-02-11 23:44:07 +00:00
TreeHugger Robot
d1a06552f7 Merge "Move AppStandbyController synchronous event reporting logic" 2020-02-11 23:41:48 +00:00
TreeHugger Robot
dbf99edc73 Merge "Removing unused flags." 2020-02-11 23:38:50 +00:00
Sudheer Shanka
ed30feee1f Merge "Temporarily disable BlobStorePerfTests." 2020-02-11 23:31:35 +00:00
Igor Murashkin
62416783e0 iorap: Disable iorap integration test temporarily. 
It is broken because selinux is broken in cf_x86,
see bug b/149098310.

Disable it until the above bug is resolved or we come up
with a workaround.

Bug: 148765584
Change-Id: If0ac0f6dd04b1aad693405643f133361ad65f4fc
 2020-02-11 15:29:33 -08:00
Automerger Merge Worker
7cd9daebb1 Merge "Merge "Remove String16 operator<<, now provided in header" am: 35d04c27ee am: f1e6950510" into qt-qpr1-dev-plus-aosp am: 2593e104d5 
Change-Id: I5cc3034b3d8ad29a3244ab436325f1f6a5cf243c
 2020-02-11 23:26:19 +00:00
Automerger Merge Worker
ebf6810cff [automerger skipped] Merge "Re-activate backup service after cleaning a profile owner" into qt-qpr1-dev am: c1e78426b5 am: 03cebe3202 -s ours 
am skip reason: Change-Id I6f11642abe544c7df265ed7e2ad466d47796e7f9 with SHA-1 775b26d884 is in history

Change-Id: Ia047f13e3854172c2e93f41003fdaff9064987e7
 2020-02-11 23:25:54 +00:00
Automerger Merge Worker
cd0e77a93c [automerger skipped] Merge "CountryDetector: Enable detector class override for automotive" into qt-qpr1-dev am: 6ac8c0d096 am: 88fffb6ad6 -s ours 
am skip reason: Change-Id I158abd6397e3102d13e431ba043e8ce45061b64a with SHA-1 34147601d8 is in history

Change-Id: I2f184ee858a46ac5fd27500a949c884aca96aa01
 2020-02-11 23:25:31 +00:00
Automerger Merge Worker
2593e104d5 Merge "Merge "Remove String16 operator<<, now provided in header" am: 35d04c27ee am: f1e6950510" into qt-qpr1-dev-plus-aosp 2020-02-11 23:25:09 +00:00
Automerger Merge Worker
03cebe3202 Merge "Re-activate backup service after cleaning a profile owner" into qt-qpr1-dev am: c1e78426b5 
Change-Id: Ia7277711125ed3be7cf9914483601488f66e94ca
 2020-02-11 23:24:38 +00:00
Automerger Merge Worker
bf6bdc4849 Merge changes from topic "am-e90d0d50cdd34695a4d19e0f9412f330" 
* changes:
  [automerger skipped] Merge "DO NOT MERGE - Use TimingsTraceLog on SystemServiceManager and VoiceInteractionManagerService." into qt-qpr1-dev am: bace1cd5a4 am: fcc25eb58f -s ours am skip reason: subject contains skip directive
  [automerger skipped] DO NOT MERGE - Use TimingsTraceLog on SystemServiceManager and VoiceInteractionManagerService. am: ed30689e21 am: 88904f9cf3 -s ours am skip reason: subject contains skip directive
 2020-02-11 23:24:38 +00:00
Automerger Merge Worker
2f29a7c93b Merge "Remove String16 operator<<, now provided in header" am: 35d04c27ee am: f1e6950510 
Change-Id: I3b65daf966f8707e24598d9ded93d2e755acf907
 2020-02-11 23:24:32 +00:00
TreeHugger Robot
b75d9fdbed Merge "Allow crypto + credential auth with BiometricPrompt" 2020-02-11 23:24:25 +00:00
Automerger Merge Worker
23624a7823 [automerger skipped] Merge "DO NOT MERGE - Use TimingsTraceLog on SystemServiceManager and VoiceInteractionManagerService." into qt-qpr1-dev am: bace1cd5a4 am: fcc25eb58f -s ours 
am skip reason: subject contains skip directive

Change-Id: I75e53dccc34d2ff4d47970b0cd4b0a6473abcd07
 2020-02-11 23:24:25 +00:00
Automerger Merge Worker
8041f46367 [automerger skipped] DO NOT MERGE - Use TimingsTraceLog on SystemServiceManager and VoiceInteractionManagerService. am: ed30689e21 am: 88904f9cf3 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ife0122ba6d6f474513685b60f22caee4190e45ce
 2020-02-11 23:24:17 +00:00
Courtney Goeltzenleuchter
76e7d4d5fa Merge "Work around AM ContentObserver timing issue" 2020-02-11 23:21:03 +00:00
TreeHugger Robot
c1e78426b5 Merge "Re-activate backup service after cleaning a profile owner" into qt-qpr1-dev 2020-02-11 23:20:29 +00:00
Ned Burns
7a35b959d4 Merge "Don't auto-dismiss children with certain flags" 2020-02-11 23:07:49 +00:00
Automerger Merge Worker
88fffb6ad6 Merge "CountryDetector: Enable detector class override for automotive" into qt-qpr1-dev am: 6ac8c0d096 
Change-Id: I6fedf6dd00d79b9aeb7b48b91535fe44a936673b
 2020-02-11 23:05:08 +00:00
Automerger Merge Worker
fcc25eb58f Merge "DO NOT MERGE - Use TimingsTraceLog on SystemServiceManager and VoiceInteractionManagerService." into qt-qpr1-dev am: bace1cd5a4 
Change-Id: I1dc39baa8e353cf414cf6c591cd0ac3245b7cea2
 2020-02-11 23:04:08 +00:00
Automerger Merge Worker
88904f9cf3 DO NOT MERGE - Use TimingsTraceLog on SystemServiceManager and VoiceInteractionManagerService. am: ed30689e21 
Change-Id: If7965603748b09b8ea34528bf7c1bbf78986611f
 2020-02-11 23:03:55 +00:00
Automerger Merge Worker
f1e6950510 Merge "Remove String16 operator<<, now provided in header" am: 35d04c27ee 
Change-Id: I225b599e1bb7ba052361c0c0cb926b2c015f7baf
 2020-02-11 23:03:21 +00:00
TreeHugger Robot
6ac8c0d096 Merge "CountryDetector: Enable detector class override for automotive" into qt-qpr1-dev 2020-02-11 23:02:07 +00:00
TreeHugger Robot
fa65b021e4 Merge "Invert the DONT_AUTO_REVOKE permission flag" 2020-02-11 22:58:18 +00:00
Automerger Merge Worker
e6e36d32dc [automerger skipped] Merge "Give CONTROL_DEVICE_LIGHTS permission to the shell" am: 668daf0341 am: 285f6781c1 am: 30afdb5300 -s ours 
am skip reason: Change-Id I2b4224e79e013bae27ee068b0a0898b5afa5489a with SHA-1 413dd36486 is in history

Change-Id: Icaa2ce2ef30ea16b5920bb45d663c444da597c91
 2020-02-11 22:47:44 +00:00
TreeHugger Robot
c43c23cc55 Merge "Used ArrayList instead of ParceledListSlice to fix the weird null parceled field type in FillResponse" 2020-02-11 22:46:08 +00:00
TreeHugger Robot
0dbfca7775 Merge "Controls UI - Update drag behavior for ranges" 2020-02-11 22:44:37 +00:00
Alex Kershaw
e7a405a54e Merge "Give new permission to set cross-profile app-op to ManagedProvisioning" 2020-02-11 22:44:23 +00:00
Steven Moreland
35d04c27ee Merge "Remove String16 operator<<, now provided in header" 2020-02-11 22:43:26 +00:00
TreeHugger Robot
bace1cd5a4 Merge "DO NOT MERGE - Use TimingsTraceLog on SystemServiceManager and VoiceInteractionManagerService." into qt-qpr1-dev 2020-02-11 22:39:07 +00:00