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

425328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
355ef2e59d Merge "Merge "Add atom for logging of ReviewPermissionsFragment actions." into qt-dev am: 15ae30124d am: 32bf74150c" into qt-r1-dev-plus-aosp 2019-06-13 20:44:05 +00:00
Stanislav Zholnin
0a9a6e109d Merge "Add atom for logging of ReviewPermissionsFragment actions." into qt-dev am: 15ae30124d 
am: 32bf74150c

Change-Id: If7576849fb8846265dab96cf63da9c9b150f2da5
 2019-06-13 13:43:25 -07:00
Stanislav Zholnin
079da4cecf Merge "Add atom for logging of ReviewPermissionsFragment actions." into qt-dev am: 15ae30124d 
am: 40a280a167

Change-Id: Id067b8cb3754c5597fb2663e4797614a1533faaa
 2019-06-13 13:42:59 -07:00
Stanislav Zholnin
40a280a167 Merge "Add atom for logging of ReviewPermissionsFragment actions." into qt-dev 
am: 15ae30124d

Change-Id: I6bce6a869671a99e534271d8291ca5111741df21
 2019-06-13 13:29:47 -07:00
Stanislav Zholnin
32bf74150c Merge "Add atom for logging of ReviewPermissionsFragment actions." into qt-dev 
am: 15ae30124d

Change-Id: Ideec2a7b87b5089e3b343212cb8656c3326a0e11
 2019-06-13 13:27:34 -07:00
TreeHugger Robot
15ae30124d Merge "Add atom for logging of ReviewPermissionsFragment actions." into qt-dev 2019-06-13 20:15:35 +00:00
Ady Abraham
d482cda9d7 Merge "DisplayModeDirector: make settings higher priority than app request" into qt-r1-dev 
am: 86f8d22d6a

Change-Id: Ibde8751a52dc6b5273ea4d6fda8be2bd2a7dc8e0
 2019-06-13 11:33:47 -07:00
TreeHugger Robot
86f8d22d6a Merge "DisplayModeDirector: make settings higher priority than app request" into qt-r1-dev 2019-06-13 18:08:25 +00:00
Android Build Merger (Role)
db5eece118 Merge "Merge "Always re-enable the fallback WebView if needed." into qt-dev am: 4c510c08da am: 39cc8ee150" into qt-r1-dev-plus-aosp 2019-06-13 17:54:35 +00:00
Torne (Richard Coles)
1f107f15ae Merge "Always re-enable the fallback WebView if needed." into qt-dev am: 4c510c08da 
am: 39cc8ee150

Change-Id: I61571c0ae961d35366e0c30197eb1138609b10d1
 2019-06-13 10:53:44 -07:00
Torne (Richard Coles)
55fc0f580e Merge "Always re-enable the fallback WebView if needed." into qt-dev am: 4c510c08da 
am: 2f68a90664

Change-Id: Ia24f4688cb3cf37aab9d70577c30a8f2bdaaa704
 2019-06-13 10:53:40 -07:00
Torne (Richard Coles)
2f68a90664 Merge "Always re-enable the fallback WebView if needed." into qt-dev 
am: 4c510c08da

Change-Id: Ie7a4ea638bf199cab3d89afcf69aba9d2c5b7f75
 2019-06-13 10:47:14 -07:00
Torne (Richard Coles)
39cc8ee150 Merge "Always re-enable the fallback WebView if needed." into qt-dev 
am: 4c510c08da

Change-Id: Ie935a947113b360d97a2d5af938b92d53190308c
 2019-06-13 10:47:13 -07:00
TreeHugger Robot
4c510c08da Merge "Always re-enable the fallback WebView if needed." into qt-dev 2019-06-13 17:25:32 +00:00
Android Build Merger (Role)
899b78de34 Merge "Merge "Add keylayout for Xbox One USB controller" into qt-dev am: 77c1c938a5 am: d88c406724" into qt-r1-dev-plus-aosp 2019-06-13 17:16:58 +00:00
Siarhei Vishniakou
b18b8c081a Merge "Add keylayout for Xbox One USB controller" into qt-dev am: 77c1c938a5 
am: a0c0e2f8c9

