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

398341 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
06e5b6d363 Merge "Merge "Move DhcpServer to NetworkStack app" am: 94e5b22985 am: d495691bd5 am: 4bdc06e174" 2019-01-09 13:54:18 +00:00
Remi NGUYEN VAN
db24f2f8c8 Merge "Move DhcpServer to NetworkStack app" am: 94e5b22985 am: d495691bd5 
am: 4bdc06e174

Change-Id: I466c7cefbd30b05708e2d2201ca46fa5bcbb6ff9
 2019-01-09 05:53:53 -08:00
TreeHugger Robot
2ff3918d69 Merge "Add new set of max job counts." 2019-01-09 13:52:38 +00:00
Annie Meng
834b72e770 Merge "[Multi-user] Make backup and initialize receivers per user" 2019-01-09 13:48:28 +00:00
Remi NGUYEN VAN
6206098206 Merge "Add priv-app permissions for NetworkStack" am: f012a17962 am: b5d67e5d90 
am: 12c6c157c2

Change-Id: I96c955fd22da183d90697bd1bcd34deaa307a693
 2019-01-09 05:47:54 -08:00
Android Build Merger (Role)
7f80a9b09f Merge "[automerger skipped] Merge "Add start time to LmkKillOccurred" am: 09c786a414 am: 5b37871e11 am: 905fc275df -s ours am skip reason: change_id Ib2af1b66d4649279fdcb97e7cdf8cdb92e361765 with SHA1 8593d1f605 is in history" 2019-01-09 13:35:05 +00:00
TreeHugger Robot
d81774adda Merge "Use isLoggable so that we can enable full logging easily" 2019-01-09 13:34:30 +00:00
Jim Blackler
309cfeb999 [automerger skipped] Merge "Add start time to LmkKillOccurred" am: 09c786a414 am: 5b37871e11 
am: 905fc275df -s ours
am skip reason: change_id Ib2af1b66d4649279fdcb97e7cdf8cdb92e361765 with SHA1 8593d1f605 is in history

Change-Id: Ia3143290f01fdc6d04029784fb62a0ec4049537d
 2019-01-09 05:33:26 -08:00
Remi NGUYEN VAN
4bdc06e174 Merge "Move DhcpServer to NetworkStack app" am: 94e5b22985 
am: d495691bd5

Change-Id: Ib25c0422fda31c5df7743b481d5f50da209c38fa
 2019-01-09 05:27:59 -08:00
Iavor-Valentin Iftime
3c8657e096 Merge "Crop wallpaper image to preserve screen aspect ratio" 2019-01-09 13:26:03 +00:00
Remi NGUYEN VAN
12c6c157c2 Merge "Add priv-app permissions for NetworkStack" am: f012a17962 
am: b5d67e5d90

Change-Id: I1103826c2390b7ce73712e712ebb2da4eef2349d
 2019-01-09 05:23:55 -08:00
Jim Blackler
905fc275df Merge "Add start time to LmkKillOccurred" am: 09c786a414 
am: 5b37871e11

Change-Id: I78d822c5ede897d3a9798fd67ad5de591032db27
 2019-01-09 05:18:18 -08:00
TreeHugger Robot
e6707b8a02 Merge "Made short term model timeout configurable." 2019-01-09 13:09:12 +00:00
TreeHugger Robot
455b60fe2e Merge "Add better information for invalid path" 2019-01-09 12:52:37 +00:00
Nicolas Geoffray
43c77abfa6 Merge "Remove notion of skip library check in framework." 2019-01-09 12:41:25 +00:00
TreeHugger Robot
6af7667961 Merge "Add @TestApi to Configuration.assetsSeq" 2019-01-09 12:38:15 +00:00
Peter Li
d8d847cbae Merge "Still trigger DozeService when screen off." 2019-01-09 12:36:56 +00:00
Sanry Huang
b35a2fc2bb Merge "Cleanup usages of MANAGE_ACTIVITY_STACKS permission" 2019-01-09 12:16:27 +00:00
lpeter
1a90065044 Still trigger DozeService when screen off. 
Provide a mechanism to let DozeService be able to be triggered when
screen off even though Ambient display settings are turned off.

