Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
398,167 Commits 3 Branches 0 Tags
027ff086227ab6b4e1f6bc7c4d623c19e9eda31a
Commit Graph

398167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Roos
027ff08622 Merge "DPM: Fix regression from I54376f60ac53451ace22965d331b47cd8c2e614e" 2019-01-08 11:47:30 +00:00
Tony Mak
75f2103a12 [automerger skipped] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am: d9e75a497e am: 3f552669e3 -s ours am: 4c7d37551c -s ours am: 2e28ea61b6 -s ours 
am: 8695a69b28 -s ours
am skip reason: subject contains skip directive

Change-Id: I91ecbf4aa4f1395cf97de01142fd8be30436b35e
 2019-01-08 03:42:38 -08:00
Tony Mak
8695a69b28 [automerger skipped] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am: d9e75a497e am: 3f552669e3 -s ours am: 4c7d37551c -s ours 
am: 2e28ea61b6 -s ours
am skip reason: change_id Ib2ee544b5783234fba8ee2f93adf0b36b039520f with SHA1 4e3507d544 is in history

Change-Id: I479e3a6a7727c99551c3495626a0c8364836151c
 2019-01-08 03:27:00 -08:00
Tony Mak
2e28ea61b6 [automerger skipped] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am: d9e75a497e am: 3f552669e3 -s ours 
am: 4c7d37551c -s ours
am skip reason: subject contains skip directive

Change-Id: If9615b7e3e519e0270646ea2d4500f8a14644190
 2019-01-08 03:11:12 -08:00
Tony Mak
4c7d37551c [automerger skipped] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am: d9e75a497e 
am: 3f552669e3 -s ours
am skip reason: change_id Ib2ee544b5783234fba8ee2f93adf0b36b039520f with SHA1 4e3507d544 is in history

Change-Id: I71dac905e55f732d839549d15700ee6d4db537e7
 2019-01-08 03:01:16 -08:00
Tony Mak
3f552669e3 RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. 
am: d9e75a497e

Change-Id: Id1b62f552f29ef9a20d78bb7487201452dfda601
 2019-01-08 02:50:57 -08:00
Annie Meng
e505098033 Merge "[Multi-user] Clean up backup enabled initialization" 2019-01-08 10:08:28 +00:00
Jackal Guo
01a6fc95fe Merge "Add description for android:canRetrieveWindowContent" 2019-01-08 09:37:37 +00:00
Jackal Guo
427d222ba7 Add description for android:canRetrieveWindowContent 
An AccessibilityService would need both capability and flag for
retrieving content of all interactive windows.

Bug: 122497116
Test: build pass
Change-Id: I3483a250a8fb8fef69f33b4e8e170a477e8a5ca0
 2019-01-08 09:12:20 +00:00
Anton Hansson
d19320a2a0 [automerger skipped] Merge "Move default sounds to /product" am: 6feab6bf6c am: d60c748952 
am: b0affe2100 -s ours
am skip reason: change_id I3bfc71b46eb64b4d4614b62c65fb8821bf1c271a with SHA1 b8f6d0d5bf is in history

Change-Id: I86a46f0d8dee265f726c3d28db0d27b307865251
 2019-01-08 00:45:49 -08:00
Anton Hansson
b0affe2100 Merge "Move default sounds to /product" am: 6feab6bf6c 
am: d60c748952

Change-Id: I7db05bc821316ac046f125c42ea332051c1f2f69
 2019-01-08 00:36:18 -08:00
Chalard Jean
5ceb006d4d Merge "Add nullability annotations to public methods of ConnManager." am: 805e2ad9db am: 59c8590f7b 
am: 0b08cd3e1a

Change-Id: I156f825d4f878ef9de394b38abb934de96b01038
 2019-01-08 00:29:39 -08:00
Anton Hansson
d60c748952 Merge "Move default sounds to /product" 
am: 6feab6bf6c

