Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
425,291 Commits 3 Branches 0 Tags
4f3c6c48aaa39cc0efa39b01d78e7fb1022cfd4a
Commit Graph

425291 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amin Shaikh
4f3c6c48aa Merge "Invalidate SignalDrawable on level change." into qt-dev am: fb5526ce13 
am: efe9f0523d

Change-Id: I9ed055de2c02b8964951cb5c9ad703db211292f1
 2019-06-13 07:35:36 -07:00
Amin Shaikh
b0eb6aa1d3 Merge "Invalidate SignalDrawable on level change." into qt-dev am: fb5526ce13 
am: a5bec18c3e

Change-Id: I84e86ab16eb12c4905115e41daef56e723315824
 2019-06-13 07:33:09 -07:00
Amin Shaikh
efe9f0523d Merge "Invalidate SignalDrawable on level change." into qt-dev 
am: fb5526ce13

Change-Id: I681e8c822dfcf612c949f1e92ff9120401bf49cb
 2019-06-13 07:26:15 -07:00
Amin Shaikh
a5bec18c3e Merge "Invalidate SignalDrawable on level change." into qt-dev 
am: fb5526ce13

Change-Id: I02f08dfee8ae9db8390bfcbe313e33c97a289e77
 2019-06-13 07:26:13 -07:00
TreeHugger Robot
fb5526ce13 Merge "Invalidate SignalDrawable on level change." into qt-dev 2019-06-13 14:14:43 +00:00
Narayan Kamath
d4606d43b5 Merge "Move legacy obb data migration to a handler thread." into qt-dev am: 6d371e092e 
am: 21ab5c0e34

Change-Id: I5668ed9cea4dc3e7f46449b6de39e43db88387d8
 2019-06-13 02:47:42 -07:00
Chiachang Wang
542d8a30c1 Merge "Suppress the wtf log for notifications that are expected" am: bca9bceffb am: 4e3761e1d9 
am: 1bb46d0637

Change-Id: I228813f2a79025b51c206cec920e1762b680212f
 2019-06-13 02:46:01 -07:00
Narayan Kamath
55e4fadccd Merge "Move legacy obb data migration to a handler thread." into qt-dev am: 6d371e092e 
am: 0794b46b43

Change-Id: I0b4bd3128c8dafbec78b739ba51921d03e50d0a1
 2019-06-13 02:40:04 -07:00
Narayan Kamath
21ab5c0e34 Merge "Move legacy obb data migration to a handler thread." into qt-dev 
am: 6d371e092e

Change-Id: I4505e845d2d85a5b8fd9f4c13c29f1ba5adcc690
 2019-06-13 02:34:07 -07:00
Narayan Kamath
0794b46b43 Merge "Move legacy obb data migration to a handler thread." into qt-dev 
am: 6d371e092e

Change-Id: I3d2ac607aa678ea7947b27d3b86a6bff9300100d
 2019-06-13 02:34:06 -07:00
Chiachang Wang
1bb46d0637 Merge "Suppress the wtf log for notifications that are expected" am: bca9bceffb 
am: 4e3761e1d9

Change-Id: Ia1c2a765b0fb0cc8d440c02533bdc15774a5a3ef
 2019-06-13 02:29:06 -07:00
Narayan Kamath
6d371e092e Merge "Move legacy obb data migration to a handler thread." into qt-dev 2019-06-13 09:23:59 +00:00
Chiachang Wang
4e3761e1d9 Merge "Suppress the wtf log for notifications that are expected" 
am: bca9bceffb

Change-Id: I104eac07d7864191702cf5f376615e478be749a3
 2019-06-13 02:23:58 -07:00
Chiachang Wang
bca9bceffb Merge "Suppress the wtf log for notifications that are expected" 2019-06-13 09:15:09 +00:00
Chiachang Wang
1e087ac4a8 Suppress the wtf log for notifications that are expected 
PARTIAL and NO_INTERNET may happen in the real world for
those transport types that provide internet. These two
notification types should be reasonable notificaitons, not a
terrible failure as the log. For Q, it may be too risky to
display more notifications with other information instead of
SSID. Thus, suppress the wtf log for these two notifications.

Bug: 135043192
Test: atest FrameworksNetTests
Change-Id: I35f3718fa93b403858587d918f0bc596f6c92f3e
 2019-06-13 07:55:07 +00:00
Ruchi Kandoi
b6aa0e4aaa [automerger skipped] Merge "Update Secure NFC API definitions" am: 6b6b3322fc am: 78a96339ee -s ours 
am: 96203430d3 -s ours
am skip reason: change_id If78d90fdc0a24d5f44bbb582f388a9c60b12786c with SHA1 2d09e5c41f is in history

