Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
430,969 Commits 3 Branches 0 Tags
33f5edee258ff5ab28cfee111d0191d3c8eb7b01
Commit Graph

430969 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SongFerng Wang
33f5edee25 Merge "To modify 5G icon carrier config's comment: 5GPlus to 5G_Plus" into qt-qpr1-dev 
am: 712fc079a0

Change-Id: If745d92f94ce75b0298dbc66f53731a1faab09c4
 2019-08-20 20:32:30 -07:00
James Lin
22c7dec4b7 Merge "Remove the Phone registration error notification" into qt-qpr1-dev 
am: 507bc4ac36

Change-Id: Ia3e54831a25be0dca455e9ba78d76cfb8842858b
 2019-08-20 20:27:42 -07:00
SongFerng Wang
712fc079a0 Merge "To modify 5G icon carrier config's comment: 5GPlus to 5G_Plus" into qt-qpr1-dev 2019-08-21 03:16:52 +00:00
James Lin
507bc4ac36 Merge "Remove the Phone registration error notification" into qt-qpr1-dev 2019-08-21 03:14:05 +00:00
zhuguangqing
cc437bf66f Merge "Modify start/stop condition for mScreenDozeTimer." am: 83ed488383 am: 8d8d85b93e am: 6ccd3310db 
am: 2fc30b6e6e

Change-Id: Ibc88f31f1cee5c78f4b7ed8f6a3b03df9dc56ad8
 2019-08-20 19:10:45 -07:00
zhuguangqing
2fc30b6e6e Merge "Modify start/stop condition for mScreenDozeTimer." am: 83ed488383 am: 8d8d85b93e 
am: 6ccd3310db

Change-Id: Iba10dc657081b184f14e21f8a2a0e86fb9146faa
 2019-08-20 19:00:40 -07:00
zhuguangqing
6ccd3310db Merge "Modify start/stop condition for mScreenDozeTimer." am: 83ed488383 
am: 8d8d85b93e

Change-Id: Iec45a370c282d9622408a825cb11530e755a210f
 2019-08-20 18:45:34 -07:00
zhuguangqing
8d8d85b93e Merge "Modify start/stop condition for mScreenDozeTimer." 
am: 83ed488383

Change-Id: I12ff8f6860a60519a9b029010fa1078d47ccfc25
 2019-08-20 18:22:19 -07:00
Baohe.Wang
99d3e083e6 Merge "TvInputManagerService patch" am: 11e60c0824 am: 2891b74ac3 am: d710ca399a 
am: d066d5b7fc

Change-Id: Ie545fb4737a79c7c2b35a4238d75d17435efa6f9
 2019-08-20 18:21:59 -07:00
Selim Cinek
fe8ef8b800 [automerger skipped] Merge "DO NOT MERGE: Fixed an issue where the notification icons wouldn't show while docked" into qt-dev am: cceea08cc7 am: 942b39d0f6 -s ours 
am: cfbb238270 -s ours
am skip reason: change_id I8f7bd7a6a0562942ed3e12f28705043722d177e8 with SHA1 65c96f2fd4 is in history

Change-Id: Ia3ce840ed4f47c86bef1f3f8db3509ab96a41a1f
 2019-08-20 18:17:36 -07:00
Nazanin Bakhshi
81b2b4536f Merge "add certs to carrier configs and store them as UiccAccessRules" into qt-qpr1-dev-plus-aosp 2019-08-21 01:12:52 +00:00
Selim Cinek
347e96ddf8 [automerger skipped] DO NOT MERGE: Fixed an issue where the notification icons wouldn't show while docked am: bdf71a0420 am: 1b9f1ad3d8 -s ours 
am: 89dee3699e -s ours
am skip reason: change_id I8f7bd7a6a0562942ed3e12f28705043722d177e8 with SHA1 65c96f2fd4 is in history

Change-Id: I12c9c9bc3adeba295431fb1335df5c6512ec08f9
 2019-08-20 18:09:16 -07:00
Baohe.Wang
d066d5b7fc Merge "TvInputManagerService patch" am: 11e60c0824 am: 2891b74ac3 
am: d710ca399a

