Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
473,833 Commits 3 Branches 0 Tags
0b03be06a9f2ecdf24dbaa8c243d82a073fb0d48
Commit Graph

473833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christine Tsai
0b03be06a9 Merge "(Part 3) Use new socket schema with statsd tests" into rvc-dev am: 4aa7af0a8f 
Change-Id: I5cd11eef3860dcf786be5186a2525d8f192020eb
 2020-03-24 21:05:24 +00:00
Christine Tsai
4aa7af0a8f Merge "(Part 3) Use new socket schema with statsd tests" into rvc-dev 2020-03-24 20:55:26 +00:00
TreeHugger Robot
4aab2f7bce Merge "Controls Ui - More string adjustments" into rvc-dev am: 294823f0cb 
Change-Id: Ieaa12661c885fcfde6ecca4bf5364f91ef6fb261
 2020-03-24 20:49:03 +00:00
Mathieu Chartier
0b7cd15cde Merge "Reboot device after test for cleanup" into rvc-dev am: 7e85cd6151 
Change-Id: I45585b2fcf0a7f84994ffb4a8f1133675f5a3a75
 2020-03-24 20:48:18 +00:00
TreeHugger Robot
294823f0cb Merge "Controls Ui - More string adjustments" into rvc-dev 2020-03-24 20:45:29 +00:00
Mathieu Chartier
7e85cd6151 Merge "Reboot device after test for cleanup" into rvc-dev 2020-03-24 20:43:18 +00:00
Mike Ma
63fe86a451 Merge "Optimize memory usage in incidentd" into rvc-dev am: 06b3aaee39 
Change-Id: Ib0a0e5a54d2f060e15abc7f1f452a79152d8f731
 2020-03-24 20:30:29 +00:00
Mike Ma
06b3aaee39 Merge "Optimize memory usage in incidentd" into rvc-dev 2020-03-24 20:27:41 +00:00
TreeHugger Robot
802cc0626d [automerger skipped] Merge "DO NOT MERGE: Add blacklist for camera protection" into qt-qpr1-dev am: d28b13cb43 -s ours am: 7af1f72f14 
Change-Id: I3e2c4dddb14f57aeadf64ffe5573b4c1a63455b9
 2020-03-24 20:24:17 +00:00
TreeHugger Robot
a0ffa7d718 Merge "Clarify Toast.Callback javadoc" into rvc-dev am: 8ac8b257f1 
Change-Id: Ieb1d1f29c6dee0a1d1a47d8e61cc73de71bac72d
 2020-03-24 20:24:09 +00:00
Yuhan Zhao
d547a99df2 Merge "Fixing the bug where secondary lockscreen intent is sent to the admin receiver but no the service." into rvc-dev am: 6dc855e10b 
Change-Id: I3dfd634080fdf453d4e6ceb113a076fe2d1a862b
 2020-03-24 20:23:57 +00:00
Mady Mellor
0185417f27 Merge "Bubbles Policy: remove phonecalls" into rvc-dev am: ef7b53424b 
Change-Id: Ia34bdd2ce6671fdecdca385ef00e13cb01dc0223
 2020-03-24 20:23:28 +00:00
Automerger Merge Worker
333fb6fa81 Merge "Merge "frameworks/base/wifi/tests: Run mts-wifi on AOSP builds" into rvc-dev am: 9c493f4722" into rvc-d1-dev 2020-03-24 20:23:18 +00:00
David Su
e3fc57a147 Merge "frameworks/base/wifi/tests: Run mts-wifi on AOSP builds" into rvc-dev am: 9c493f4722 
Change-Id: I77f860fe00a6d3795d52624d6d1f9bc505cb523a
 2020-03-24 20:23:01 +00:00
TreeHugger Robot
7af1f72f14 [automerger skipped] Merge "DO NOT MERGE: Add blacklist for camera protection" into qt-qpr1-dev am: d28b13cb43 -s ours 
am skip reason: subject contains skip directive

Change-Id: I2acfcb04c4811374584fbbbcdd2366ece921871c
 2020-03-24 20:21:52 +00:00