Change-Id: I2f976c7f2cbc160ff2c1818474d4ee41b00c95e8
 2019-06-13 10:16:03 -07:00
Siarhei Vishniakou
775bf1b961 Merge "Add keylayout for Xbox One USB controller" into qt-dev am: 77c1c938a5 
am: d88c406724

Change-Id: I97a928133750e297928cf13508c050dcab22924c
 2019-06-13 10:16:02 -07:00
Siarhei Vishniakou
d88c406724 Merge "Add keylayout for Xbox One USB controller" into qt-dev 
am: 77c1c938a5

Change-Id: Ife6c4a83dc0bf8e183360306208737b42b3cd08b
 2019-06-13 10:10:11 -07:00
Siarhei Vishniakou
a0c0e2f8c9 Merge "Add keylayout for Xbox One USB controller" into qt-dev 
am: 77c1c938a5

Change-Id: I783281baeac2d10437826b2b21c5c086835ec677
 2019-06-13 10:08:05 -07:00
TreeHugger Robot
77c1c938a5 Merge "Add keylayout for Xbox One USB controller" into qt-dev 2019-06-13 16:51:03 +00:00
Android Build Merger (Role)
af1869b387 Merge "Merge "Game Driver: Add support for prerelease channel" into qt-dev am: ba3f191bd5 am: e92cac2b6e" into qt-r1-dev-plus-aosp 2019-06-13 15:53:59 +00:00
Yiwei Zhang
47f93359d1 Merge "Game Driver: Add support for prerelease channel" into qt-dev am: ba3f191bd5 
am: 17704b8d1b

Change-Id: I94281ba92d51f29dc8bf9a474b90e5f0c828787a
 2019-06-13 08:52:39 -07:00
Yiwei Zhang
b8e16ce856 Merge "Game Driver: Add support for prerelease channel" into qt-dev am: ba3f191bd5 
am: e92cac2b6e

Change-Id: I5dea6af28392e715523bcd29e1fb591723e287c4
 2019-06-13 08:52:36 -07:00
Yiwei Zhang
e92cac2b6e Merge "Game Driver: Add support for prerelease channel" into qt-dev 
am: ba3f191bd5

Change-Id: I43d18ab2eeb588454b1c0752630bf1a0ee82d372
 2019-06-13 08:46:41 -07:00
Yiwei Zhang
17704b8d1b Merge "Game Driver: Add support for prerelease channel" into qt-dev 
am: ba3f191bd5

Change-Id: I73ec6c30adf0b084a3bbb191eaf66193b2151a47
 2019-06-13 08:45:37 -07:00
TreeHugger Robot
ba3f191bd5 Merge "Game Driver: Add support for prerelease channel" into qt-dev 2019-06-13 15:38:54 +00:00
Evan Laird
8418c304f8 Merge "Set channel dialog switches to 48dp height" into qt-dev am: 3e83e8ee65 
am: afe679f08e

Change-Id: I686af6514b46b127e34154186f7ae06133dd58c9
 2019-06-13 07:47:20 -07:00
Evan Laird
7dbf99af73 Merge "Set channel dialog switches to 48dp height" into qt-dev am: 3e83e8ee65 
am: f9b3b8e0e1

Change-Id: I9488e654d0136747bf67f915dacb52e846af417e
 2019-06-13 07:40:12 -07:00
Evan Laird
afe679f08e Merge "Set channel dialog switches to 48dp height" into qt-dev 
am: 3e83e8ee65

Change-Id: I6dc64b7ba25c7742828d08c4f861de494dee0f82
 2019-06-13 07:36:20 -07:00
Evan Laird
f9b3b8e0e1 Merge "Set channel dialog switches to 48dp height" into qt-dev 
am: 3e83e8ee65

Change-Id: Iac825bf2f52b3bff59b522b57a71e30af1de2bd9
 2019-06-13 07:36:19 -07:00
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
TreeHugger Robot
3e83e8ee65 Merge "Set channel dialog switches to 48dp height" into qt-dev 2019-06-13 14:29:12 +00: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