Change-Id: Ie113645bb83463d3dd0c12d71cf4a6a3ed8da42a
 2019-08-20 17:54:44 -07:00
Android Build Merger (Role)
f9738f6cf3 Merge "[automerger skipped] Merge "DO NOT MERGE: Fixed an issue where the notification icons wouldn't show while docked" into qt-dev am: cceea08cc7 -s ours am: 776d0367b0 -s ours am: 3518b5caef -s ours am skip reason: change_id I8f7bd7a6a0562942ed3e12f28705043722d177e8 with SHA1 65c96f2fd4 is in history" into qt-qpr1-dev-plus-aosp 2019-08-21 00:52:13 +00:00
Selim Cinek
10713a5795 [automerger skipped] Merge "DO NOT MERGE: Fixed an issue where the notification icons wouldn't show while docked" into qt-dev am: cceea08cc7 -s ours am: 776d0367b0 -s ours 
am: 3518b5caef -s ours
am skip reason: change_id I8f7bd7a6a0562942ed3e12f28705043722d177e8 with SHA1 65c96f2fd4 is in history

Change-Id: I59032eba5f6d2f72cc8b77937d2104f0174cca32
 2019-08-20 17:51:35 -07:00
Selim Cinek
fc3b895ddc [automerger skipped] Merge "DO NOT MERGE: Fixed an issue where the notification icons wouldn't show while docked" into qt-dev am: cceea08cc7 -s ours am: 776d0367b0 -s ours 
am: 5c5a1d06cb -s ours
am skip reason: change_id I8f7bd7a6a0562942ed3e12f28705043722d177e8 with SHA1 65c96f2fd4 is in history

Change-Id: I90101660b5fc084ce95db7d7837f5179fa9808bd
 2019-08-20 17:51:23 -07:00
Selim Cinek
cfbb238270 [automerger skipped] Merge "DO NOT MERGE: Fixed an issue where the notification icons wouldn't show while docked" into qt-dev am: cceea08cc7 
am: 942b39d0f6 -s ours
am skip reason: change_id I8f7bd7a6a0562942ed3e12f28705043722d177e8 with SHA1 65c96f2fd4 is in history

Change-Id: Ide77303b55855437055b078f9ca0de175bc1ac2e
 2019-08-20 17:50:36 -07:00
Selim Cinek
5c4a044c3a Merge "EglDisplay may be null and cause Null point exception" into qt-r1-dev am: aec6b61816 
am: 2c92111f42

Change-Id: I155e7d5c0b99c5acf2baa3fb7243256822206c91
 2019-08-20 17:46:25 -07:00
Treehugger Robot
83ed488383 Merge "Modify start/stop condition for mScreenDozeTimer." 2019-08-21 00:44:40 +00:00
Selim Cinek
89dee3699e [automerger skipped] DO NOT MERGE: Fixed an issue where the notification icons wouldn't show while docked am: bdf71a0420 
am: 1b9f1ad3d8 -s ours
am skip reason: change_id I8f7bd7a6a0562942ed3e12f28705043722d177e8 with SHA1 65c96f2fd4 is in history

Change-Id: I4103ed99271b9a027668c0b664718ee8b4b0cc82
 2019-08-20 17:44:31 -07:00
Selim Cinek
f1b5f8301e Merge "EglDisplay may be null and cause Null point exception" into qt-r1-dev am: aec6b61816 
am: a8010f4b5c

Change-Id: Ic87a251bde9316b0c11d902be435ced19df7fb98
 2019-08-20 17:41:37 -07:00
Selim Cinek
3518b5caef [automerger skipped] Merge "DO NOT MERGE: Fixed an issue where the notification icons wouldn't show while docked" into qt-dev am: cceea08cc7 -s ours 
am: 776d0367b0 -s ours
am skip reason: change_id I8f7bd7a6a0562942ed3e12f28705043722d177e8 with SHA1 65c96f2fd4 is in history

Change-Id: Iae70b03d22fa30b275a6af2477b08b1132b515eb
 2019-08-20 17:33:55 -07:00