Change-Id: I81831fe81c82cca7a06e5c200d269a71b022e7c0
 2019-06-12 21:37:27 -07:00
Ruchi Kandoi
96203430d3 [automerger skipped] Merge "Update Secure NFC API definitions" am: 6b6b3322fc 
am: 78a96339ee -s ours
am skip reason: change_id If78d90fdc0a24d5f44bbb582f388a9c60b12786c with SHA1 2d09e5c41f is in history

Change-Id: I728463737f50949e0eff1301aafb423daf912fc3
 2019-06-12 21:32:35 -07:00
Ruchi Kandoi
78a96339ee Merge "Update Secure NFC API definitions" 
am: 6b6b3322fc

Change-Id: Ieb92b84e1a4c1a9b037fb0b980c55e9ef3f48f6c
 2019-06-12 21:27:26 -07:00
Treehugger Robot
6b6b3322fc Merge "Update Secure NFC API definitions" 2019-06-13 04:07:54 +00:00
Selim Cinek
272dfed902 Merge "Fixes an issue where the padding to the clock was wrong" into qt-r1-dev 
am: c2abf3b9e9

Change-Id: Iee76ad95bfa33815be9348043c9007a5b1fff8bc
 2019-06-12 19:49:09 -07:00
Anil Admal
f5e896e268 Merge "Reconfigure GNSS HAL NFW proxy app list on GNSS service crash" into qt-dev am: 2bc56a820a 
am: 6dd8bbc6f5

Change-Id: I01cdeaa8a3a113b86637e0fb70f194192ff3594a
 2019-06-12 19:44:07 -07:00
Android Build Merger (Role)
13d2f42b7a Merge "Merge "Hide album art when face bypass" into qt-r1-dev am: c306592ff4" into qt-r1-dev-plus-aosp 2019-06-13 02:42:19 +00:00
Lucas Dupin
5a3d2f8a94 Merge "Hide album art when face bypass" into qt-r1-dev 
am: c306592ff4

Change-Id: I113f166c6890e801689aedc177bc7e0961ee4e19
 2019-06-12 19:41:32 -07:00
Anil Admal
22fdc39b7d Merge "Reconfigure GNSS HAL NFW proxy app list on GNSS service crash" into qt-dev am: 2bc56a820a 
am: 2bd9f9777c

Change-Id: Ia2a8bc9c1597162794c8bf831db7789628cb56c3
 2019-06-12 19:41:03 -07:00
TreeHugger Robot
c2abf3b9e9 Merge "Fixes an issue where the padding to the clock was wrong" into qt-r1-dev 2019-06-13 02:36:41 +00:00
Anil Admal
6dd8bbc6f5 Merge "Reconfigure GNSS HAL NFW proxy app list on GNSS service crash" into qt-dev 
am: 2bc56a820a

Change-Id: I85337c7e7ee2316bb90a72a9792134a347593895
 2019-06-12 19:34:15 -07:00
TreeHugger Robot
c306592ff4 Merge "Hide album art when face bypass" into qt-r1-dev 2019-06-13 02:32:20 +00:00
Anil Admal
2bd9f9777c Merge "Reconfigure GNSS HAL NFW proxy app list on GNSS service crash" into qt-dev 
am: 2bc56a820a

Change-Id: I982bec143456a7c09f311d6bcff8cb70a1aa2760
 2019-06-12 19:31:12 -07:00
Anil Admal
2bc56a820a Merge "Reconfigure GNSS HAL NFW proxy app list on GNSS service crash" into qt-dev 2019-06-13 02:13:25 +00:00
Android Build Merger (Role)
24aafdc8ab Merge "Merge "Revert "Add extra debug to capture system state"" into qt-dev am: 3abd182c39 am: 59b4460b18" into qt-r1-dev-plus-aosp 2019-06-13 02:09:49 +00:00
Todd Kennedy
efbac964d3 Merge "Revert "Add extra debug to capture system state"" into qt-dev am: 3abd182c39 
am: 59b4460b18

Change-Id: I0cd4a8a1fd229f8d3c3a20390c87cf10c4b87863
 2019-06-12 19:09:00 -07:00
Todd Kennedy
3426695af4 Merge "Revert "Add extra debug to capture system state"" into qt-dev am: 3abd182c39 
am: 70bfd12924

Change-Id: Ifa844c35e9a60bee96090c19a5cf1ae98f41057b
 2019-06-12 19:08:00 -07:00
