Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
429,965 Commits 3 Branches 0 Tags
cfbb238270ccaa5a658fa72ad6cf23814cd38291
Commit Graph

429965 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
Jayachandran Chinnakkannu
f3395734e8 Merge "Fixed null callback issue" into qt-r1-dev 2019-08-20 17:37:03 +00:00
Alex Light
a6afc752b0 [automerger skipped] Merge "Add agent startup-attach" am: 2214ede1ec -s ours am: ae856b049a -s ours 
am: 1d7b2e472c -s ours
am skip reason: change_id Ib82b27df90c7964a995288d8b2b3d348a11cdd80 with SHA1 ca8502a7f5 is in history

Change-Id: I0f7e1078feda8cb831223c83d3b5d06e15df85d8
 2019-08-20 10:27:23 -07:00
Jiyong Park
d5d60f891b [automerger skipped] Merge "glob pattern is used for AIDL files under frameworks/base" am: bd8e232e20 -s ours am: 439de8d1ee -s ours 
am: c20120f218 -s ours
am skip reason: change_id I59728ed06d66d44bc19bcd8530042c01add5fc2b with SHA1 0c6dc7b709 is in history

Change-Id: I37fe5b9c1ad9790373b664a31cd1cba66f92aae5
 2019-08-20 10:20:30 -07:00
Richard Uhler
9a97acb842 Disable testEnableRollbackTimeoutFailsRollback test. 
The test is flaky because it is testing a race condition.

The flakiness is fixed with the help of some new @TestApi in
I01f3e769711ffa51fa714ff4bc81e70887f427ad. Disable the test on those
branches without the fix merged.

Bug: 134373106
Bug: 136605788
Test: atest RollbackTest

Change-Id: I05edfc142c14631b259ae7aaf2dd31af00363a35
Merged-In: I01f3e769711ffa51fa714ff4bc81e70887f427ad
(cherry picked from commit 75f942dfa8)
 2019-08-20 17:16:35 +00:00
Alex Light
1d7b2e472c [automerger skipped] Merge "Add agent startup-attach" am: 2214ede1ec -s ours 
am: ae856b049a -s ours
am skip reason: change_id Ib82b27df90c7964a995288d8b2b3d348a11cdd80 with SHA1 ca8502a7f5 is in history

Change-Id: Iaa4a0c56345b4ba8f1f77f5a43f4f5cc6ef1823d
 2019-08-20 10:10:14 -07:00
Jiyong Park
c20120f218 [automerger skipped] Merge "glob pattern is used for AIDL files under frameworks/base" am: bd8e232e20 -s ours 
am: 439de8d1ee -s ours
am skip reason: change_id I59728ed06d66d44bc19bcd8530042c01add5fc2b with SHA1 0c6dc7b709 is in history

Change-Id: I3e58d5b3d1e812ab40713cdff54c84a8742a77d2
 2019-08-20 10:00:33 -07:00
Alex Light
ae856b049a [automerger skipped] Merge "Add agent startup-attach" 
am: 2214ede1ec -s ours
am skip reason: change_id Ib82b27df90c7964a995288d8b2b3d348a11cdd80 with SHA1 c4caca112f is in history

Change-Id: I4543024a1029fde612975e144e9c6a1f0cc09247
 2019-08-20 09:56:03 -07:00
Jiyong Park
439de8d1ee [automerger skipped] Merge "glob pattern is used for AIDL files under frameworks/base" 
am: bd8e232e20 -s ours
am skip reason: change_id I59728ed06d66d44bc19bcd8530042c01add5fc2b with SHA1 0c6dc7b709 is in history

Change-Id: Ib8f2525133a03860bea23924dcd7b7fd6bf55f4b
 2019-08-20 09:49:45 -07:00
Alex Light
9a26425282 [automerger skipped] Merge "Add agent startup-attach" into stage-aosp-master am: 366a542843 -s ours 
am: 6a67897e85 -s ours
am skip reason: change_id Ib82b27df90c7964a995288d8b2b3d348a11cdd80 with SHA1 ca8502a7f5 is in history

Change-Id: I61e2ffce40923fce9e1bf9abc4c426353c809606
 2019-08-20 09:28:40 -07:00
Treehugger Robot
2214ede1ec Merge "Add agent startup-attach" 2019-08-20 16:20:23 +00:00
Alex Light
6a67897e85 [automerger skipped] Merge "Add agent startup-attach" into stage-aosp-master 
am: 366a542843 -s ours
am skip reason: change_id Ib82b27df90c7964a995288d8b2b3d348a11cdd80 with SHA1 ca8502a7f5 is in history

Change-Id: I7b4caae0fe0503363d23f6b93dae8822af451766
 2019-08-20 09:14:06 -07:00