Bug: 121305224
Test: Manual test
Change-Id: I0bb18142b27b74a8a193f05268716fa046e7f1e2
 2019-01-09 12:15:02 +00:00
TreeHugger Robot
e714a7eaa9 Merge "Don't stop adding smart suggestions just because one doesn't fit." 2019-01-09 11:44:44 +00:00
TreeHugger Robot
5bacb6fd34 Merge "don't toggle between Paint and SkPaint" 2019-01-09 11:33:00 +00:00
Dario Freni
0b4d5db4e6 Merge "--apex implies --staged." 2019-01-09 10:54:01 +00:00
Remi NGUYEN VAN
d495691bd5 Merge "Move DhcpServer to NetworkStack app" 
am: 94e5b22985

Change-Id: I5ed78d8b4b9fc5bc8f50bfa77d60e19bd3815a6d
 2019-01-09 02:53:48 -08:00
Tony Mak
afd5467420 Use isLoggable so that we can enable full logging easily 
Also, change to use android.util.Log rather than Slog, which should
be used by system service only.

Test: Try out adb shell setprop log.tag.androidtc and observe verbose
      logging.

Change-Id: Ie86c6b3f8bd39957f041ffe3a10abb7584f96f83
 2019-01-09 10:47:36 +00:00
Remi NGUYEN VAN
94e5b22985 Merge "Move DhcpServer to NetworkStack app" 2019-01-09 10:42:48 +00:00
Narayan Kamath
41c8f3888b Merge "StagingManager: Implement signature verification for APEXes." 2019-01-09 10:25:10 +00:00
TreeHugger Robot
85933f767b Merge "Cleanup pending Handler messages after test finished" 2019-01-09 10:18:12 +00:00
Les Lee
3e06fd002b Merge "Add location permissions required for APIs" 2019-01-09 09:53:43 +00:00
Remi NGUYEN VAN
b5d67e5d90 Merge "Add priv-app permissions for NetworkStack" 
am: f012a17962

Change-Id: I5b2393e21467c88594d6d4179ef4c646bf61170c
 2019-01-09 01:31:46 -08:00
Remi NGUYEN VAN
f012a17962 Merge "Add priv-app permissions for NetworkStack" 2019-01-09 09:14:12 +00:00
TreeHugger Robot
bf1f04a79a Merge "Migrate frameworks/base/services/core/java/com/android/server/am to androidx.test" 2019-01-09 09:02:22 +00:00
Jim Blackler
5b37871e11 Merge "Add start time to LmkKillOccurred" 
am: 09c786a414

Change-Id: I3cedc77a9b2e74b0a0aa3cf856459e570f84f946
 2019-01-09 00:56:48 -08:00
Nicolas Geoffray
03dba3ba8c Remove notion of skip library check in framework. 
bug: 111174995
Test: m
Change-Id: Id4d69258116696db3662ac7678f6d235fcccabc7
 2019-01-09 08:48:38 +00:00
Jim Blackler
09c786a414 Merge "Add start time to LmkKillOccurred" 2019-01-09 08:44:35 +00:00
Riddle Hsu
e716d72d40 Add @TestApi to Configuration.assetsSeq 
The value of the field will be verified in CTS.

Bug: 112837428
Test: atest CtsActivityManagerDeviceTestCases
Change-Id: I7f8e4b20c75077c77f4d723946d6596737523479
 2019-01-09 15:56:46 +08:00
Remi NGUYEN VAN
0e3d0923a6 Move DhcpServer to NetworkStack app 
Test: atest FrameworksNetTests && atest NetworkStackTests
Bug: b/112869080

Change-Id: I96c40e63e9ceb37b67705bdd4d120307e114715b
 2019-01-09 15:42:16 +09:00