TreeHugger Robot
8ac8b257f1 Merge "Clarify Toast.Callback javadoc" into rvc-dev 2020-03-24 20:05:26 +00:00
TreeHugger Robot
d28b13cb43 Merge "DO NOT MERGE: Add blacklist for camera protection" into qt-qpr1-dev 2020-03-24 20:03:26 +00:00
Yuhan Zhao
6dc855e10b Merge "Fixing the bug where secondary lockscreen intent is sent to the admin receiver but no the service." into rvc-dev 2020-03-24 19:51:12 +00:00
Mady Mellor
ef7b53424b Merge "Bubbles Policy: remove phonecalls" into rvc-dev 2020-03-24 19:49:27 +00:00
David Su
7c107291f5 Merge "frameworks/base/wifi/tests: Run mts-wifi on AOSP builds" into rvc-dev am: 9c493f4722 
Change-Id: I0bb7117585c45ba4d95cb3110771963249f7c1a2
 2020-03-24 19:29:49 +00:00
David Su
9c493f4722 Merge "frameworks/base/wifi/tests: Run mts-wifi on AOSP builds" into rvc-dev 2020-03-24 19:14:07 +00:00
TreeHugger Robot
63a9cea3a4 Merge "Remove unnecessary +1ms to quota window calculation." into rvc-dev am: cbe9c27876 
Change-Id: Id2ecf0cee5a5d4251847c3856187784cd1e498ee
 2020-03-24 19:06:29 +00:00
TreeHugger Robot
cbe9c27876 Merge "Remove unnecessary +1ms to quota window calculation." into rvc-dev 2020-03-24 18:58:42 +00:00
Philip Quinn
dd80d85f28 Merge changes Id81c9034,I49f71f91 into rvc-dev am: 8a0c8f12f5 
Change-Id: I4fe8bb665f1f350ad29a1518dddd16ed3e3049ce
 2020-03-24 18:52:37 +00:00
TreeHugger Robot
c88d9243d7 Merge "Camera: Add visual samples for android.control.zoomRatio" into rvc-dev am: ff57d5cba0 
Change-Id: I7f3a0763b4cc8f241350ef17b7f634a01a89e453
 2020-03-24 18:52:06 +00:00
Philip Quinn
8a0c8f12f5 Merge changes Id81c9034,I49f71f91 into rvc-dev 
* changes:
  Do not expand a notification if its guts are exposed.
  Support deep press on notifications.
 2020-03-24 18:51:19 +00:00
Matt Pietal
9e3d40d265 Controls Ui - More string adjustments 
More adjustments based on feedback

Bug: 151322044
Test: manual
Change-Id: I682f51ecafa8c8d800e89842f51f013a4d2bc883
 2020-03-24 14:48:43 -04:00
TreeHugger Robot
ff57d5cba0 Merge "Camera: Add visual samples for android.control.zoomRatio" into rvc-dev 2020-03-24 18:37:39 +00:00
TreeHugger Robot
2ed450750a Merge "Revert "DO NOT MERGE: pinner: Toggle camera pinning on by default"" into rvc-dev am: ae7d379be4 
Change-Id: I3d52653aaf2994f05f28281a7ab1dea74afe4e69
 2020-03-24 18:35:53 +00:00
Igor Murashkin
361d493a56 Revert "DO NOT MERGE: pinner: Toggle camera pinning on by default" am: 599a834102 
Change-Id: I04c7e107346391f7819cd8066e081a2dbd4c135d
 2020-03-24 18:35:42 +00:00
TreeHugger Robot
ee71b50b0c Merge "Remove test service for Assistant Handle requests" into rvc-dev am: 2ed4f550f4 
Change-Id: I0afe9e6258fe2fedaf8c9b59d53bd189a3940c38
 2020-03-24 18:35:15 +00:00
Mathieu Chartier
eea7926c2a Reboot device after test for cleanup 
Since the properties are not persistent, reboot the device to clean
up after doing the test.

Test: atest BootImageProfileTest and verify properties
Bug: 151798523
Change-Id: Icf120e032c12f83635b3d9e8cdc764b4ebd817dd
 2020-03-24 11:34:57 -07:00
TreeHugger Robot
ae7d379be4 Merge "Revert "DO NOT MERGE: pinner: Toggle camera pinning on by default"" into rvc-dev 2020-03-24 18:22:07 +00:00
Igor Murashkin
599a834102 Revert "DO NOT MERGE: pinner: Toggle camera pinning on by default" 
Revert "DO NOT MERGE: properties: Toggle iorapd off by default."