Change-Id: I36f9e88d465dcf0417ea73e5e3bfbd9c38bb1398
 2019-01-08 00:27:02 -08:00
Chalard Jean
0b08cd3e1a Merge "Add nullability annotations to public methods of ConnManager." am: 805e2ad9db 
am: 59c8590f7b

Change-Id: If2e704e1f8ddf504be9e777ec226b2ce524438dc
 2019-01-08 00:19:52 -08:00
Anton Hansson
6feab6bf6c Merge "Move default sounds to /product" 2019-01-08 08:17:55 +00:00
Chalard Jean
59c8590f7b Merge "Add nullability annotations to public methods of ConnManager." 
am: 805e2ad9db

Change-Id: I8f5cc35869b4b76404190709206cccd895a1d4b4
 2019-01-08 00:10:38 -08:00
Chalard Jean
805e2ad9db Merge "Add nullability annotations to public methods of ConnManager." 2019-01-08 07:58:13 +00:00
Jack Yu
8d27192f4c Merge "Cleaned up dead code" am: d5a744abb6 am: c5aa9448a7 
am: cbdc0f57f9

Change-Id: I53f9fd3bbec32bd08a89bdcc8751c8cca1ac39a3
 2019-01-07 23:12:33 -08:00
Jack Yu
cbdc0f57f9 Merge "Cleaned up dead code" am: d5a744abb6 
am: c5aa9448a7

Change-Id: Ibab85fe8fcfab852d1f761749135e61dd7dfe7e7
 2019-01-07 23:03:07 -08:00
Jack Yu
c5aa9448a7 Merge "Cleaned up dead code" 
am: d5a744abb6

Change-Id: Ie70c6186ea81b5066f821b5d9f818f39b2e8282e
 2019-01-07 22:53:29 -08:00
Michael Wachenschwanz
266dd3bfd7 Merge "Add Usage Reporting Api to UsageStatsManager" 2019-01-08 06:50:24 +00:00
TreeHugger Robot
0217050032 Merge "Use singleton WindowManagerService for testing" 2019-01-08 06:47:55 +00:00
Treehugger Robot
d5a744abb6 Merge "Cleaned up dead code" 2019-01-08 06:36:18 +00:00
Remi NGUYEN VAN
3abc006fd7 Merge "Fix linter errors in NetworkMonitor" am: 2e1d80d4e7 am: 81554a871b 
am: 833d541de5

Change-Id: Ib68082423e4c92e9ac8effb39582a9ca152f6795
 2019-01-07 22:33:45 -08:00
Android Build Merger (Role)
d079e5bd56 Merge "Merge "Fix linter errors in IpServer and its dependencies" am: a9be76c393 am: 4adb05b6b0 am: c922a83872" 2019-01-08 06:13:21 +00:00
TreeHugger Robot
a139abcfcc Merge "Fix restoring animator_duration_scale back to default" 2019-01-08 06:12:50 +00:00
Remi NGUYEN VAN
6df7f12607 Merge "Fix linter errors in IpServer and its dependencies" am: a9be76c393 am: 4adb05b6b0 
am: c922a83872

Change-Id: I4724c27872dc11eb53ed4561743a648ef87bf434
 2019-01-07 22:12:50 -08:00
Remi NGUYEN VAN
833d541de5 Merge "Fix linter errors in NetworkMonitor" am: 2e1d80d4e7 
am: 81554a871b

Change-Id: I615c133c5559731f249640151d2b82e357e38807
 2019-01-07 22:08:03 -08:00
TreeHugger Robot
ee57097de9 Merge "Add support for secondary display with display ID" 2019-01-08 06:05:49 +00:00
Remi NGUYEN VAN
c922a83872 Merge "Fix linter errors in IpServer and its dependencies" am: a9be76c393 
am: 4adb05b6b0

Change-Id: Ie3d6285fa7da96fee10028b38aa6c5a8d5c85c48
 2019-01-07 22:02:27 -08:00