Selim Cinek
a8010f4b5c Merge "EglDisplay may be null and cause Null point exception" into qt-r1-dev 
am: aec6b61816

Change-Id: Ief335b85b37c41b128cd67727acd354c9a6642d2
 2019-08-20 17:28:40 -07:00
Baohe.Wang
d710ca399a Merge "TvInputManagerService patch" am: 11e60c0824 
am: 2891b74ac3

Change-Id: I56c59fe06a753784a965f47dd0b9ff58d472b808
 2019-08-20 17:28:26 -07:00
Selim Cinek
5c5a1d06cb [automerger skipped] Merge "DO NOT MERGE: Fixed an issue where the notification icons wouldn't show while docked" into qt-dev am: cceea08cc7 -s ours 
am: 776d0367b0 -s ours
am skip reason: change_id I8f7bd7a6a0562942ed3e12f28705043722d177e8 with SHA1 65c96f2fd4 is in history

Change-Id: I581e414b3e50377facc94d1145c6976f4779da05
 2019-08-20 17:27:18 -07:00
Selim Cinek
942b39d0f6 Merge "DO NOT MERGE: Fixed an issue where the notification icons wouldn't show while docked" into qt-dev 
am: cceea08cc7

Change-Id: Iceec57c462cb844354dfb3b67ac111fde03f35be
 2019-08-20 17:22:49 -07:00
Selim Cinek
1b9f1ad3d8 DO NOT MERGE: Fixed an issue where the notification icons wouldn't show while docked 
am: bdf71a0420

Change-Id: I36e20e3af9728bffed162b740fca1b9cd33589f6
 2019-08-20 17:22:41 -07:00
Selim Cinek
2c92111f42 Merge "EglDisplay may be null and cause Null point exception" into qt-r1-dev 
am: aec6b61816

Change-Id: Ie20c919bb28fb365d249c173786117519c4db973
 2019-08-20 17:22:20 -07:00
Baohe.Wang
2891b74ac3 Merge "TvInputManagerService patch" 
am: 11e60c0824

Change-Id: I32d0deab39df9a1ec2a2aaa012fccca307053db2
 2019-08-20 17:14:51 -07:00
Selim Cinek
776d0367b0 [automerger skipped] Merge "DO NOT MERGE: Fixed an issue where the notification icons wouldn't show while docked" into qt-dev 
am: cceea08cc7 -s ours
am skip reason: change_id I8f7bd7a6a0562942ed3e12f28705043722d177e8 with SHA1 65c96f2fd4 is in history

Change-Id: I5451e6467e8ffebd08360abfab9f86a429ed0721
 2019-08-20 17:14:38 -07:00
Chong Zhang
ec9962c1e0 Merge "Only allow mediaserver to report video battery stats" into qt-qpr1-dev 
am: 166eee1f33

Change-Id: Ica5b02437acb54d36069d4c3c31d3e1200ef1f88
 2019-08-20 16:57:38 -07:00
Selim Cinek
aec6b61816 Merge "EglDisplay may be null and cause Null point exception" into qt-r1-dev 2019-08-20 23:40:41 +00:00
Selim Cinek
cceea08cc7 Merge "DO NOT MERGE: Fixed an issue where the notification icons wouldn't show while docked" into qt-dev 2019-08-20 23:39:13 +00:00
Lucas Dupin
4241c09846 Remove main thread IPC 
am: e36d8d8645

Change-Id: Ifbe5f31c965339bd3496262dc74b89f05d8c6deb
 2019-08-20 16:29:23 -07:00
Treehugger Robot
11e60c0824 Merge "TvInputManagerService patch" 2019-08-20 23:28:43 +00:00
Chong Zhang
166eee1f33 Merge "Only allow mediaserver to report video battery stats" into qt-qpr1-dev 2019-08-20 23:22:35 +00:00
Baohe.Wang
7af0ff9f38 TvInputManagerService patch 
Fix potential null pointer access at TvInputManagerService.java

Bug: 136411969
 2019-08-20 20:58:03 +00:00
Richard Uhler
f5b1fc3181 Disable testEnableRollbackTimeoutFailsRollback test. am: 9a97acb842 am: e878e175ec 
am: 246790aba8