Revert submission 10488248-iorap-off-by-default

Reason for revert: we now have better debugging support (dumpsys/systrace) in iorapd
Reverted Changes:
I805731d56:DO NOT MERGE: pinner: Toggle camera pinning on by ...
I04f249da4:DO NOT MERGE: properties: Toggle iorapd off by def...

Bug: 150711178
Change-Id: Ied7176eb15da5cf89891b6aeec078aa25d03ebcb
 2020-03-24 18:21:53 +00:00
TreeHugger Robot
2ed4f550f4 Merge "Remove test service for Assistant Handle requests" into rvc-dev 2020-03-24 18:20:17 +00:00
Bernardo Rufino
255094826d Clarify Toast.Callback javadoc 
Text was ambiguous and could mean callback object construction instead
of toast construction.

Test: Builds
Bug: 144152069
Change-Id: I06160de2b85f339517ae45d3bd4cc1098f433ef0
 2020-03-24 18:12:44 +00:00
Muhammad Qureshi
0ae6953308 Merge "Allow annotations to be added to Atom Id" into rvc-dev am: 027c823801 
Change-Id: I13a288f305ff831a6509669b9a1d39c226acd6e6
 2020-03-24 18:12:05 +00:00
Galia Peycheva
a3d50422c2 Merge "Remove usage of sleep tokens during dreams" into rvc-dev am: 2de83af6b1 
Change-Id: Ib02fae4f22de4de5312012688b408d9f927e1b42
 2020-03-24 18:10:56 +00:00
Muhammad Qureshi
027c823801 Merge "Allow annotations to be added to Atom Id" into rvc-dev 2020-03-24 18:09:21 +00:00
Galia Peycheva
2de83af6b1 Merge "Remove usage of sleep tokens during dreams" into rvc-dev 2020-03-24 17:54:38 +00:00
Pavel Grafov
82625f9d7f Merge "Suspend newly installed apps when personal apps are suspended" into rvc-dev am: 70b1c45a9e 
Change-Id: I6cc21fdaf7d3858021cfba78a17564ac3931474e
 2020-03-24 17:47:30 +00:00
TreeHugger Robot
8821404888 Merge "Use REPLACE_EXISTING for rename(2) workaround." into rvc-dev am: 78243297c0 
Change-Id: I3328f8ef1437abdc4c51e8688a8dcdfb11502c43
 2020-03-24 17:46:38 +00:00
Pavel Grafov
70b1c45a9e Merge "Suspend newly installed apps when personal apps are suspended" into rvc-dev 2020-03-24 17:42:11 +00:00
TreeHugger Robot
78243297c0 Merge "Use REPLACE_EXISTING for rename(2) workaround." into rvc-dev 2020-03-24 17:42:03 +00:00
Fabian Kozynski
8cb7df38d2 Merge "Update model when adding favorites" into rvc-dev am: 8829c37c1d 
Change-Id: I980d879cd6b0dc738fde7c44018ec342284772ce
 2020-03-24 17:38:00 +00:00
Fabian Kozynski
8829c37c1d Merge "Update model when adding favorites" into rvc-dev 2020-03-24 17:35:00 +00:00
Sudheer Shanka
b9f16537d2 Merge "Promote getLeasedBlobs() to be a public API." into rvc-dev am: 082b1f7bed 
Change-Id: I0c1dcdd5b7403c3c551baa4834c615583aa6ca17
 2020-03-24 17:31:24 +00:00
Roshan Pius
0ec9c36070 Merge "Settings: Add a javadoc note for WIFI_MIGRATION_COMPLETED" into rvc-dev am: 198e8c3629 
Change-Id: I6174eebf5c5b3acaaf938f42a303bf0b38152ba8
 2020-03-24 17:31:13 +00:00
Sudheer Shanka
082b1f7bed Merge "Promote getLeasedBlobs() to be a public API." into rvc-dev 2020-03-24 17:27:23 +00:00
Roshan Pius
198e8c3629 Merge "Settings: Add a javadoc note for WIFI_MIGRATION_COMPLETED" into rvc-dev 2020-03-24 17:12:06 +00:00