Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
426,547 Commits 3 Branches 0 Tags
6dfd14161560de29cd9da825db9f133f8ed4cd98
Commit Graph

426547 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chiayu Pei
6dfd141615 Merge "Revert "Unregister listeners and reset wake lock"" into qt-dev am: a5be28971c 
am: 5e6adcbfe7

Change-Id: I776d3c0853ad8d18723b31100acecba518f6e55f
 2019-06-24 08:49:26 -07:00
Bill Yi
e6cea478e9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e0c262b7da -s ours 
am: 067f9816b1 -s ours
am skip reason: subject contains skip directive

Change-Id: I11064f60646733b0bfc4721f94a84b9e160d5ac1
 2019-06-24 08:48:24 -07:00
Bill Yi
e3943cdd29 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 4ffaa9a225 -s ours 
am: a9cd5d94f3 -s ours
am skip reason: subject contains skip directive

Change-Id: I46f8087bac81d03cdbda77b07423d514d5ef109d
 2019-06-24 08:47:24 -07:00
Bill Yi
157a81d905 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: cc13f9ed66 -s ours 
am: 49a60e6b40 -s ours
am skip reason: subject contains skip directive

Change-Id: If902517cdbff58fe1f091e50aa6e9de836af376c
 2019-06-24 08:46:29 -07:00
Bill Yi
75f383fa25 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: c000487154 -s ours 
am: 453efcb333 -s ours
am skip reason: subject contains skip directive

Change-Id: I4fc34749c532d0d261089b697e87267fadb16765
 2019-06-24 08:45:40 -07:00
