Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
498,499 Commits 3 Branches 0 Tags
cec34ba6dd68ef69bd52f62308211fae1ef27853
Commit Graph

498499 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yanting Yang
cec34ba6dd Merge "Add mainline module utils function into AppUtils" into rvc-dev am: a14615426f am: 8c53e8bf48 
Change-Id: Ic81bcaf2ea63153e9656f938e7fe4741b1fdcd87
 2020-05-07 08:50:49 +00:00
Yanting Yang
8c53e8bf48 Merge "Add mainline module utils function into AppUtils" into rvc-dev am: a14615426f 
Change-Id: I57840dc33c6c67d53856dcaa3fcdb217de13ba61
 2020-05-07 08:44:54 +00:00
Yanting Yang
a14615426f Merge "Add mainline module utils function into AppUtils" into rvc-dev 2020-05-07 08:41:38 +00:00
Automerger Merge Worker
6874d9fa33 Merge "[automerger skipped] Test tethering log dump am: 66b9a4a3f0 -s ours am: a75b21e04f -s ours" into rvc-d1-dev-plus-aosp 2020-05-07 08:33:16 +00:00
Mark Chien
bb05bc28f4 [automerger skipped] Test tethering log dump am: 66b9a4a3f0 -s ours am: a75b21e04f -s ours 
am skip reason: Change-Id I01fc6969041711f7a15880144ee5eac591086ecd with SHA-1 7eabad685f is in history

Change-Id: I78de8e3ee799516adfddc81388811f1521949a8a
 2020-05-07 08:33:06 +00:00
Mark Chien
9478d3b134 [automerger skipped] Test tethering log dump am: 66b9a4a3f0 am: 412f49e8b8 -s ours 
am skip reason: Change-Id I01fc6969041711f7a15880144ee5eac591086ecd with SHA-1 7eabad685f is in history

Change-Id: Iddc0c3ca3f9d23518c95caf4bb31d0e60fcbe2bd
 2020-05-07 08:32:53 +00:00
Mark Chien
a75b21e04f [automerger skipped] Test tethering log dump am: 66b9a4a3f0 -s ours 
am skip reason: Change-Id I01fc6969041711f7a15880144ee5eac591086ecd with SHA-1 7eabad685f is in history

Change-Id: I208b2d702643e72dedb821c2517ef1f32b12e5ef
 2020-05-07 08:19:22 +00:00
Mark Chien
412f49e8b8 Test tethering log dump am: 66b9a4a3f0 
Change-Id: If48c35a4dde54b4bdd44703f3df6338267b1b542
 2020-05-07 08:19:10 +00:00
Mark Chien
66b9a4a3f0 Test tethering log dump 
Bug: 145490751
Test: atest TetheringTests
Merged-In: I01fc6969041711f7a15880144ee5eac591086ecd
Change-Id: I01fc6969041711f7a15880144ee5eac591086ecd
 2020-05-07 06:44:43 +00:00
Sarah Chin
73bdbd8362 [automerger skipped] Merge "Added a new capability for temporarily unmetered network." am: c5c7994da9 am: 09a2ff81c7 -s ours am: 1a8f7eafc9 -s ours 
am skip reason: Change-Id I10e26cb0852e67f614e7b9c4e49f95e078602e21 with SHA-1 30be5e5d3d is in history

Change-Id: I56c31471f54180a6e49cf1a72a1793618c5bec1c
 2020-05-07 06:12:55 +00:00
Automerger Merge Worker
0b58d2d867 Merge "Merge "Filter out non-a2dp or non-hearing Aid bluetooth device" into rvc-dev am: 98b14f98fa am: 886d330e09" into rvc-d1-dev-plus-aosp 2020-05-07 06:12:14 +00:00
Hugh Chen
444337b02e Merge "Filter out non-a2dp or non-hearing Aid bluetooth device" into rvc-dev am: 98b14f98fa am: 886d330e09 
Change-Id: Ib072c344768ee9105237842a516d7fa694d1a2ae
 2020-05-07 06:12:08 +00:00
Sarah Chin
1a8f7eafc9 [automerger skipped] Merge "Added a new capability for temporarily unmetered network." am: c5c7994da9 am: 09a2ff81c7 -s ours 
am skip reason: Change-Id I10e26cb0852e67f614e7b9c4e49f95e078602e21 with SHA-1 30be5e5d3d is in history

Change-Id: Ie43cc7dbddd5497dfa069fac5570a7a64eddb2a1
 2020-05-07 06:12:02 +00:00
Hugh Chen
579d108732 Merge "Filter out non-a2dp or non-hearing Aid bluetooth device" into rvc-dev am: 98b14f98fa am: 1e726f1563 
Change-Id: I9446bd6c74e567374a28d8d8068353436a71b50c
 2020-05-07 06:12:00 +00:00
