Android Build Merger (Role)
f4385ef1bb
Merge "Merge "Atoms for logging permission grants during system upgrade." into qt-dev am: 58c51d17d1 am: b38e7b71a9" into qt-r1-dev-plus-aosp
2019-06-17 21:43:32 +00:00
Stanislav Zholnin
ff4d737a9d
Merge "Atoms for logging permission grants during system upgrade." into qt-dev am: 58c51d17d1
...
am: b38e7b71a9
2019-06-17 14:42:46 -07:00
Stanislav Zholnin
057b962517
Merge "Atoms for logging permission grants during system upgrade." into qt-dev am: 58c51d17d1
...
am: ec9cbdb220
2019-06-17 14:41:50 -07:00
Stanislav Zholnin
b38e7b71a9
Merge "Atoms for logging permission grants during system upgrade." into qt-dev
...
am: 58c51d17d1
2019-06-17 13:19:06 -07:00
Stanislav Zholnin
ec9cbdb220
Merge "Atoms for logging permission grants during system upgrade." into qt-dev
...
am: 58c51d17d1
2019-06-17 13:16:29 -07:00
Stanislav Zholnin
58c51d17d1
Merge "Atoms for logging permission grants during system upgrade." into qt-dev
2019-06-17 19:45:41 +00:00
Christine Franks
c475010a13
Merge "Set exact night display last activated time" into qt-r1-dev
...
am: 95ebd376f0
2019-06-17 12:40:07 -07:00
Android Build Merger (Role)
98aef7e28f
Merge "[automerger skipped] Merge "Remove dependency on OverviewProxyService from StatusBarWindowController" into qt-dev am: b8886dd613 -s ours am: 3fc92dc85e -s ours am skip reason: change_id Ifd6ac77670c408da74a7278e8da5868e78a6a068 with SHA1 dc0eca6cd2 is in history" into qt-r1-dev-plus-aosp
2019-06-17 19:31:19 +00:00
Winson Chung
702526012b
[automerger skipped] Merge "Remove dependency on OverviewProxyService from StatusBarWindowController" into qt-dev am: b8886dd613 -s ours
...
am: 3fc92dc85edc0eca6cd2
2019-06-17 12:30:14 -07:00
Winson Chung
d752e3cf33
[automerger skipped] Merge "Remove dependency on OverviewProxyService from StatusBarWindowController" into qt-dev am: b8886dd613
...
am: fa0eb83c36dc0eca6cd2
2019-06-17 12:29:52 -07:00
Christine Franks
95ebd376f0
Merge "Set exact night display last activated time" into qt-r1-dev
2019-06-17 19:21:19 +00:00
Winson Chung
3fc92dc85e
[automerger skipped] Merge "Remove dependency on OverviewProxyService from StatusBarWindowController" into qt-dev
...
am: b8886dd613dc0eca6cd2
2019-06-17 12:17:32 -07:00
Winson Chung
fa0eb83c36
Merge "Remove dependency on OverviewProxyService from StatusBarWindowController" into qt-dev
...
am: b8886dd613
2019-06-17 12:16:30 -07:00
Winson Chung
b8886dd613
Merge "Remove dependency on OverviewProxyService from StatusBarWindowController" into qt-dev
2019-06-17 19:00:41 +00:00
Varun Anand
8775b0a135
Merge changes Ieb8645ac,I6466ec14,I87deb82b,I995b108e,Ib6521459 am: f4c10e8bc2 am: 48f59a0fdf
...
am: 2471441b2d
2019-06-17 10:43:22 -07:00
Android Build Merger (Role)
fda83d5613
Merge "Merge "qt_dev: Fix ContentSuggestions service connection" into qt-dev am: 1ed4ce0161 am: ad1aefd334" into qt-r1-dev-plus-aosp
2019-06-17 17:42:03 +00:00
Perumaal Shanmugam
0efcd000fe
Merge "qt_dev: Fix ContentSuggestions service connection" into qt-dev am: 1ed4ce0161
...
am: ad1aefd334
2019-06-17 10:41:22 -07:00
Perumaal Shanmugam
e647963ac7
Merge "qt_dev: Fix ContentSuggestions service connection" into qt-dev am: 1ed4ce0161
...
am: fe440e3884
2019-06-17 10:40:51 -07:00
Varun Anand
2471441b2d
Merge changes Ieb8645ac,I6466ec14,I87deb82b,I995b108e,Ib6521459 am: f4c10e8bc2
...
am: 48f59a0fdf
2019-06-17 10:33:53 -07:00
Perumaal Shanmugam
ad1aefd334
Merge "qt_dev: Fix ContentSuggestions service connection" into qt-dev
...
am: 1ed4ce0161
2019-06-17 10:33:46 -07:00
Perumaal Shanmugam
fe440e3884
Merge "qt_dev: Fix ContentSuggestions service connection" into qt-dev
...
am: 1ed4ce0161
2019-06-17 10:30:50 -07:00
Varun Anand
48f59a0fdf
Merge changes Ieb8645ac,I6466ec14,I87deb82b,I995b108e,Ib6521459
...
am: f4c10e8bc2
2019-06-17 10:22:09 -07:00
Evan Laird
e7dcf1923a
Merge "Fix battery content description when there is no percent mode" into qt-dev am: 4f3e0aa4d3
...
am: aa4c25ed75
2019-06-17 10:10:02 -07:00
Perumaal Shanmugam
1ed4ce0161
Merge "qt_dev: Fix ContentSuggestions service connection" into qt-dev
2019-06-17 17:04:25 +00:00
Perumaal S
bcedb60f4c
qt_dev: Fix ContentSuggestions service connection
...
Issue:
When the RemoteContentSuggestionsService dies (due to package manager
update or clear data), the ContentSuggestionsPerUserService (system)
does not restart and uses an old zombie instance.
Fix:
Reset the instance upon onServiceDied in the system service.
Test: Verified that stopping/clear-data/package-update of Device
Personalization Services (which implements ContentSuggestionsService)
multiple-times and then Overview long-press actually works.
Also verified that if the Remote Service crashes, we don't keep
reconnecting infinitely.
Fixes: 120865921
Fixes: 130420008
Change-Id: I80197ec1cb446ddb5f1865a4b75beb18b48d2e9e
2019-06-17 16:40:43 +00:00
Evan Laird
632f21db93
Merge "Fix battery content description when there is no percent mode" into qt-dev am: 4f3e0aa4d3
...
am: fe75e37ce7
2019-06-17 09:19:49 -07:00
Evan Laird
aa4c25ed75
Merge "Fix battery content description when there is no percent mode" into qt-dev
...
am: 4f3e0aa4d3
2019-06-17 09:18:00 -07:00
Evan Laird
fe75e37ce7
Merge "Fix battery content description when there is no percent mode" into qt-dev
...
am: 4f3e0aa4d3
2019-06-17 08:58:04 -07:00
Varun Anand
f4c10e8bc2
Merge changes Ieb8645ac,I6466ec14,I87deb82b,I995b108e,Ib6521459
...
* changes:
Remove VPN info arrays from NetworkStats(Observer|Recorder)
NetworkStatsFactory: Take VPNs into account for network/battery stats
Remove duplicate line in clat_simple test file
Remove unused lastStats parameter
Revert "Revert "Take all VPN underlying networks into account when migrating traffic for""
2019-06-17 15:56:24 +00:00
Chalard Jean
cd8755aa9e
Merge "Remove the <= P restriction for WIFI_P2P" am: 4e8973e9a8 am: bb754c9c8d
...
am: b199795653
2019-06-17 08:28:25 -07:00
TreeHugger Robot
4f3e0aa4d3
Merge "Fix battery content description when there is no percent mode" into qt-dev
2019-06-17 15:24:44 +00:00
Chalard Jean
b199795653
Merge "Remove the <= P restriction for WIFI_P2P" am: 4e8973e9a8
...
am: bb754c9c8d
2019-06-17 08:20:18 -07:00
Chalard Jean
bb754c9c8d
Merge "Remove the <= P restriction for WIFI_P2P"
...
am: 4e8973e9a8
2019-06-17 08:11:11 -07:00
Treehugger Robot
4e8973e9a8
Merge "Remove the <= P restriction for WIFI_P2P"
2019-06-17 14:58:21 +00:00
Android Build Merger (Role)
0b37d21e1f
Merge "[automerger skipped] Merge changes I80bebcd0,I35f3718f into qt-dev am: 08793a3b64 am: a63b604929 -s ours am skip reason: change_id Iad0e9a28670e96a3c953518a0d0ccd77e2f2fa80 with SHA1 a1f7931360 is in history" into qt-r1-dev-plus-aosp
2019-06-17 14:31:27 +00:00
Chalard Jean
fff147088d
[automerger skipped] Merge changes I80bebcd0,I35f3718f into qt-dev am: 08793a3b64
...
am: a63b604929a1f7931360
2019-06-17 07:29:56 -07:00
Chalard Jean
8a14a5379d
[automerger skipped] Merge changes I80bebcd0,I35f3718f into qt-dev am: 08793a3b64 -s ours
...
am: 4cbfe4793aa1f7931360
2019-06-17 07:29:54 -07:00
Chalard Jean
a63b604929
Merge changes I80bebcd0,I35f3718f into qt-dev
...
am: 08793a3b64
2019-06-17 07:21:56 -07:00
Chalard Jean
4cbfe4793a
[automerger skipped] Merge changes I80bebcd0,I35f3718f into qt-dev
...
am: 08793a3b64a1f7931360
2019-06-17 07:21:50 -07:00
TreeHugger Robot
08793a3b64
Merge changes I80bebcd0,I35f3718f into qt-dev
...
* changes:
Simplification of code to prevent a Log.wtf in expected cases.
Suppress the wtf log for notifications that are expected
2019-06-17 14:15:13 +00:00
Chalard Jean
accf7105b6
Simplification of code to prevent a Log.wtf in expected cases.
...
This mostly serves to unindent code to make it locally more
readable. It is a functional no-op.
Bug: 135043192
Test: atest FrameworksNetTests
Merged-In: Iad0e9a28670e96a3c953518a0d0ccd77e2f2fa80
Change-Id: I80bebcd04c277f6e4b0665fe1253b2309e3bc535
(cherry picked from commit e1f5759319
2019-06-17 13:16:46 +00:00
Chalard Jean
53f3bc4182
Merge "Simplification of code to prevent a Log.wtf in expected cases." am: f54483b6ef am: fbc68b975a
...
am: 9e376b56bf
2019-06-17 04:34:32 -07:00
Chalard Jean
9e376b56bf
Merge "Simplification of code to prevent a Log.wtf in expected cases." am: f54483b6ef
...
am: fbc68b975a
2019-06-17 04:24:08 -07:00
Chalard Jean
fbc68b975a
Merge "Simplification of code to prevent a Log.wtf in expected cases."
...
am: f54483b6ef
2019-06-17 04:04:29 -07:00
Chalard Jean
2253ff94e3
Remove the <= P restriction for WIFI_P2P
...
This is still sent in an intent.
Bug: 975059
Change-Id: I56c86b0c1912064d5a642991df32d2cefb6a8d5b
2019-06-17 19:46:34 +09:00
Chalard Jean
f54483b6ef
Merge "Simplification of code to prevent a Log.wtf in expected cases."
2019-06-17 10:37:50 +00:00
Chalard Jean
a1f7931360
Simplification of code to prevent a Log.wtf in expected cases.
...
This mostly serves to unindent code to make it locally more
readable. It is a functional no-op.
Bug: 135043192
Test: atest FrameworksNetTests
Change-Id: Iad0e9a28670e96a3c953518a0d0ccd77e2f2fa80
2019-06-17 18:01:35 +09:00
Android Build Merger (Role)
1d79e1b60b
Merge "Merge "We should prevent starting home activity before setup" into qt-dev am: d031113290 am: 64b89ace25" into qt-r1-dev-plus-aosp
2019-06-17 05:50:47 +00:00
Chilun
03f6b8ddc5
Merge "We should prevent starting home activity before setup" into qt-dev am: d031113290
...
am: 64b89ace25
2019-06-16 22:49:51 -07:00
Chilun
0729640268
Merge "We should prevent starting home activity before setup" into qt-dev am: d031113290
...
am: 340f79bc15
2019-06-16 22:49:50 -07:00