Treehugger Robot
bd8e232e20 Merge "glob pattern is used for AIDL files under frameworks/base" 2019-08-20 16:12:23 +00:00
Alex Light
366a542843 Merge "Add agent startup-attach" into stage-aosp-master 2019-08-20 15:39:48 +00:00
Anna Trostanetski
9b3780bf31 [automerger skipped] Merge "Start platform compat service eariler." am: c0442d5b80 -s ours am: a365bd024e -s ours 
am: 5f3a0e7967 -s ours
am skip reason: change_id Ie1130a3f0bdd1769fe0755db0089702ea64d9db6 with SHA1 8266ae32ba is in history

Change-Id: Id5f7c82990ed95416575be416ddf6ce23534bd45
 2019-08-20 05:34:44 -07:00
Anna Trostanetski
5f3a0e7967 [automerger skipped] Merge "Start platform compat service eariler." am: c0442d5b80 -s ours 
am: a365bd024e -s ours
am skip reason: change_id Ie1130a3f0bdd1769fe0755db0089702ea64d9db6 with SHA1 8266ae32ba is in history

Change-Id: I0d7b15dd953d22e79f41aaff43c011b3d047a24f
 2019-08-20 05:25:41 -07:00
Anna Trostanetski
a365bd024e [automerger skipped] Merge "Start platform compat service eariler." 
am: c0442d5b80 -s ours
am skip reason: change_id Ie1130a3f0bdd1769fe0755db0089702ea64d9db6 with SHA1 8266ae32ba is in history

Change-Id: I2f0b9275750b4c778f6b550cbd765352f37af098
 2019-08-20 05:14:00 -07:00
Anna Trostanetski
c0442d5b80 Merge "Start platform compat service eariler." 2019-08-20 11:00:40 +00:00
Jiyong Park
d2f7175e54 [automerger skipped] Merge "glob pattern is used for AIDL files under frameworks/base" into stage-aosp-master am: 665258fc50 -s ours 
am: 625e0eef9f -s ours
am skip reason: change_id I59728ed06d66d44bc19bcd8530042c01add5fc2b with SHA1 f20f181c53 is in history

Change-Id: Ibca2e86640f2f351bf14ee592372bb6a50b0189e
 2019-08-20 03:06:34 -07:00
Jiyong Park
625e0eef9f [automerger skipped] Merge "glob pattern is used for AIDL files under frameworks/base" into stage-aosp-master 
am: 665258fc50 -s ours
am skip reason: change_id I59728ed06d66d44bc19bcd8530042c01add5fc2b with SHA1 f20f181c53 is in history

Change-Id: I2b7a81f27987040d1cc292130a87f60ec2129ffc
 2019-08-20 02:46:45 -07:00
Anna Trostanetski
0755524354 Merge "Start platform compat service eariler." into stage-aosp-master am: 4535b04b33 
am: f3fe588229

Change-Id: Ib3d6a1df3fd245a7e274bbf89976565dc9dcc577
 2019-08-20 02:38:40 -07:00
TreeHugger Robot
665258fc50 Merge "glob pattern is used for AIDL files under frameworks/base" into stage-aosp-master 2019-08-20 09:34:38 +00:00
Anna Trostanetski
f3fe588229 Merge "Start platform compat service eariler." into stage-aosp-master 
am: 4535b04b33

Change-Id: Ie41d2286e869bf84362919a183f4bad348dfc945
 2019-08-20 02:25:13 -07:00
Anna Trostanetski
4535b04b33 Merge "Start platform compat service eariler." into stage-aosp-master 2019-08-20 09:07:33 +00:00
Jiyong Park
0c6dc7b709 glob pattern is used for AIDL files under frameworks/base 
This change removes the manullay curated list of AIDL files and replace
them with globs.

In addition, framework-aidl-mappings no longer sets frameworks-defaults
to its src property, but instead uses the several variables like
framework_srcs, framework_aidl_local_include_dirs, etc. to get the
same files/dirs list as the framework.

The variables will eventually be replaced with filegroups when aidl
include paths are better handled (i.e. 'path' property of all filegroups
for a module contributes to the AIDL include paths for all AIDL files in
the module).

Bug: 70046217
Test: m

Merged-In: I59728ed06d66d44bc19bcd8530042c01add5fc2b
(cherry picked from commit 1cc9566ee2)
Change-Id: I59728ed06d66d44bc19bcd8530042c01add5fc2b
 2019-08-20 14:06:03 +09:00
Jiyong Park
b1be02cc9c Merge "glob pattern is used for AIDL files under frameworks/base" into qt-dev-plus-aosp 
am: 64772e440c