Change-Id: I54f00d5a315a8a71b142041803cd6196d3094f0d
 2019-08-20 13:17:42 -07:00
Selim Cinek
bdf71a0420 DO NOT MERGE: Fixed an issue where the notification icons wouldn't show while docked 
Since we're using the pulsing state for docking, the icons would now
become clipped while pulsing.

Fixes: 139096431
Test: dock, observe notification icons showing
Change-Id: If251e6b18c03b2824b4d3ea4dab82d4a403565f1
Merged-In: I8f7bd7a6a0562942ed3e12f28705043722d177e8
 2019-08-20 13:00:03 -07:00
Richard Uhler
246790aba8 Disable testEnableRollbackTimeoutFailsRollback test. am: 9a97acb842 
am: e878e175ec

Change-Id: If6ac9fca6bdcd3f157cfb0661c342bdfb98c4e83
 2019-08-20 12:47:27 -07:00
Richard Uhler
e878e175ec Disable testEnableRollbackTimeoutFailsRollback test. 
am: 9a97acb842

Change-Id: I75966a82d934f4b9a5d9fb1bf90d649ad4244411
 2019-08-20 12:21:41 -07:00
SongFerngWang
b532af6c72 To modify 5G icon carrier config's comment: 5GPlus to 5G_Plus 
Bug: 138932186
Test: build pass
Change-Id: Ic8625f44a5ad23a307cfb280b85bfb27da2f2b06
 2019-08-21 02:42:20 +08:00
Android Build Merger (Role)
8dfcc3bf2d Merge "Merge "Fixed null callback issue" into qt-r1-dev am: f3395734e8 am: d084c899d9" into qt-qpr1-dev-plus-aosp 2019-08-20 18:11:44 +00:00
Jayachandran Chinnakkannu
6a3561cd59 Merge "Fixed null callback issue" into qt-r1-dev am: f3395734e8 
am: d084c899d9

Change-Id: I2811b36c1e17e268943dd35fc4a4707cd0dc1baa
 2019-08-20 11:10:47 -07:00
Jayachandran Chinnakkannu
0677b837d5 Merge "Fixed null callback issue" into qt-r1-dev am: f3395734e8 
am: 0a1f1e0389

Change-Id: I13629ef2b8115381ebbe2438e4d68072fad5cfdc
 2019-08-20 11:10:36 -07:00
Nazanin Bakhshi
600a9fee3a add certs to carrier configs and store them as UiccAccessRules 
Bug: 138388637
Test: tested with local override and made sure they are read and parsed
Change-Id: I50fb11444f0da33ae48683b834e6ca50941ad1b7
 2019-08-20 11:07:11 -07:00
Lucas Dupin
e36d8d8645 Remove main thread IPC 
Test: pull down shade with phone locked and dynamic privacy
Fixes: 139308527
Change-Id: Ie79a2865a9ecf591451dfd4dd10eb523d10862c9
 2019-08-20 17:54:34 +00:00
Jayachandran Chinnakkannu
d084c899d9 Merge "Fixed null callback issue" into qt-r1-dev 
am: f3395734e8

Change-Id: I438b53eec3edf8de1f9046ea820f7fdfd17f4249
 2019-08-20 10:51:22 -07:00
Jayachandran Chinnakkannu
0a1f1e0389 Merge "Fixed null callback issue" into qt-r1-dev 
am: f3395734e8

Change-Id: If431a32bf6a44235599737b0295d2bb1cf491acf
 2019-08-20 10:50:30 -07:00
Alex Light
70575d2b7d [automerger skipped] Merge "Add agent startup-attach" am: 2214ede1ec -s ours am: ae856b049a -s ours am: 1d7b2e472c -s ours 
am: a6afc752b0 -s ours
am skip reason: change_id Ib82b27df90c7964a995288d8b2b3d348a11cdd80 with SHA1 ca8502a7f5 is in history

Change-Id: Ibd45b1d63fa138e60abb9fb360af2d5ac78519ba
 2019-08-20 10:41:44 -07:00