Remi NGUYEN VAN
81554a871b Merge "Fix linter errors in NetworkMonitor" 
am: 2e1d80d4e7

Change-Id: Ic0ba68f6dcc9cddb81641663c4a9961917f845d2
 2019-01-07 21:50:54 -08:00
liulvping
eafbb21fed Merge "fix mmap leak of graphicsstats service" am: 9ebc299b73 am: a2b2a415f0 
am: be2b5dab88

Change-Id: I0507151e3394d6d599316b8b90e2fd50af20fdbe
 2019-01-07 21:49:47 -08:00
Remi NGUYEN VAN
4adb05b6b0 Merge "Fix linter errors in IpServer and its dependencies" 
am: a9be76c393

Change-Id: Id21d01f146febdc4f156c4a8c0f439e21301d3a9
 2019-01-07 21:46:53 -08:00
liulvping
be2b5dab88 Merge "fix mmap leak of graphicsstats service" am: 9ebc299b73 
am: a2b2a415f0

Change-Id: I9da0210799cee14bb36afd186d26fbb1718ffc19
 2019-01-07 21:36:12 -08:00
Remi NGUYEN VAN
2e1d80d4e7 Merge "Fix linter errors in NetworkMonitor" 2019-01-08 05:33:45 +00:00
Remi NGUYEN VAN
a9be76c393 Merge "Fix linter errors in IpServer and its dependencies" 2019-01-08 05:32:26 +00:00
liulvping
a2b2a415f0 Merge "fix mmap leak of graphicsstats service" 
am: 9ebc299b73

Change-Id: I6d13762a54bcf7417379c67385848e81e953ff2b
 2019-01-07 21:22:46 -08:00
Treehugger Robot
9ebc299b73 Merge "fix mmap leak of graphicsstats service" 2019-01-08 05:03:47 +00:00
TreeHugger Robot
e6baf1a446 Merge "Resolve hidden API usage of Handler constructor" 2019-01-08 04:41:31 +00:00
Remi NGUYEN VAN
8708d842fb Fix linter errors in NetworkMonitor 
The fixes are necessary to move the class to packages/NetworkStack.

Test: atest FrameworksNetTests
Bug: b/112869080
Change-Id: I1fe42d9edf4cc86de1b9c75808407183e23a87e2
 2019-01-08 13:23:36 +09:00
TreeHugger Robot
6a8959a875 Merge "Make the color consistency of the profile" 2019-01-08 04:17:24 +00:00
Wei Sheng Shih
af7395db11 Merge "Support wallpaper on secondary displays.(7/N)" 2019-01-08 04:05:41 +00:00
TreeHugger Robot
c6ee048f7a Merge "Don't check fs-verity in installer session if not enabled" 2019-01-08 03:44:29 +00:00
TreeHugger Robot
000e8e6444 Merge "WiFi: Add missing stubs to AbstractWifiService." 2019-01-08 03:40:18 +00:00
TreeHugger Robot
1cac57911e Merge "Hide media details on lock screen" 2019-01-08 03:21:31 +00:00
TreeHugger Robot
2c7db5467d Merge "cec: support standby features for tx/rx [1/1]" 2019-01-08 03:18:00 +00:00
TreeHugger Robot
b75e2592fe Merge "Show notification when routine battery mode activates" 2019-01-08 02:49:37 +00:00
TreeHugger Robot
500f3dd4d2 Merge "Move LocationManagerService to background thread" 2019-01-08 02:47:37 +00:00
Android Build Merger (Role)
9054db385c Merge "Merge "Add parceling for DhcpServingParams" am: f6209cf0dd am: 133f281d12 am: 815bd36c07" 2019-01-08 02:31:04 +00:00
Remi NGUYEN VAN
98feb88705 Merge "Add parceling for DhcpServingParams" am: f6209cf0dd am: 133f281d12 
am: 815bd36c07

Change-Id: I953b4380baba93d992601ebde39d7cd63b5bdc3a
 2019-01-07 18:30:36 -08:00