Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
422,660 Commits 3 Branches 0 Tags
7bc9c7df4e02c489e4b92805fb747c8b0840c079
Commit Graph

422660 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
7bc9c7df4e [automerger skipped] Merge "Don't auto-connect to networks that have no/limited connectivity." am: a5b124cce3 
am: ebdd783a9b -s ours
am skip reason: change_id I5413393529c4bad3a707df229307542486bcff33 with SHA1 c0e461f2d9 is in history

Change-Id: I116cea63ccbfd5346ca218486671abae5176c273
 2019-06-24 08:50:02 -07:00
Beverly
2afa89c638 Merge "Don't update dark boot setting onStart" into qt-dev 
am: 2e967bf7e2

Change-Id: I39fe2796e930cb2dc6b7af49c7d34c80349bef7c
 2019-06-24 08:17:47 -07:00
Ioannis Ilkos
689148acc6 Merge "Add anon RSS + swap metric" into qt-dev 
am: 9af8d15783

Change-Id: I00f58e98bb7c162032bf381348a63be4bd77ac0f
 2019-06-24 08:16:21 -07:00
Hyundo Moon
b535723ff5 Merge "Do not allow adding custom Parcelable in Bundles" into qt-dev 
am: 1348399885

Change-Id: Ibca40676bb609379cda3797b5120be76a62041d3
 2019-06-24 08:09:54 -07:00
Chiayu Pei
9d75e2fd79 Merge "Revert "Unregister listeners and reset wake lock"" into qt-dev 
am: a5be28971c

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

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

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

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

Change-Id: I66eb1369e032d555a84ef2f2e01f5756a5c70b2c
 2019-06-24 08:07:16 -07:00
Lorenzo Colitti
ebdd783a9b Merge "Don't auto-connect to networks that have no/limited connectivity." 
am: a5b124cce3

Change-Id: Ic9b0dc49b13656447bdcde85e624936cc04cee7c
 2019-06-24 07:59:34 -07:00
TreeHugger Robot
2e967bf7e2 Merge "Don't update dark boot setting onStart" into qt-dev 2019-06-24 13:24:12 +00:00
Lorenzo Colitti
a5b124cce3 Merge "Don't auto-connect to networks that have no/limited connectivity." 2019-06-24 10:45:51 +00:00
Ioannis Ilkos
9af8d15783 Merge "Add anon RSS + swap metric" into qt-dev 2019-06-24 08:46:40 +00:00
Hyundo Moon
1348399885 Merge "Do not allow adding custom Parcelable in Bundles" into qt-dev 2019-06-24 04:26:17 +00: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
2299133d8f Don't auto-connect to networks that have no/limited connectivity. 
Auto-reconnecting to a network with no or limited Internet
connectivity is not useful. This is because such networks cannot
be used unless the user taps the notification and interacts with
the resulting dialog. But the notification is only shown if the
user manually connects to the network, not if the system
auto-connects to it.

Bug: 130683832
Bug: 130766237
Test: atest FrameworksNetTests
Change-Id: I5413393529c4bad3a707df229307542486bcff33
Merged-In: I5413393529c4bad3a707df229307542486bcff33
 2019-06-24 11:39:18 +09: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
Jerry Chang
b84c0786b2 Merge "Fade away wallpapers when long pulse" into qt-dev 
am: 14e6d18ec9

Change-Id: I0ee6f6d17990dd423d362e63805eb131bb401b4d
 2019-06-22 17:16:17 -07:00
TreeHugger Robot
58b7cf731d Merge "Handle USER_ALL in instant apps call" into qt-dev 2019-06-22 21:27:12 +00:00
Lucas Dupin
9b47581ea4 Merge "Unregister listeners and reset wake lock" into qt-dev 2019-06-22 20:12:26 +00:00
Lucas Dupin
fe107a1621 Unregister listeners and reset wake lock 
The ContentProvider might be recreated by the system, so we it's
not necessarily a singleton. We need to cleanup listener registration
and alarms before reattributing the static variable.