Amit Mahajan
63e827cc6d Merge "Add a helper function to query CBR package name." into rvc-d1-dev-plus-aosp 2020-05-07 06:09:06 +00:00
Sarah Chin
09a2ff81c7 Merge "Added a new capability for temporarily unmetered network." am: c5c7994da9 
Change-Id: I94eb37627875f96c7e70a5df9d273266bc4def66
 2020-05-07 06:01:20 +00:00
Hugh Chen
886d330e09 Merge "Filter out non-a2dp or non-hearing Aid bluetooth device" into rvc-dev am: 98b14f98fa 
Change-Id: I9c48b087895e039925f9abd84cf6102db06173c3
 2020-05-07 05:55:54 +00:00
Hugh Chen
1e726f1563 Merge "Filter out non-a2dp or non-hearing Aid bluetooth device" into rvc-dev am: 98b14f98fa 
Change-Id: Ibbd73722e654b3910dba1c164bc767099313e563
 2020-05-07 05:55:33 +00:00
Hugh Chen
98b14f98fa Merge "Filter out non-a2dp or non-hearing Aid bluetooth device" into rvc-dev 2020-05-07 05:53:34 +00:00
Sarah Chin
c5c7994da9 Merge "Added a new capability for temporarily unmetered network." 2020-05-07 05:47:43 +00:00
Automerger Merge Worker
1d25f76648 Merge "Merge "Support re-attaching the inline suggestion view to window" into rvc-dev am: 254545cae5 am: f9748230fd" into rvc-d1-dev-plus-aosp 2020-05-07 05:38:47 +00:00
Feng Cao
6fbdd1173a Merge "Support re-attaching the inline suggestion view to window" into rvc-dev am: 254545cae5 am: f9748230fd 
Change-Id: I037ddac754e8e7a69b7fd2b76aa8f768b523ae39
 2020-05-07 05:38:36 +00:00
Automerger Merge Worker
a24ff5bdc3 Merge "Merge "Support re-attaching the inline suggestion view to window" into rvc-dev am: 254545cae5 am: 03f9fbbf3d" into rvc-d1-dev-plus-aosp 2020-05-07 05:38:31 +00:00
Automerger Merge Worker
8985523aa5 Merge "Merge "Forward dumps from PermissionControllerManager to permissionmgr" into rvc-dev am: f7d1f1a40c am: 841af79daa" into rvc-d1-dev-plus-aosp 2020-05-07 05:38:25 +00:00
Feng Cao
c2f8606e32 Merge "Support re-attaching the inline suggestion view to window" into rvc-dev am: 254545cae5 am: 03f9fbbf3d 
Change-Id: I8b638d30584965de95819a8cd71d0621c7060cf1
 2020-05-07 05:38:22 +00:00
Philip P. Moltmann
5caa73161d Merge "Forward dumps from PermissionControllerManager to permissionmgr" into rvc-dev am: f7d1f1a40c am: 841af79daa 
Change-Id: I9dd61f355e25a2b505f5e9468d5ab1bdbf256385
 2020-05-07 05:38:15 +00:00
Philip P. Moltmann
09fd12d9bf Merge "Forward dumps from PermissionControllerManager to permissionmgr" into rvc-dev am: f7d1f1a40c am: 2ed0952744 
Change-Id: Ie3e2a56ea85000d760a9abe23ead133236b764bb
 2020-05-07 05:38:10 +00:00
Feng Cao
f9748230fd Merge "Support re-attaching the inline suggestion view to window" into rvc-dev am: 254545cae5 
Change-Id: I7a7655f90cdbf924635d6bcd48898fbd22aec1eb
 2020-05-07 05:28:51 +00:00
Feng Cao
03f9fbbf3d Merge "Support re-attaching the inline suggestion view to window" into rvc-dev am: 254545cae5 
Change-Id: Id4d01aa1c63b2b1d4d3658a6141b8c0dd05c6c20
 2020-05-07 05:28:49 +00:00
Feng Cao
254545cae5 Merge "Support re-attaching the inline suggestion view to window" into rvc-dev 2020-05-07 05:23:15 +00:00
Philip P. Moltmann
2ed0952744 Merge "Forward dumps from PermissionControllerManager to permissionmgr" into rvc-dev am: f7d1f1a40c 
Change-Id: I6a179fc69d68b70107de794c113c6acfcef67f3f
 2020-05-07 05:22:23 +00:00
Philip P. Moltmann
841af79daa Merge "Forward dumps from PermissionControllerManager to permissionmgr" into rvc-dev am: f7d1f1a40c 
Change-Id: Id1d9ee52437c9bd5b12eb24d38ab07a6fced6543
 2020-05-07 05:21:44 +00:00
