Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
421,444 Commits 3 Branches 0 Tags
d90074cc39549da855ade19608ecc215ca3d9ca8
Commit Graph

421444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad Ebinger
d90074cc39 [automerger skipped] Switch DDS during MSIM emergency call 
am: 1faea364d3 -s ours
am skip reason: change_id Ic49e126ae0abfe71edd1fe000c2a0dfd2360dece with SHA1 cb95725b71 is in history

Change-Id: Ia5fab5c0adcf7648f7a11853e33d2adca73ea932
 2019-06-05 01:11:42 -07:00
Bill Yi
7ff21652bc [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: d10a92f20c -s ours
am skip reason: subject contains skip directive

Change-Id: I5f252cfd0b8139b027a0059f842fe654c6d24c0a
 2019-06-05 01:10:25 -07:00
Bill Yi
84c120a610 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: 9d6d37ad3a -s ours
am skip reason: subject contains skip directive

Change-Id: I72274c61df8e631ed5bb826b7825566c8f175615
 2019-06-05 01:08:19 -07:00
TreeHugger Robot
d10a92f20c Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-05 04:40:45 +00:00
TreeHugger Robot
9d6d37ad3a Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-05 04:40:36 +00:00
Bill Yi
5af4271086 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I356f6734d4c95d538271eabbc649bca4d2eb848b
 2019-06-04 20:14:30 -07:00
Bill Yi
ecd816bb9c Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: If4bcd8bbd4cfea27f62b11f628420aaff2cd02d3
 2019-06-04 20:09:14 -07:00
Brad Ebinger
cb95725b71 Switch DDS during MSIM emergency call 
Add carrier config to force DDS switch if device
does not support SUPL on non DDS for emergency and
also does not support control plane fallback.

Test: atest FrameworksTelephonyTests
Merged-In: Ic49e126ae0abfe71edd1fe000c2a0dfd2360dece
Change-Id: Ic49e126ae0abfe71edd1fe000c2a0dfd2360dece
(cherry picked from commit c9654c1b57)
 2019-06-05 02:54:52 +00:00
Lucas Dupin
525abc5afa Merge "Fix issue where panel opacity could be wrong" into qt-dev 
am: 30e9b45cd9

Change-Id: I9ed2270b39ef3566e7c196501c234a0e3dd71bbd
 2019-06-04 18:53:20 -07:00
Alex Salo
fc94f97a98 Merge "Don't call ActivityManagerService on main thread" into qt-dev 
am: 9a01bb4280

Change-Id: Idbe5e2f729b45f9918c7f0a9f16bccf959427dbc
 2019-06-04 18:48:21 -07:00
Mathieu Chartier
f5ae9a62da Merge "Fix some bugs in dumpsys meminfo attribution" into qt-dev 
am: 652b445c07

Change-Id: I26dd2413b054c9dae00cc0f4f53e5a99bf81740a
 2019-06-04 18:46:31 -07:00
Bill Yi
e4aa0a8d1f [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: 0906e02aa3 -s ours
am skip reason: subject contains skip directive

Change-Id: Icd1105544ab2bf55f3172fa5a34257b7665b628c
 2019-06-04 18:44:50 -07:00
Bill Yi
c358eca34b [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: 452be4963c -s ours
am skip reason: subject contains skip directive

Change-Id: I106a94415dac25a75d16ccaf45aa83970d39d15e
 2019-06-04 18:43:21 -07:00
Tracy Zhou
a676a30ae5 Merge "Fix the logic of canceling previous scheduled fade in animation." into qt-dev 
am: 289583ec1a

Change-Id: Ibf42ec24d16c0510e27673f12700e9493562b759
 2019-06-04 18:41:56 -07:00
Hui Yu
33add786a6 Merge "Only set mStartClockTime when device is fully charged." into qt-dev 
am: 28d28a4ee5

Change-Id: Ied83bb528362c96477c365b60f00a301d7de39d6
 2019-06-04 18:40:22 -07:00
David Sehr
e698002e22 [automerger skipped] Merge "Add system option to disable lock profiling" into qt-dev 
am: 10d9320c3a -s ours
am skip reason: change_id Ida5f83e626c82266de69b13dc2def0477cc87b0f with SHA1 26a6427c44 is in history

Change-Id: I0679d8d82dd7fc2fa4f772c01e6c0b0c21f84631
 2019-06-04 18:39:03 -07:00
Winson Chung
8d8dcec593 Merge "Expose keyguard showing-but-occluded state to launcher" into qt-dev 
am: c8120d6d6a

Change-Id: Iaacee648ff9535231701b07592da69a98d529d14
 2019-06-04 18:37:24 -07:00
Jovana Knezevic
dcb4951fea Merge "Removing requirement for FEATURE_DEVICE_ADMIN in DPMS.setActivePasswordState()." into qt-dev 
am: e45e09fcee

Change-Id: I5c1599e060dd60126eff28b47304dff8c2d194b8
 2019-06-04 18:35:58 -07:00
Mady Mellor
b2bcff6769 Merge "Post finishing after transition in onBackPressed" into qt-dev 
am: 57854d3b90

Change-Id: I7969cfef79133979c5b738496ec2a7c2360e9f11
 2019-06-04 18:34:24 -07:00
Wale Ogunwale
ef2a04ad41 Merge "Revert "Collect NeededUriGrants without holding locks."" into qt-dev 
am: 2aa255a746

Change-Id: I66ed29edc5c3079984ec205d629bb1d3f587a09c
 2019-06-04 18:32:53 -07:00
Matt Casey
05e8a22ab1 Merge "Rendering fixes for assist handles." into qt-dev 
am: 075baa2e9b

Change-Id: Id6e48daf7de9267873bc335f8847f686a1bfc669
 2019-06-04 18:31:29 -07:00
Lorenzo Colitti
e0348e5a6f Merge "Allow passing in acceptUnvalidated without explicitlySelected" into qt-dev 
am: e2fb127e41

Change-Id: Ifd9dbc9c83e426e66417247cbf1fa594193e000f
 2019-06-04 18:29:51 -07:00
Makoto Onuki
231b70ce96 Merge "Fix slow query log." into qt-dev 
am: dee07f5d7f

Change-Id: If0b3a8caf1563fdcf25f8d38e3b5c6b1d183e3a2
 2019-06-04 18:27:43 -07:00
Hongyi Zhang
887d09db5f Merge "Fix location API usage for API_ADD_GNSS_MEASUREMENTS_LISTENER" into qt-dev 
am: a1d0453641

Change-Id: I572fa4eebc9b4597e1c7af54030d999c41184c93
 2019-06-04 18:24:47 -07:00
Victor Hsieh
6ebd3bf5e8 Merge "Skip legacy-fs-verity setup if file already has it" into qt-dev 
am: 4fd5870662

Change-Id: Ia74ba2d310e67c025ca76683caa9d93d2fcefc40
 2019-06-04 18:14:26 -07:00
TreeHugger Robot
30e9b45cd9 Merge "Fix issue where panel opacity could be wrong" into qt-dev 2019-06-05 01:11:38 +00:00
Alex Salo
9a01bb4280 Merge "Don't call ActivityManagerService on main thread" into qt-dev 2019-06-05 00:50:14 +00:00
Mathieu Chartier
652b445c07 Merge "Fix some bugs in dumpsys meminfo attribution" into qt-dev 2019-06-05 00:22:39 +00:00
TreeHugger Robot
0906e02aa3 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-04 23:03:29 +00:00
TreeHugger Robot
452be4963c Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-04 22:55:34 +00:00
Tracy Zhou
289583ec1a Merge "Fix the logic of canceling previous scheduled fade in animation." into qt-dev 2019-06-04 22:05:36 +00:00
Hui Yu
28d28a4ee5 Merge "Only set mStartClockTime when device is fully charged." into qt-dev 2019-06-04 21:59:52 +00:00
Bill Yi
2c6aa0491d Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ieb522c4dcc354e5a984dd8cb6f7111fac4c5e8d2
 2019-06-04 14:44:42 -07:00
TreeHugger Robot
10d9320c3a Merge "Add system option to disable lock profiling" into qt-dev 2019-06-04 21:34:23 +00:00
Alex Salo
042e43a717 Don't call ActivityManagerService on main thread 
AttentionManagerService is getting called from PMS with its mLock held.
PowerManagerService can't up-call to the system, thus AMS can't call
into ActivityManagerService via bindService() - put it on another
thread.

Bug: 133077390
Test: manually
Change-Id: I373163c188bc8dbbd3d4f708073a875a57cfed73
 2019-06-04 13:59:16 -07:00
Winson Chung
c8120d6d6a Merge "Expose keyguard showing-but-occluded state to launcher" into qt-dev 2019-06-04 20:56:37 +00:00
Brad Ebinger
1faea364d3 Switch DDS during MSIM emergency call 
Add carrier config to force DDS switch if device
does not support SUPL on non DDS for emergency and
also does not support control plane fallback.

Fixes: 131203278
Merged-In: Ic49e126ae0abfe71edd1fe000c2a0dfd2360dece
Change-Id: Ic49e126ae0abfe71edd1fe000c2a0dfd2360dece
 2019-06-04 20:44:28 +00:00
Mathieu Chartier
8da8cbfefc Fix some bugs in dumpsys meminfo attribution 
ART image files can end with either .art or .art] depending on where
they are loaded from, add handling for this.

Also fix subheap attribution to HEAP_ART_BOOT and HEAP_ART_APP for
the app image case.

Test: adb shell dumpsys meminfo `pid system_server`
Bug: 134509632

Change-Id: I98882466d7c2f31179b095b803af67d21c17306c
 2019-06-04 13:22:35 -07:00
Jovana Knezevic
e45e09fcee Merge "Removing requirement for FEATURE_DEVICE_ADMIN in DPMS.setActivePasswordState()." into qt-dev 2019-06-04 20:10:43 +00:00
TreeHugger Robot
57854d3b90 Merge "Post finishing after transition in onBackPressed" into qt-dev 2019-06-04 19:11:52 +00:00
Wale Ogunwale
2aa255a746 Merge "Revert "Collect NeededUriGrants without holding locks."" into qt-dev 2019-06-04 19:04:53 +00:00
Lucas Dupin
bf6d40ca3a Fix issue where panel opacity could be wrong 
Test: manual
Fixes: 133317529
Change-Id: I642df0999a9552be33f0385a42cbfcfb84bafaa1
 2019-06-04 11:50:36 -07:00
TreeHugger Robot
075baa2e9b Merge "Rendering fixes for assist handles." into qt-dev 2019-06-04 18:03:32 +00:00
TreeHugger Robot
e2fb127e41 Merge "Allow passing in acceptUnvalidated without explicitlySelected" into qt-dev 2019-06-04 18:00:31 +00:00
Winson Chung
7bbeb4531a Expose keyguard showing-but-occluded state to launcher 
Bug: 133871965
Test: Verify with sysui dump in various states
Change-Id: I39c99712d525e0823a86d32510beb0a35103dd5e
 2019-06-04 10:36:32 -07:00
Wale Ogunwale
586a8ee786 Revert "Collect NeededUriGrants without holding locks." 
This reverts commit 344ce7ce70.

Bug: 115619667
Bug: 134494852
Reason for revert: Causes "Permission Denial: opening provider" error

Change-Id: I9986618b6e338fef9843b2103da6a728a36c6ea6
 2019-06-04 17:21:25 +00:00
Makoto Onuki
dee07f5d7f Merge "Fix slow query log." into qt-dev 2019-06-04 16:57:23 +00:00
Hongyi Zhang
a1d0453641 Merge "Fix location API usage for API_ADD_GNSS_MEASUREMENTS_LISTENER" into qt-dev 2019-06-04 16:47:35 +00:00
TreeHugger Robot
4fd5870662 Merge "Skip legacy-fs-verity setup if file already has it" into qt-dev 2019-06-04 16:39:34 +00:00
junyulai
0b0b339e8b Merge "Fix cannot create Nat-T keepalive on mobile data" into qt-dev 
am: eabafd5ceb

Change-Id: I580b4dd2e493430e8420ca0907f9cf7d1d5a8773
 2019-06-04 08:48:21 -07:00