Change-Id: Ie6a21267346bbd65803c1e12caee4256399e79c3
 2019-08-19 21:47:48 -07:00
Jiyong Park
90625f10f8 glob pattern is used for AIDL files under frameworks/base 
This change removes the manullay curated list of AIDL files and replace
them with globs.

In addition, framework-aidl-mappings no longer sets frameworks-defaults
to its src property, but instead uses the several variables like
framework_srcs, framework_aidl_local_include_dirs, etc. to get the
same files/dirs list as the framework.

The variables will eventually be replaced with filegroups when aidl
include paths are better handled (i.e. 'path' property of all filegroups
for a module contributes to the AIDL include paths for all AIDL files in
the module).

Bug: 70046217
Test: m

Merged-In: I59728ed06d66d44bc19bcd8530042c01add5fc2b
(cherry picked from commit 1cc9566ee2)
Change-Id: I59728ed06d66d44bc19bcd8530042c01add5fc2b
 2019-08-20 13:26:49 +09:00
TreeHugger Robot
64772e440c Merge "glob pattern is used for AIDL files under frameworks/base" into qt-dev-plus-aosp 2019-08-20 04:15:15 +00:00
Jordan Liu
a924317c6d Merge "Do not notify SS change with invalid subId" am: 3878f50107 am: 77e183ba6e 
am: be27410a12

Change-Id: I44acb8be1b5eb998091948ffffbbf33eb6375096
 2019-08-19 17:45:09 -07:00
Jordan Liu
be27410a12 Merge "Do not notify SS change with invalid subId" am: 3878f50107 
am: 77e183ba6e

Change-Id: I5ac6db21166a18f64b7cd4a9ae6d0b305c4b9523
 2019-08-19 17:34:02 -07:00
Jordan Liu
77e183ba6e Merge "Do not notify SS change with invalid subId" 
am: 3878f50107

Change-Id: Ic8e760342a288dc7fe0f38408dea468a9e8c31a6
 2019-08-19 17:24:34 -07:00
Jiyong Park
f20f181c53 glob pattern is used for AIDL files under frameworks/base 
This change removes the manullay curated list of AIDL files and replace
them with globs.

In addition, framework-aidl-mappings no longer sets frameworks-defaults
to its src property, but instead uses the several variables like
framework_srcs, framework_aidl_local_include_dirs, etc. to get the
same files/dirs list as the framework.

The variables will eventually be replaced with filegroups when aidl
include paths are better handled (i.e. 'path' property of all filegroups
for a module contributes to the AIDL include paths for all AIDL files in
the module).

Bug: 70046217
Test: m

Merged-In: I59728ed06d66d44bc19bcd8530042c01add5fc2b
(cherry picked from commit 1cc9566ee2)
Change-Id: I59728ed06d66d44bc19bcd8530042c01add5fc2b
 2019-08-20 09:17:45 +09:00
Jordan Liu
3878f50107 Merge "Do not notify SS change with invalid subId" 2019-08-19 23:57:24 +00:00
Kevin Chyn
709b0a4a74 Merge "Remove unused setting" into qt-r1-dev 
am: 95a675ce91

Change-Id: Ia72e5c6625f8213c807966312550111bcbdcb767
 2019-08-19 15:08:45 -07:00
Kevin Chyn
95a675ce91 Merge "Remove unused setting" into qt-r1-dev 2019-08-19 21:50:22 +00:00
Yifan Hong
caa60f0b28 Merge "BatteryService: scheduleUpdate asynchronously" am: 238a04ef59 am: 8eec5d9ee4 
am: ba28a3a57e

Change-Id: I7f2840e00f6236ec1dd31e88140c9c55cfe2f072
 2019-08-19 14:21:10 -07:00
Android Build Merger (Role)
df94a3cfaf Merge "[automerger skipped] Merge changes Ie18bce98,I1c600bc2 am: 778250f57f -s ours am: 2a051239f9 -s ours am: 3385b207b0 -s ours am skip reason: change_id Ie18bce987b512211d3e91bd1f7334afe11d83cf8 with SHA1 07749b72c6 is in history" into qt-r1-dev-plus-aosp 2019-08-19 21:03:02 +00:00
Siarhei Vishniakou
54668d4af1 [automerger skipped] Merge changes Ie18bce98,I1c600bc2 am: 778250f57f -s ours am: 2a051239f9 -s ours 
am: 3385b207b0 -s ours
am skip reason: change_id Ie18bce987b512211d3e91bd1f7334afe11d83cf8 with SHA1 07749b72c6 is in history

Change-Id: I9b6150751262a8a89611b07258f48d526c5d2b05
 2019-08-19 14:02:24 -07:00