Bill Yi
c9f3d2d6fe [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev 
am: 7e5f2498f9 -s ours
am skip reason: subject contains skip directive

Change-Id: I18f8076c0ad79a680a0b35bff5f13724a55eecb2
 2019-06-24 08:20:12 -07:00
Dave Mankoff
e13ad7b621 Merge "Clear authentication data whenever the phone transitions to DOZE_AOD or DOZE." into qt-r1-dev 
am: e28cd16002

Change-Id: Ie2fbd51f96e874e270a51bd5af04af355a1583c7
 2019-06-24 08:19:17 -07:00
Lorenzo Colitti
537554f3fd [automerger skipped] Merge changes If7d41052,I66f263d7,Id45ae956,Iba752fed,I575a7e4f, ... into qt-r1-dev 
am: f80234a9b0 -s ours
am skip reason: change_id If2ef8d8f038f32c8cf974aa02cfc1dc7e44dbad3 with SHA1 8c9d8c5e05 is in history

Change-Id: I5b525feb1e7df2a89dea4f38b521973ccaac0746
 2019-06-24 08:17:26 -07:00
Julia Reynolds
6b1c7ceded Merge "Handle USER_ALL in instant apps call" into qt-dev am: 58b7cf731d 
am: df1e8c9cf3

Change-Id: Iee40c614daf3f416459957f76260023aeaa6ab84
 2019-06-24 08:15:20 -07:00
Lucas Dupin
e8dec1fb96 [automerger skipped] Merge "Unregister listeners and reset wake lock" into qt-dev am: 9b47581ea4 -s ours 
am: d749a78120 -s ours
am skip reason: change_id I227842d7272d1edeaa67d776950f369aedb01a91 with SHA1 2bc992decb is in history

Change-Id: I1bc34cb9169b5daf417d827ea68fc61ca2464a77
 2019-06-24 08:13:24 -07:00
Bill Yi
1f87082fdd [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 25a43f362a -s ours 
am: 37caf4810e -s ours
am skip reason: subject contains skip directive

Change-Id: If600d8980c99becda73d77b6fb1e652cf538c109
 2019-06-24 08:09:55 -07:00
Dave Mankoff
f2055b8e76 [automerger skipped] Merge "DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType." into qt-dev am: 6c9547a9a5 -s ours 
am: 756636cb24 -s ours
am skip reason: change_id I0ab9a72d66bf56a56df2de2ad2d247f299d1b748 with SHA1 e0321d5809 is in history

Change-Id: I2e466feae4c5936c0409689c6dfa2a3d10e3c338
 2019-06-24 08:07:15 -07:00
Chiayu Pei
5e6adcbfe7 Merge "Revert "Unregister listeners and reset wake lock"" into qt-dev 
am: a5be28971c

Change-Id: I649e2774d8f08bf5a2ea666074b04fd22c69ff0f
 2019-06-24 08:04:10 -07:00
Julia Reynolds
a508243ca3 Merge "Handle USER_ALL in instant apps call" into qt-dev am: 58b7cf731d 
am: c0030892d8

Change-Id: I62fb26ddadd6eaaa38df84b3a93662591039413b
 2019-06-24 08:03:58 -07:00
Bill Yi
067f9816b1 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: e0c262b7da -s ours
am skip reason: subject contains skip directive

Change-Id: I606d9432a1c72d57c7656acea1421ec2c9676f77
 2019-06-24 08:03:45 -07:00
Bill Yi
a9cd5d94f3 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: 4ffaa9a225 -s ours
am skip reason: subject contains skip directive

Change-Id: Id9c11f98769577ae9485a2fe4a7a726c7d6ca9e4
 2019-06-24 08:03:12 -07:00
Lucas Dupin
cbd7d5d288 [automerger skipped] Merge "Unregister listeners and reset wake lock" into qt-dev am: 9b47581ea4 
am: c736f0a15c -s ours
am skip reason: change_id I227842d7272d1edeaa67d776950f369aedb01a91 with SHA1 2bc992decb is in history

Change-Id: I67c3627e1353da1494a2bf18f02f2fb2151dae55
 2019-06-24 08:03:05 -07:00
Bill Yi
49a60e6b40 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: cc13f9ed66 -s ours
am skip reason: subject contains skip directive

Change-Id: I67ecd75a9d2048417da9dd0fda82bcd650e2127e
 2019-06-24 08:02:46 -07:00
Bill Yi
453efcb333 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: c000487154 -s ours
am skip reason: subject contains skip directive

Change-Id: I7e86585ab4889e0c764b5ea09f8bb3053dde7c42
 2019-06-24 08:02:17 -07:00
Bill Yi
271c9508a1 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 25a43f362a -s ours 
am: e325be7946 -s ours
am skip reason: subject contains skip directive

Change-Id: I7b2ce7acd4397e90fae196770a3ac4bfe3b95eda
 2019-06-24 08:02:15 -07:00
Dave Mankoff
96fdf004d2 [automerger skipped] Merge "DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType." into qt-dev am: 6c9547a9a5 
am: 8ae38a2c6c -s ours
am skip reason: change_id I0ab9a72d66bf56a56df2de2ad2d247f299d1b748 with SHA1 e0321d5809 is in history

Change-Id: Ic5848f65a75b304a79ac05213fcd88ddae6d6198
 2019-06-24 08:01:31 -07:00
Dave Mankoff
19656fc099 [automerger skipped] DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType. am: e0321d5809 
am: 59809cd9e1 -s ours
am skip reason: change_id I0ab9a72d66bf56a56df2de2ad2d247f299d1b748 with SHA1 84c07e9f1a is in history

Change-Id: I2144c9f5e844310c2a0d53bb96fced4bfd4bc1aa
 2019-06-24 08:00:22 -07:00
Jerry Chang
5f0e119bdc Merge "Fade away wallpapers when long pulse" into qt-dev am: 14e6d18ec9 
am: b84c0786b2

Change-Id: Iaaf84570a8172ca634422a792fda45087dc09830
 2019-06-24 07:59:30 -07:00
Jerry Chang
7f6c85996b Merge "Fade away wallpapers when long pulse" into qt-dev am: 14e6d18ec9 
am: 5a5e113271

Change-Id: I9196dd2c0fbc8bad5afb16d3b4495b04ca36cef7
 2019-06-24 07:56:58 -07:00
TreeHugger Robot
7e5f2498f9 Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-06-24 14:23:19 +00:00
Dave Mankoff
e28cd16002 Merge "Clear authentication data whenever the phone transitions to DOZE_AOD or DOZE." into qt-r1-dev 2019-06-24 13:24:18 +00:00
Bill Yi
3fbcbe844b Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I237be43f182f7e0c44236f2358e329d179414b3e
 2019-06-24 03:14:08 -07:00
Chiayu Pei
a5be28971c Merge "Revert "Unregister listeners and reset wake lock"" into qt-dev 2019-06-24 04:19:13 +00:00
Lorenzo Colitti
f80234a9b0 Merge changes If7d41052,I66f263d7,Id45ae956,Iba752fed,I575a7e4f, ... into qt-r1-dev 
* changes:
  Inline readNetworkStatsDetailInternal, make mUseBpfStats final
  Remove VPN info arrays from NetworkStats(Observer|Recorder)
  NetworkStatsFactory: Take VPNs into account for network/battery stats
  Remove duplicate line in clat_simple test file
  Remove unused lastStats parameter
  Revert "Revert "Take all VPN underlying networks into account when migrating traffic for""
 2019-06-24 03:37:23 +00:00
Chiayu Pei
6a8c935767 Revert "Unregister listeners and reset wake lock" 
This reverts commit fe107a1621.

Reason for revert: <INSERT REASONING HERE>

Change-Id: Id092c473a8300e014ccd4d941afa4afcdbbf48bc
 2019-06-24 01:46:28 +00:00
TreeHugger Robot
e0c262b7da Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-23 20:32:32 +00:00
TreeHugger Robot
4ffaa9a225 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-23 17:41:21 +00:00
TreeHugger Robot
cc13f9ed66 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-23 17:24:54 +00:00
TreeHugger Robot
c000487154 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-23 17:14:18 +00:00
Bill Yi
809b4e44cc Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I488956188ed83fa8e73e5070f43fba1a3a347fbe
 2019-06-23 10:08:02 -07:00
Bill Yi
f4714f2b9d Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ia15027c4898fed1ed24e5a497e9712cc0cfb7cb3
 2019-06-23 06:50:20 -07:00
Bill Yi
c142c7eb16 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I4ba148bb2885fc3a570b8ab2ccf22305dba04362
 2019-06-22 23:32:57 -07:00
Bill Yi
444efb54e8 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Iee915acc4bdca36e87eb830d413e9452813fa8b4
 2019-06-22 23:22:29 -07:00
Julia Reynolds
c0030892d8 Merge "Handle USER_ALL in instant apps call" into qt-dev 
am: 58b7cf731d

Change-Id: I01821e3952b6e7e3caba3c2c4e2538a980208efb
 2019-06-22 17:35:58 -07:00
Lucas Dupin
c736f0a15c Merge "Unregister listeners and reset wake lock" into qt-dev 
am: 9b47581ea4

Change-Id: I6c479e080905ca8a8dd2ffc036d384d5eb6d7d2e
 2019-06-22 17:34:31 -07:00
Bill Yi
e325be7946 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: 25a43f362a -s ours
am skip reason: subject contains skip directive

Change-Id: Ief6fffe883dee6bb76e9fbcc16c07bda23a0708f
 2019-06-22 17:32:55 -07:00
Dave Mankoff
8ae38a2c6c Merge "DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType." into qt-dev 
am: 6c9547a9a5

Change-Id: I2d4d5e094c415828ed22bf2d64889ac1f3d931f8
 2019-06-22 17:31:28 -07:00
Dave Mankoff
59809cd9e1 DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType. 
am: e0321d5809

Change-Id: I7caa3c1d9722532167b4c0f91a115602c812619a
 2019-06-22 17:31:23 -07:00
Lucas Dupin
c05ce8e736 Merge "Wake-and-unlock imprevements" into qt-r1-dev 
am: 4a08215328

Change-Id: I77ee856726f9e3ce932115c77733c405e55a2bf9
 2019-06-22 17:25:22 -07:00
Julia Reynolds
df1e8c9cf3 Merge "Handle USER_ALL in instant apps call" into qt-dev 
am: 58b7cf731d

Change-Id: Ibdbc61705cf696a8b771c168be1c24bec25f7876
 2019-06-22 17:24:45 -07:00
Lucas Dupin
d0e314063c Merge "Unregister listeners and reset wake lock" into qt-r1-dev 
am: d5e9e9c874

Change-Id: Ia4a31feae0a9fe8a11c77dfa027e2a7045193539
 2019-06-22 17:23:45 -07:00
Lucas Dupin
d749a78120 [automerger skipped] Merge "Unregister listeners and reset wake lock" into qt-dev 
am: 9b47581ea4 -s ours
am skip reason: change_id I227842d7272d1edeaa67d776950f369aedb01a91 with SHA1 2bc992decb is in history

Change-Id: Ic38213cef426e9a808fa436b50119394e36ce1d9
 2019-06-22 17:23:10 -07:00
Bill Yi
57e1350c65 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev 
am: 760558e00a -s ours
am skip reason: subject contains skip directive

Change-Id: I70551d8f5c178f65f155d9141b5d129f5114263f
 2019-06-22 17:21:11 -07:00
Bill Yi
37caf4810e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: 25a43f362a -s ours
am skip reason: subject contains skip directive

Change-Id: I3e9e158d9cf345d64bf9ea77be78353c388e654b
 2019-06-22 17:21:08 -07:00
Dave Mankoff
756636cb24 [automerger skipped] Merge "DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType." into qt-dev 
am: 6c9547a9a5 -s ours
am skip reason: change_id I0ab9a72d66bf56a56df2de2ad2d247f299d1b748 with SHA1 84c07e9f1a is in history

Change-Id: I485bfd4e21ce2251d41b4d70c29426540927bffb
 2019-06-22 17:19:06 -07:00