Shawn Lin
4505ce946d Merge "Add phase 2 atoms for documentsui" 2019-01-09 06:17:26 +00:00
junyulai
e0401b34c1 [automerger skipped] Merge "DO NOT MERGE: Revert: use legacy way to get tcp packet count" am: 46197bb418 -s ours am: 465a03d499 -s ours 
am: f112dcdf97 -s ours
am skip reason: subject contains skip directive

Change-Id: I4066f56a63322b6cf60d61927739f07846fd9e37
 2019-01-08 21:37:53 -08:00
Remi NGUYEN VAN
1aa5a60584 Merge "Change package name for NetworkStack" am: 3c877d5b79 am: 21884d1f45 
am: 79eb44a64a

Change-Id: Ib2c162850eb2f43fc3c17d0557a79ad9eadeed6a
 2019-01-08 21:30:09 -08:00
junyulai
f112dcdf97 [automerger skipped] Merge "DO NOT MERGE: Revert: use legacy way to get tcp packet count" am: 46197bb418 -s ours 
am: 465a03d499 -s ours
am skip reason: subject contains skip directive

Change-Id: I3c3a25cd81aaff1a4d5ac7e5d4db9a03ea8f9d84
 2019-01-08 21:24:13 -08:00
junyulai
465a03d499 [automerger skipped] Merge "DO NOT MERGE: Revert: use legacy way to get tcp packet count" 
am: 46197bb418 -s ours
am skip reason: subject contains skip directive

Change-Id: I3b55e5cac6168719dc586013707c8d270b148206
 2019-01-08 21:19:09 -08:00
Tri Vo
9d3abfbf8b Merge "Add /product sepolicy support to SELinuxMMAC.java" am: f3a8a47d61 am: 2ff8fbf18c 
am: 59235cbf48

Change-Id: I8eaebb94782af6e934964f80eb06581b582c2c3b
 2019-01-08 21:18:16 -08:00
Remi NGUYEN VAN
79eb44a64a Merge "Change package name for NetworkStack" am: 3c877d5b79 
am: 21884d1f45

Change-Id: I3deff1a1b3b2330581d92d92f304d2ee6028fc30
 2019-01-08 21:15:38 -08:00
Treehugger Robot
46197bb418 Merge "DO NOT MERGE: Revert: use legacy way to get tcp packet count" 2019-01-09 05:10:05 +00:00
Remi NGUYEN VAN
21884d1f45 Merge "Change package name for NetworkStack" 
am: 3c877d5b79

Change-Id: I882eb1e57e45269a048f0986c0c371eed894ce61
 2019-01-08 21:06:18 -08:00
Tri Vo
59235cbf48 Merge "Add /product sepolicy support to SELinuxMMAC.java" am: f3a8a47d61 
am: 2ff8fbf18c

Change-Id: Id866f3b24389adbd5a0e3e6b725fda5ae3ec9bba
 2019-01-08 21:04:35 -08:00
Remi NGUYEN VAN
3c877d5b79 Merge "Change package name for NetworkStack" 2019-01-09 04:57:19 +00:00
Tri Vo
2ff8fbf18c Merge "Add /product sepolicy support to SELinuxMMAC.java" 
am: f3a8a47d61

Change-Id: I232a57eb549dd72572bd0f347d62fdbdbdd00668
 2019-01-08 20:54:58 -08:00
Tri Vo
f3a8a47d61 Merge "Add /product sepolicy support to SELinuxMMAC.java" 2019-01-09 04:26:15 +00:00
Tadashi G. Takaoka
a5f7c2c9e8 Cleanup pending Handler messages after test finished 
Hopefully this mitigates the presubmit failure frequency.

This partially reverts commit 809cbc53e0 and
thus re-open issue 121229219.

Bug: 121229219
Test: Pass all presubmit tests for Window manager.
  $ atest --test-mapping frameworks/base/services/core/java/com/android/server/wm

Change-Id: I7033fc0a37e2900c5dfd991fc2ab4e840d0e0a38
 2019-01-09 13:09:01 +09:00