Riddle Hsu
fcfaee98c2 Merge "Do not stop dream service if dream activity is relaunching" into rvc-dev am: b76f9472df am: 4dfd3dcd3a 
Change-Id: I333aeacd9e84fb0730cbc4992e5c9ef2c78decf1
 2020-05-07 05:17:19 +00:00
Philip P. Moltmann
f7d1f1a40c Merge "Forward dumps from PermissionControllerManager to permissionmgr" into rvc-dev 2020-05-07 05:07:27 +00:00
Riddle Hsu
c6c8c58fa2 Merge "Do not stop dream service if dream activity is relaunching" into rvc-dev am: b76f9472df am: 10662e54cc 
Change-Id: I8c89cbf67d648878c71c92574ce89090fc2de6bd
 2020-05-07 04:59:50 +00:00
Ruchir Rastogi
5594bff4fe Merge "Add missing truncate_timestamp annotation" into rvc-dev am: 1221e902b4 am: b94ddee4cc 
Change-Id: I9a249b484e399adad4676bb4aaa2982beda88250
 2020-05-07 04:59:31 +00:00
Lyn Han
c9f6b7979e Merge "Remove fixed todo" into rvc-dev am: bfcc5b3474 am: 54c542f5da 
Change-Id: I13e212795c9085c34752efd02ec12d64ba49c76e
 2020-05-07 04:59:23 +00:00
Riddle Hsu
10662e54cc Merge "Do not stop dream service if dream activity is relaunching" into rvc-dev am: b76f9472df 
Change-Id: I82ddd309228f5e10c3fde31b7b3eb907f8c43d14
 2020-05-07 04:59:20 +00:00
Lyn Han
b282e1206b Merge "Overflow labels: two lines with ellipsis" into rvc-dev am: 1d8cfc1312 am: 0bce9e6141 
Change-Id: I19c78c676674b85476458188461f4a8a92cde486
 2020-05-07 04:59:12 +00:00
Riddle Hsu
4dfd3dcd3a Merge "Do not stop dream service if dream activity is relaunching" into rvc-dev am: b76f9472df 
Change-Id: I5d0b57b38d31f6f466ef1ecf1b63b5e3a98248de
 2020-05-07 04:59:11 +00:00
Lyn Han
991d199dd7 Merge "Overflow a11y" into rvc-dev am: 8333811d76 am: 06a81ca102 
Change-Id: Ied253b19425923aca57943fdf141b7ca1d634600
 2020-05-07 04:59:01 +00:00
Riddle Hsu
b76f9472df Merge "Do not stop dream service if dream activity is relaunching" into rvc-dev 2020-05-07 04:51:38 +00:00
Ruchir Rastogi
1d1c39ea36 Merge "Add missing truncate_timestamp annotation" into rvc-dev am: 1221e902b4 am: 23bc972cf8 
Change-Id: I2a23b6ea6ef3ff9bd584a8abefedd226c245c6ee
 2020-05-07 04:39:56 +00:00
Lyn Han
0c0292faa3 Merge "Remove fixed todo" into rvc-dev am: bfcc5b3474 am: 2c6b4aa9b9 
Change-Id: I425774db247c9abd14f46deeac126c8c224c7d4f
 2020-05-07 04:39:48 +00:00
Ruchir Rastogi
b94ddee4cc Merge "Add missing truncate_timestamp annotation" into rvc-dev am: 1221e902b4 
Change-Id: I76b3ded975751d9ef66e5a1a3d5777a5f61b5b2d
 2020-05-07 04:39:45 +00:00
Lyn Han
21ae247e8d Merge "Overflow labels: two lines with ellipsis" into rvc-dev am: 1d8cfc1312 am: 329c635be2 
Change-Id: I8f057e38b1a6f6425abde9ed67064a946043859c
 2020-05-07 04:39:38 +00:00
Ruchir Rastogi
23bc972cf8 Merge "Add missing truncate_timestamp annotation" into rvc-dev am: 1221e902b4 
Change-Id: I5306e6be2eeab7e73bc62ff412d1b752683bf507
 2020-05-07 04:39:35 +00:00
Lyn Han
54c542f5da Merge "Remove fixed todo" into rvc-dev am: bfcc5b3474 
Change-Id: Ia7c231440233dae4bb491784d42020aed32bcdec
 2020-05-07 04:39:30 +00:00
Lyn Han
2c6b4aa9b9 Merge "Remove fixed todo" into rvc-dev am: bfcc5b3474 
Change-Id: Ib1d2eedc4bc48bbd918813f20f6d37470bc7cdc7
 2020-05-07 04:39:15 +00:00
Lyn Han
0bce9e6141 Merge "Overflow labels: two lines with ellipsis" into rvc-dev am: 1d8cfc1312 
Change-Id: I9a39a3b21c1b12f2fb9b31c66e9321a49eec556f
 2020-05-07 04:39:13 +00:00