Todd Kennedy
70bfd12924 Merge "Revert "Add extra debug to capture system state"" into qt-dev 
am: 3abd182c39

Change-Id: I9cc142700e42d0348b7708e432e5732249bd4eef
 2019-06-12 18:58:56 -07:00
Todd Kennedy
59b4460b18 Merge "Revert "Add extra debug to capture system state"" into qt-dev 
am: 3abd182c39

Change-Id: Icd7cf75211b00a50be6ebda0eca2d1397e5519af
 2019-06-12 18:58:54 -07:00
TreeHugger Robot
3abd182c39 Merge "Revert "Add extra debug to capture system state"" into qt-dev 2019-06-13 01:40:41 +00:00
Mathieu Chartier
70e98be72b Update dirty-image-objects am: 4c7291f76c 
am: cc35beeb33

Change-Id: I66d62e52eec9971b8cdc73b46b382e76773d3e1b
 2019-06-12 18:38:29 -07:00
Yiwei Zhang
77e33c5532 Merge "Game Driver: Add settings global for prerelease driver opt in option" into qt-dev am: ca354f308d 
am: 45a6eae80e

Change-Id: I9acaaa52c952ce5711115e0dda9e409549b59b48
 2019-06-12 18:36:44 -07:00
John Reck
1ed4a4bace Merge "Fix setPositionListener race condition" into qt-dev am: 2c52298236 
am: 282048a2b0

Change-Id: I594663891a1e065a337f438afcc9e6924226bd9f
 2019-06-12 18:33:54 -07:00
Joshua Mccloskey
143e3dfdfc Merge "Updated string." into qt-r1-dev 
am: c746066221

Change-Id: I0c7a7ba23fc45b9af828cfbd87a0d6c4ead18dc2
 2019-06-12 18:29:24 -07:00
Mathieu Chartier
9329c70541 Merge "Update dirty-image-objects am: 4c7291f76c" into qt-dev-plus-aosp 
am: 5ad41ab928

Change-Id: I8c75ce5a62eb633b436ea6ab899c8ce1bde569ff
 2019-06-12 18:19:44 -07:00
Yiwei Zhang
45915d94dc Merge "Game Driver: Add settings global for prerelease driver opt in option" into qt-dev am: ca354f308d 
am: 95cca4b36a

Change-Id: I70f5f4f752d02d46a583c4772bce3a1a2394d3e5
 2019-06-12 18:17:31 -07:00
Mathieu Chartier
cc35beeb33 Update dirty-image-objects 
am: 4c7291f76c

Change-Id: I84f133ee9ebd1670ea9e3c5f4b9512f088bfdb4b
 2019-06-12 18:15:37 -07:00
John Reck
b57389a7f2 Merge "Fix setPositionListener race condition" into qt-dev am: 2c52298236 
am: 76925e1210

Change-Id: I5dc7565f6fb7faae96e54bafcfa2a1bdcf3b389e
 2019-06-12 18:14:51 -07:00
Yiwei Zhang
45a6eae80e Merge "Game Driver: Add settings global for prerelease driver opt in option" into qt-dev 
am: ca354f308d

Change-Id: I62ade6ba3b577080b32165c7c03ce61a66448bb3
 2019-06-12 18:13:40 -07:00
John Reck
282048a2b0 Merge "Fix setPositionListener race condition" into qt-dev 
am: 2c52298236

Change-Id: Iea1515f11646a38bf7252ac7ee547296aeddced1
 2019-06-12 18:10:47 -07:00
Joshua Mccloskey
c746066221 Merge "Updated string." into qt-r1-dev 2019-06-13 01:09:12 +00:00
Android Build Merger (Role)
5ad41ab928 Merge "Update dirty-image-objects am: 4c7291f76c" into qt-dev-plus-aosp 2019-06-13 01:08:28 +00:00
Mathieu Chartier
20421222e2 Update dirty-image-objects 
am: 4c7291f76c

Change-Id: I8b9cf22190dbfddc709a734dc225011088263c17
 2019-06-12 18:07:32 -07:00
Yiwei Zhang
95cca4b36a Merge "Game Driver: Add settings global for prerelease driver opt in option" into qt-dev 
am: ca354f308d

Change-Id: If7ecfd4d0f6e0c0289bb205bca7e370b57bdbcd4
 2019-06-12 18:05:21 -07:00
John Reck
76925e1210 Merge "Fix setPositionListener race condition" into qt-dev 
am: 2c52298236

Change-Id: I93fb56c0e171ffc291962a3aa872ffb650545762
 2019-06-12 18:01:47 -07:00