Change-Id: I227842d7272d1edeaa67d776950f369aedb01a91
Merged-In: I227842d7272d1edeaa67d776950f369aedb01a91
Fixes: 135344397
Fixes: 135582651
Test: bind and unbind slice various times
Test: atest KeyguardSliceProviderTest
 2019-06-22 19:01:20 +00:00
TreeHugger Robot
25a43f362a Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-22 17:24:18 +00:00
Dave Mankoff
6c9547a9a5 Merge "DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType." into qt-dev 2019-06-22 15:41:14 +00:00
Dave Mankoff
e0321d5809 DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType. 
Test: atest SystemUITests
Bug: 111394067
Change-Id: I0ab9a72d66bf56a56df2de2ad2d247f299d1b748
Merged-In: I0ab9a72d66bf56a56df2de2ad2d247f299d1b748
 2019-06-22 14:19:01 +00:00
TreeHugger Robot
14e6d18ec9 Merge "Fade away wallpapers when long pulse" into qt-dev 2019-06-22 11:59:49 +00:00
Bill Yi
6ce90273cf Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I62581a342971f2c72fbf24ecd285060a35c6d863
 2019-06-21 22:51:00 -07:00
Youming Ye
5cb9683fd7 [automerger skipped] Merge "Add carrier config for conference participants data support" into qt-dev 
am: 23b6339ebd -s ours
am skip reason: change_id I88edd5a590f46b961c986ef0bf24585b3c2cf4a1 with SHA1 37ca693d78 is in history

Change-Id: I83aafdb229133e630c29f658e41da483b7cca44a
 2019-06-21 17:42:16 -07:00
Robert Carr
641d4f27e3 Merge "ViewRootImpl: Ensure layout when configuration changes." into qt-dev 
am: 6397ab05f9

Change-Id: I023b06dc785cbf22783a426060aef55714a457d8
 2019-06-21 17:32:54 -07:00
TreeHugger Robot
23b6339ebd Merge "Add carrier config for conference participants data support" into qt-dev 2019-06-22 00:12:34 +00:00
TreeHugger Robot
6397ab05f9 Merge "ViewRootImpl: Ensure layout when configuration changes." into qt-dev 2019-06-22 00:04:19 +00:00
Amit Mahajan
3d5285c16b Merge "Set mOriginatingAddress and mRecipientAddress separately" am: 44ea78d8ff 
am: ab90035993

Change-Id: I02833dfbb5af129f326370d9c09968f167fef19e
 2019-06-21 16:46:15 -07:00
Amit Mahajan
ab90035993 Merge "Set mOriginatingAddress and mRecipientAddress separately" 
am: 44ea78d8ff

Change-Id: Ieb3e2b98cc61fef472fe471ae05bf9db7a9b66ed
 2019-06-21 16:39:09 -07:00
Amit Mahajan
44ea78d8ff Merge "Set mOriginatingAddress and mRecipientAddress separately" 2019-06-21 23:23:12 +00:00
Youming Ye
60b023bfd0 Add carrier config for conference participants data support 
Bug: 132312382
Test: Manual
Change-Id: I88edd5a590f46b961c986ef0bf24585b3c2cf4a1
Merged-In: I88edd5a590f46b961c986ef0bf24585b3c2cf4a1
 2019-06-21 22:30:08 +00:00
Bill Yi
772a340689 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: 019e1bf3fb -s ours
am skip reason: subject contains skip directive

Change-Id: I20dde9516b31187e21f5eb90f7dce45019d1f96e
 2019-06-21 15:21:23 -07:00
Aran Ink
43369ea648 Merge "Fix conflict between metrics_constants and settings_enums." into qt-dev 
am: 985f21dd43

Change-Id: I3c148d970cb95a4de752270ca6bbe6e5db2d77d1
 2019-06-21 15:18:29 -07:00
TreeHugger Robot
019e1bf3fb Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-21 22:05:31 +00:00